Merge pull request #3966 from Johaney-s/proxy_role

feat(core): add PROXY role

Author: Johaney-s

perun-base/src/main/java/cz/metacentrum/perun/core/api/Role.java

@@ -36,11 +36,12 @@ public class Role {
 	public static final String PASSWORDRESETMANAGER = "PASSWORDRESETMANAGER";
 	public static final String MEMBERSHIP = "MEMBERSHIP";
 	public static final String MFA = "MFA";
+	public static final String PROXY = "PROXY";
 
 	public static List<String> rolesAsList() {
 		return Arrays.asList(AUDITCONSUMERADMIN, CABINETADMIN, ENGINE, FACILITYADMIN, FACILITYOBSERVER, TRUSTEDFACILITYADMIN, GROUPADMIN,
 			 GROUPOBSERVER, GROUPMEMBERSHIPMANAGER, MEMBERSHIP, NOTIFICATIONS, PASSWORDRESETMANAGER, PERUNADMIN, PERUNOBSERVER, REGISTRAR, RESOURCEADMIN, RESOURCEOBSERVER,
 			 RESOURCESELFSERVICE, RPC, SECURITYADMIN, SELF, SERVICEUSER, SPREGAPPLICATION, SPONSOR, TOPGROUPCREATOR, UNKNOWNROLENAME,
-			 VOADMIN, VOOBSERVER, SPONSORSHIP, MFA);
+			 VOADMIN, VOOBSERVER, SPONSORSHIP, MFA, PROXY);
 	}
 }

perun-base/src/main/resources/perun-roles.yml

@@ -107,6 +107,8 @@
 # MEMBERSHIP role represents principal's membership in a group, VO or association with facility. This role is not
 ## explicitly saved in DB!!
 #
+# PROXY role is dedicated to service account updating user extsources and working with facilities.
+#
 # UNKNOWN exists, but it is not used in Perun.
 #
 
@@ -139,6 +141,7 @@ perun_roles:
   - SPONSORSHIP
   - PASSWORDRESETMANAGER
   - MEMBERSHIP
+  - PROXY
   - UNKNOWN
 
 # A list of Perun policies that are loaded to the PerunPoliciesContainer.
@@ -216,6 +219,7 @@ perun_policies:
   getEntitylessAttributes_String_policy:
     policy_roles:
       - PERUNOBSERVER:
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -234,6 +238,7 @@ perun_policies:
   getEntitylessKeys_AttributeDefinition_policy:
     policy_roles:
       - PERUNOBSERVER:
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -539,6 +544,7 @@ perun_policies:
     policy_roles:
       - RPC:
       - PERUNOBSERVER:
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -711,6 +717,7 @@ perun_policies:
       - FACILITYOBSERVER:
       - PERUNOBSERVER:
       - SPREGAPPLICATION:
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -719,6 +726,7 @@ perun_policies:
       - FACILITYADMIN:
       - FACILITYOBSERVER:
       - PERUNOBSERVER:
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -727,6 +735,7 @@ perun_policies:
       - FACILITYADMIN: Facility
       - FACILITYOBSERVER: Facility
       - PERUNOBSERVER:
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -825,6 +834,7 @@ perun_policies:
       - FACILITYADMIN: Facility
       - FACILITYOBSERVER: Facility
       - PERUNOBSERVER:
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -858,6 +868,7 @@ perun_policies:
       - FACILITYADMIN: Facility
       - FACILITYOBSERVER: Facility
       - PERUNOBSERVER:
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -875,6 +886,7 @@ perun_policies:
       - FACILITYADMIN: Facility
       - FACILITYOBSERVER: Facility
       - PERUNOBSERVER:
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -890,13 +902,15 @@ perun_policies:
     policy_roles:
       - FACILITYADMIN:
       - SPREGAPPLICATION:
+      - PROXY:
     include_policies:
       - default_policy
 
   deleteFacility_Facility_Boolean_policy:
     policy_roles:
       - FACILITYADMIN: Facility
       - SPREGAPPLICATION:
+      - PROXY:
     include_policies:
       - default_policy
     mfa_rules:
@@ -1061,6 +1075,7 @@ perun_policies:
       - PERUNOBSERVER:
       - FACILITYADMIN: Facility
       - FACILITYOBSERVER: Facility
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -1325,6 +1340,7 @@ perun_policies:
       - GROUPADMIN: Group
       - VOADMIN: Vo
       - SPREGAPPLICATION:
+      - PROXY:
     include_policies:
       - default_policy
     mfa_rules:
@@ -1336,6 +1352,7 @@ perun_policies:
       - GROUPADMIN: Group
       - VOADMIN: Vo
       - SPREGAPPLICATION:
+      - PROXY:
     include_policies:
       - default_policy
     mfa_rules:
@@ -1416,6 +1433,7 @@ perun_policies:
       - VOOBSERVER: Vo
       - VOADMIN: Vo
       - TRUSTEDFACILITYADMIN: Vo
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -1431,6 +1449,7 @@ perun_policies:
       - GROUPOBSERVER: Group
       - VOADMIN: Vo
       - TRUSTEDFACILITYADMIN: Vo
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -1716,6 +1735,7 @@ perun_policies:
       - GROUPOBSERVER: Group
       - GROUPMEMBERSHIPMANAGER: Group
       - VOADMIN: Vo
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -2120,6 +2140,7 @@ perun_policies:
       - GROUPOBSERVER: Vo
       - GROUPMEMBERSHIPMANAGER: Vo
       - VOADMIN: Vo
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -2132,6 +2153,7 @@ perun_policies:
       - GROUPOBSERVER: Group
       - GROUPMEMBERSHIPMANAGER: Group
       - VOADMIN: Vo
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -2152,6 +2174,7 @@ perun_policies:
       - PERUNOBSERVER:
       - VOOBSERVER: Vo
       - VOADMIN: Vo
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -2161,6 +2184,7 @@ perun_policies:
       - PERUNOBSERVER:
       - VOOBSERVER: Vo
       - VOADMIN: Vo
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -2713,6 +2737,7 @@ perun_policies:
       - GROUPADMIN: Group
       - GROUPMEMBERSHIPMANAGER: Group
       - VOADMIN: Vo
+      - PROXY:
     include_policies:
       - default_policy
     mfa_rules:
@@ -2777,13 +2802,15 @@ perun_policies:
       - VOADMIN: Vo
       - SPREGAPPLICATION:
       - PASSWORDRESETMANAGER:
+      - PROXY:
     include_policies:
       - default_policy
 
   getMembersByUser_User_policy:
     policy_roles:
       - SELF: User
       - PERUNOBSERVER:
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -3305,6 +3332,7 @@ perun_policies:
       - VOADMIN: Vo
       - SPONSORSHIP: Member
       - PASSWORDRESETMANAGER:
+      - PROXY:
     include_policies:
       - default_policy
     mfa_rules:
@@ -4097,6 +4125,7 @@ perun_policies:
       - VOADMIN: Vo
       - VOOBSERVER: Vo
       - PERUNOBSERVER:
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -4113,6 +4142,7 @@ perun_policies:
       - VOADMIN: Vo
       - VOOBSERVER: Vo
       - PERUNOBSERVER:
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -4155,6 +4185,7 @@ perun_policies:
         FACILITYADMIN: Facility
       - TRUSTEDFACILITYADMIN: Vo
         FACILITYOBSERVER: Facility
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -4976,6 +5007,7 @@ perun_policies:
     policy_roles:
       - PERUNOBSERVER:
       - SPREGAPPLICATION:
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -5709,6 +5741,7 @@ perun_policies:
       - SELF: User
       - PERUNOBSERVER:
       - SPREGAPPLICATION:
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -5794,6 +5827,7 @@ perun_policies:
       - PERUNOBSERVER:
       - SPREGAPPLICATION:
       - PASSWORDRESETMANAGER:
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -5979,6 +6013,7 @@ perun_policies:
       - VOADMIN:
       - SELF: User
       - PERUNOBSERVER:
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -6029,6 +6064,7 @@ perun_policies:
       - VOOBSERVER:
       - VOADMIN:
       - PERUNOBSERVER:
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -6073,6 +6109,7 @@ perun_policies:
       - VOOBSERVER:
       - VOADMIN:
       - PERUNOBSERVER:
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -6524,7 +6561,8 @@ perun_policies:
       - default_policy
 
   updateUserExtSourceLastAccess_UserExtSource_policy:
-    policy_roles: []
+    policy_roles:
+      - PROXY:
     include_policies:
       - default_policy
     mfa_rules:
@@ -6568,6 +6606,7 @@ perun_policies:
       - FACILITYOBSERVER: Facility
       - VOADMIN: Vo
       - PERUNOBSERVER:
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -6586,6 +6625,7 @@ perun_policies:
       - FACILITYADMIN: Facility
       - FACILITYOBSERVER: Facility
       - PERUNOBSERVER:
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -6594,6 +6634,7 @@ perun_policies:
       - FACILITYADMIN: Facility
       - FACILITYOBSERVER: Facility
       - PERUNOBSERVER:
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -6758,6 +6799,7 @@ perun_policies:
       - TRUSTEDFACILITYADMIN: Vo
       - SPONSOR: Vo
       - PASSWORDRESETMANAGER:
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -6778,6 +6820,7 @@ perun_policies:
       - TOPGROUPCREATOR: Vo
       - TRUSTEDFACILITYADMIN: Vo
       - SPONSOR: Vo
+      - PROXY:
     include_policies:
       - default_policy
 
@@ -8663,6 +8706,23 @@ perun_roles_management:
     assignable_to_attributes: false
     display_name: "MFA"
 
+  PROXY:
+    primary_object:
+    assign_to_objects: {}
+    assignment_check:
+      - MFA:
+    entities_to_manage:
+      User: user_id
+    privileged_roles_to_manage:
+      - PERUNADMIN:
+    privileged_roles_to_read:
+      - PERUNADMIN:
+      - PERUNOBSERVER:
+    associated_read_roles: []
+    assignable_to_attributes: true
+    skip_mfa: true
+    display_name: "Proxy"
+
   UNKNOWN:
     primary_object:
     assign_to_objects: {}

perun-base/src/test/resources/test-roles.yml

@@ -200,5 +200,10 @@ perun_policies:
       - PASSWORDRESETMANAGER:
     include_policies: [ ]
 
+  test_proxy_role:
+    policy_roles:
+      - PROXY:
+    include_policies: []
+
 perun_roles_management: {}
 ...