KARAF-5014: align properties login modules logic for retrieving principals with the underlying baking engine

Author: stataru8

jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractPropertiesBackingEngine.java

@@ -116,16 +116,20 @@ public List<RolePrincipal> listRoles(Principal principal) {
     }
 
     protected List<RolePrincipal> listRoles(String name) {
+        return listRoles(users, name);
+    }
+
+    public static List<RolePrincipal> listRoles(Properties users, String name) {
         List<RolePrincipal> result = new ArrayList<>();
 
         String userInfo = users.get(name);
         String[] infos = userInfo.split(",");
         for (int i = getFirstRoleIndex(name); i < infos.length; i++) {
-            String roleName = infos[i];
-            if (roleName.trim().isEmpty()) {
+            String roleName = infos[i].trim();
+            if (roleName.isEmpty()) {
                 // ignore
             } else if (roleName.startsWith(GROUP_PREFIX)) {
-                for (RolePrincipal rp : listRoles(roleName)) {
+                for (RolePrincipal rp : listRoles(users, roleName)) {
                     if (!result.contains(rp)) {
                         result.add(rp);
                     }
@@ -145,7 +149,7 @@ protected List<RolePrincipal> listRoles(String name) {
      * @param name the property to evaluate, can represent either a group or a user
      * @return 0 if the property starts with the group prefix, otherwise 1
      */
-    private int getFirstRoleIndex(String name) {
+    private static int getFirstRoleIndex(String name) {
         if (name.trim().startsWith(GROUP_PREFIX))
             return 0;
         return 1;
@@ -223,12 +227,16 @@ public List<GroupPrincipal> listGroups(UserPrincipal user) {
     }
 
     private List<GroupPrincipal> listGroups(String userName) {
+        return listGroups(users, userName);
+    }
+
+    public static List<GroupPrincipal> listGroups(Properties users, String userName) {
         List<GroupPrincipal> result = new ArrayList<>();
         String userInfo = users.get(userName);
         if (userInfo != null) {
             String[] infos = userInfo.split(",");
             for (int i = getFirstRoleIndex(userName); i < infos.length; i++) {
-                String name = infos[i];
+                String name = infos[i].trim();
                 if (name.startsWith(GROUP_PREFIX)) {
                     result.add(new GroupPrincipal(name.substring(GROUP_PREFIX.length())));
                 }

jaas/modules/src/main/java/org/apache/karaf/jaas/modules/JAASUtils.java

@@ -37,32 +37,16 @@ public static String getString(Map<String, ?> options, String key) {
         return (String)val;
     }
 
-    public static Set<Principal> getPrincipals(String user, Properties users, String[] infos) {
+    public static Set<Principal> getPrincipals(String user, Properties users) {
         Set<Principal> principals = new HashSet<>();
         principals.add(new UserPrincipal(user));
 
-        for (int i = 1; i < infos.length; i++) {
-            if (infos[i].trim().startsWith(BackingEngine.GROUP_PREFIX)) {
-                // it's a group reference
-                principals.add(new GroupPrincipal(infos[i].trim().substring(BackingEngine.GROUP_PREFIX.length())));
-                String groupInfo = users.get(infos[i].trim());
-                if (groupInfo != null) {
-                    String[] roles = groupInfo.split(",");
-                    for (int j = 0; j < roles.length; j++) {
-                        addRole(principals, roles[j]);
-                    }
-                }
-            } else {
-                // it's an user reference
-                addRole(principals, infos[i]);
-            }
-        }
-        return principals;
-    }
+        AbstractPropertiesBackingEngine.listGroups(users, user)
+                .forEach(group -> principals.add(new GroupPrincipal(group.getName())));
 
-    static void addRole(Set<Principal> principals, String role) {
-        role = role.trim();
-        if (!role.isEmpty())
-            principals.add(new RolePrincipal(role));
+        AbstractPropertiesBackingEngine.listRoles(users, user)
+                .forEach(role -> principals.add(new RolePrincipal(role.getName())));
+
+        return principals;
     }
 }

jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/DigestPasswordLoginModule.java

@@ -202,7 +202,7 @@ public boolean login() throws LoginException {
         	}
         }
 
-        principals = JAASUtils.getPrincipals(user, users, infos);
+        principals = JAASUtils.getPrincipals(user, users);
 
         users.clear();
 

jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java

@@ -129,7 +129,7 @@ public boolean login() throws LoginException {
         	}
         }
 
-        principals = JAASUtils.getPrincipals(user, users, infos);
+        principals = JAASUtils.getPrincipals(user, users);
 
         users.clear();
 

jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyLoginModule.java

@@ -147,7 +147,7 @@ public boolean login() throws LoginException {
             }
         }
 
-        principals = JAASUtils.getPrincipals(user, users, infos);
+        principals = JAASUtils.getPrincipals(user, users);
 
         users.clear();