userhelper, roles: use user exec domain attribute

Signed-off-by: Kenton Groombridge <me@concord.sh>

policy/modules/apps/userhelper.if

@@ -4,20 +4,25 @@
 ## <summary>
 ##	The role template for the userhelper module.
 ## </summary>
-## <param name="userrole_prefix">
+## <param name="role_prefix">
 ##	<summary>
 ##	The prefix of the user role (e.g., user
 ##	is the prefix for user_r).
 ##	</summary>
 ## </param>
-## <param name="user_role">
-##	<summary>
-##	The user role.
-##	</summary>
-## </param>
 ## <param name="user_domain">
 ##	<summary>
-##	The user domain associated with the role.
+##	User domain for the role.
+##	</summary>
+## </param>
+## <param name="user_exec_domain">
+##	<summary>
+##	User exec domain for execute and transition access.
+##	</summary>
+## </param>
+## <param name="role">
+##	<summary>
+##	Role allowed access
 ##	</summary>
 ## </param>
 #
@@ -37,7 +42,7 @@ template(`userhelper_role_template',`
 	userdom_user_application_domain($1_consolehelper_t, consolehelper_exec_t)
 
 	role consolehelper_roles types $1_consolehelper_t;
-	roleattribute $2 consolehelper_roles;
+	roleattribute $4 consolehelper_roles;
 
 	type $1_userhelper_t, userhelper_type;
 	userdom_user_application_domain($1_userhelper_t, userhelper_exec_t)
@@ -48,7 +53,7 @@ template(`userhelper_role_template',`
 	domain_subj_id_change_exemption($1_userhelper_t)
 
 	role userhelper_roles types $1_userhelper_t;
-	roleattribute $2 userhelper_roles;
+	roleattribute $4 userhelper_roles;
 
 	########################################
 	#
@@ -72,6 +77,10 @@ template(`userhelper_role_template',`
 		')
 	')
 
+	optional_policy(`
+		systemd_user_app_status($1, $1_consolehelper_t)
+	')
+
 	########################################
 	#
 	# Userhelper local policy
@@ -81,7 +90,7 @@ template(`userhelper_role_template',`
 
 	dontaudit $3 $1_userhelper_t:process signal;
 
-	corecmd_bin_domtrans($1_userhelper_t, $3)
+	corecmd_bin_domtrans($1_userhelper_t, $2)
 
 	auth_domtrans_chk_passwd($1_userhelper_t)
 	auth_use_nsswitch($1_userhelper_t)
@@ -95,6 +104,10 @@ template(`userhelper_role_template',`
 			sysadm_entry_spec_domtrans($1_userhelper_t)
 		')
 	')
+
+	optional_policy(`
+		systemd_user_app_status($1, $1_userhelper_t)
+	')
 ')
 
 ########################################

policy/modules/roles/staff.te

@@ -195,7 +195,7 @@ ifndef(`distro_redhat',`
 	')
 
 	optional_policy(`
-		userhelper_role_template(staff, staff_r, staff_t)
+		userhelper_role_template(staff, staff_t, staff_application_exec_domain, staff_r)
 	')
 
 	optional_policy(`

policy/modules/roles/sysadm.te

@@ -1104,7 +1104,7 @@ optional_policy(`
 ')
 
 optional_policy(`
-	userhelper_role_template(sysadm, sysadm_r, sysadm_t)
+	userhelper_role_template(sysadm, sysadm_t, sysadm_application_exec_domain, sysadm_r)
 ')
 
 optional_policy(`

policy/modules/roles/unprivuser.te

@@ -179,7 +179,7 @@ ifndef(`distro_redhat',`
 	')
 
 	optional_policy(`
-		userhelper_role_template(user, user_r, user_t)
+		userhelper_role_template(user, user_t, user_application_exec_domain, user_r)
 	')
 
 	optional_policy(`