Changeset 35290 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java

Timestamp:

2021-08-13T20:04:19+12:00 (3 years ago)

Author:

anupama

Message:

1. Use of groups local variable name in LibServlet method is confusing, as it's easy to read it as the list of groups a user member belongs to. Rather, it's any groups mentioned for a collection in its collConfig.xml's security elements and which security element groups will be checked against a (logged in) user's actual list of groups. 2. While working on updating DerbyWrapper to support extra table called ORIGROLES (extra column of origrole in ROLES table was the wrong idea), realised this was a long, roundabout and errorprone way as it requires lots of code changes to go about making the roles table's role column store the expanded groups instead of original user-entered groups. Instead, what we need is the reverse function of expandGroups(), contractExpandedgroups(), which will return any comma-separated list of groups to its most condense form that is probably closest to what the user entered, albeit with alphabetic reordering. This method can be called to do lazy evaluation to set UserTermInfo.origgroups when getOrigGroups() is called. The getOrigGroups() method will then be used as before by the GS3 admin/user account interface methods of Authentication.java (mainly Authentication.processAuthentication()), but Txt2UsersDB.java and ModifyUsersDB.java files will need to call getExpandedGroups() to store/retrieve these in the ROLES table. This will automatically be backwards compatible with earlier GS3 installation's userDBs.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java

@@ -1097 +1097 @@
         return false;
     }
-    
-    ArrayList<String> groups = GSXML.getGroupsFromSecurityResponse(securityResponse);
+
+    // Groups mentioned in collectionConfig.xml's Security element, se_groups
+    ArrayList<String> se_groups = GSXML.getGroupsFromSecurityResponse(securityResponse);
 
     //If guests are not allowed to access this page then check to see if the user is in a group that is allowed to access the page
-    if (!groups.contains(""))
+    if (!se_groups.contains(""))
     {
         boolean found = false;
-        for (String group : groups)
+        for (String se_group : se_groups)
         {
-        if (request.isUserInRole(group))
+        if (request.isUserInRole(se_group))
         {
             found = true;