Changeset 35287 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/Authentication.java

Timestamp:

2021-08-12T19:34:43+12:00 (3 years ago)

Author:

anupama

Message:

Part 2 of commit on expanded user groups, related to prev commit (revision 35286) which was part 1. In this commit, I think I've identified the only times UserTermInfo.getExpandedGroups() needs to be called: when authentication-ping/ServletRealmCheck is called, which redirect to Authentication.processRemoteAuthentication(). At other times, the original group listing is what's required (for user listing display/modification in GS3 Reader Interface) or is sufficient (to check user is in admin group, the group listing in userDB/originally entered group listing is enough and no expanded list is needed. Maybe origGroups can better be renamed back to groups and getOrigGroups replaced with plain getGroups(), since getExpandedGroups() is the method called in more exceptional circumstances after all.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/Authentication.java (modified) (4 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/Authentication.java

@@ -163 +163 @@
   protected static final String COLLECTION = "collection";
   protected static final String GROUPS = "groups";
+  protected static final String EXPANDED_GROUPS = "expanded_groups";
   protected static final String STATUS = "status";
   protected static final String RECAPTCHA_KEY = "recaptcha_key";
@@ -427 +428 @@
                 
                 // gliserver.pl used to return the groups when authentication succeeded
-                String groups = retrieveDataForUser(username, GROUPS); //comma-separated list
+                String groups = retrieveDataForUser(username, EXPANDED_GROUPS); //comma-separated list
                 
                 if(collection.equals("")) {
@@ -1211 +1212 @@
                     break;
                 }
+                else if (dataType.equals(EXPANDED_GROUPS))
+                {
+                    data = ((UserTermInfo) userInfo.get(i)).getExpandedGroups();
+                    break;
+                }
                 else if (dataType.equals(STATUS))
                 {
@@ -1247 +1253 @@
             String username = ((UserTermInfo) userInfo.get(i)).getUsername();
             String groups = ((UserTermInfo) userInfo.get(i)).getOrigGroups();
+            // Retrieve original (stored, user-entered) and not expanded groups
+            // as getUserNodeList only used in addUserInformationToNode() which
+            // allows displaying and modifying user info pages
+            // and authenticating admin user which doesn't require expanded groups.
             String accountstatus = ((UserTermInfo) userInfo.get(i)).getAccountStatus();
             String comment = ((UserTermInfo) userInfo.get(i)).getComment();