Changeset 35333 for main

Timestamp:

2021-09-06T16:48:05+12:00 (3 years ago)

Author:

kjdon

Message:

a few mods to this. Allow username of ALL - will do the required mods to all users. new option -addGroups - this will add a group/groups to the specified user's group list. Use with username ALL to put everyine into a default group. Now also allows empty strings for all fields except password.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/ModifyUsersDB.java (modified) (7 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/ModifyUsersDB.java

@@ -20 +20 @@
 
 import java.sql.SQLException;
+import java.util.Iterator;
 import org.greenstone.gsdl3.service.Authentication;
 //import org.greenstone.admin.guiext.PropertiesStep;
@@ -27 +28 @@
     then run:
 
-    java -Dgsdl3.writablehome=/Scratch/ak19/gs3-svn-2Sep2015/web -cp web/WEB-INF/lib/gsdl3.jar:web/WEB-INF/lib/gutil.jar:web/WEB-INF/lib/derby.jar:web/WEB-INF/lib/derbyclient.jar:web/WEB-INF/lib/log4j-1.2.8.jar:web/WEB-INF/lib/commons-codec-1.7.jar:web/WEB-INF/classes org.greenstone.gsdl3.util.ModifyUsersDB web/etc/usersDB/ <username> [options specifying user fields to change, e.g.: password=me!]
+    java -Dgsdl3.writablehome=/Scratch/ak19/gs3-svn-2Sep2015/web -cp web/WEB-INF/lib/gsdl3.jar:web/WEB-INF/lib/gutil.jar:web/WEB-INF/lib/derby.jar:web/WEB-INF/lib/derbyclient.jar:web/WEB-INF/lib/log4j-1.2.8.jar:web/WEB-INF/lib/commons-codec-1.7.jar:web/WEB-INF/classes org.greenstone.gsdl3.util.ModifyUsersDB web/etc/usersDB/ <username or 'ALL'> [options specifying user fields to change, e.g.: password=me!]
     
     Don't forget to stop the networked derby server again at the end, if you had started it: ant stop-derby
-
+   [[ OLD METHOD ]]
     or if using embedded derby, ensure that tomcat is stopped, then run:
     java -cp /full/path/to/GS3/web/WEB-INF/lib/gsdl3.jar:/full/path/to/GS3/web/WEB-INF/lib/derby.jar org.greenstone.gsdl3.util.ModifyUsersDB web/etc/usersDB/
@@ -44 +45 @@
         if (args.length < 3)
         { // at minimum one field belonging to a username has to be changed
-            System.out.println("Usage: java org.greenstone.gsdl3.ModifyUsersDB <full_path_of_the_usersDB> <username> [-noAdd] [password=pwd] [groups=grp] [accounstatus=status] [comment=cmt] [email=address]");
+            System.out.println("Usage: java org.greenstone.gsdl3.ModifyUsersDB <full_path_of_the_usersDB> <username|ALL> [-noAdd] [password=pwd] [groups=grp] [addgroups=grp] [accounstatus=status] [comment=cmt] [email=address]");
             System.exit(0);
         }
@@ -51 +52 @@
         String username = args[1];
 
-        String password = "";
-        String groups = "";
-        String accountstatus = "true";
-        String comment = "";
-        String email = "";
+        String password = null;
+        String groups = null;
+                String addgroups = null;
+        String accountstatus = null;
+        String comment = null;
+        String email = null;
 
         boolean noAdd = false;
@@ -69 +71 @@
                 if (password.length() < PWD_MIN_LENGTH || password.length() > PWD_MAX_LENGTH)
                 {
-                    if (!password.equals(""))
-                    {
-                        System.out.println("Password not updated. It should be between " + PWD_MIN_LENGTH + " and " + PWD_MAX_LENGTH + " characters (inclusive).");
-                    }
+                                  System.out.println("Password not updated. It should be between " + PWD_MIN_LENGTH + " and " + PWD_MAX_LENGTH + " characters (inclusive).");
+                                  
+                                  password = null;
                 }
                 else
@@ -86 +87 @@
             {
                 groups = args[i].substring("groups=".length());
-            }
+                                groups = UserTermInfo.expandGroups(groups);
+            }
+                        else if (args[i].startsWith("addgroups="))
+                        {
+                          addgroups = args[i].substring("addgroups=".length());
+                          addgroups = UserTermInfo.expandGroups(addgroups);
+                        }
             else if (args[i].startsWith("accountstatus="))
             {
@@ -109 +116 @@
         }
 
+                if (groups != null && addgroups != null) {
+                  System.err.println("You can't use groups and addgroup at the same time");
+                  System.exit(0);
+                }
         // find the user to modify
         DerbyWrapper dw = new DerbyWrapper(usersDB);
-        UserQueryResult findUserResult = dw.findUser(username);
-
-        if (findUserResult == null)
-        {
-            if (noAdd)
-            {
-                System.out.println("Failed to update user. Cannot find user " + username + " in " + usersDB + " database.");
-            }
-            else
-            { // add new user
-                groups = UserTermInfo.expandGroups(groups);
-                //System.err.println("**** Trying to add user: ");
-                //System.err.println("**** " + username + " " + password + " " + groups + " " + accountstatus + " " + comment + " " + email);
-                dw.addUser(username, password, groups, accountstatus, comment, email);
-            }
+                if (username.equals("ALL")) {
+                  // modify all users
+                  UserQueryResult findUserResult = dw.findUser(null, null);// this returns all users
+                  Iterator<UserTermInfo> it = findUserResult.getUserTerms().iterator();
+                  while (it.hasNext()) {
+                    UserTermInfo uti = it.next();
+                    String un = uti.getUsername();
+                    modifyUser(dw, uti, un, password, groups, addgroups, accountstatus, comment, email);
+                  }
+                } else {                  
+                  UserQueryResult findUserResult = dw.findUser(username, null);
+
+                  if (findUserResult == null)
+                  {
+                    if (noAdd)
+                    {
+                      System.out.println("Failed to update user. Cannot find user " + username + " in " + usersDB + " database.");
+                    }
+                    else
+                    { // add new user
+
+                      //System.err.println("**** Trying to add user: ");
+                      //System.err.println("**** " + username + " " + password + " " + groups + " " + accountstatus + " " + comment + " " + email);
+
+                      if (password == null) {
+                        System.err.println("cannot add a user without a password");
+                       
+                      } else {
+                        if (groups == null) {
+                          if (addgroups != null) {
+                            groups = addgroups;
+                          } else {
+                            groups = "";
+                          }
+                        }
+                        if (accountstatus == null) {
+                          accountstatus = "true";
+                        }
+                        if (comment == null) {
+                          comment = "";
+                        }
+                        if (email == null) {
+                          email = "";
+                        }
+                        System.out.println("Adding new user: un=" + username + ", pw=" + password + ", groups=" + groups + ", status=" + accountstatus + ", comment=" + comment + ", email=" + email);
+                        dw.addUser(username, password, groups, accountstatus, comment, email);
+                      }
+                    }
+                  }
+                  else
+                  { // modify existing user data
+                    UserTermInfo user = findUserResult.getUserTerms().get(0);
+                    modifyUser(dw, user, username, password, groups, addgroups, accountstatus, comment, email);
+                  }
+        
         }
-        else
-        { // modify existing user data
-
-            // in case any of the other fields are not specified, get fallbacks from the database
-            UserTermInfo user = findUserResult.getUserTerms().get(0);
-
-            if (password.equals(""))
-            {
-                password = user.getPassword(); // already stored hashed-and-hexed in DB
-            }
-            if (groups.equals(""))
-            {
-                // groups should be expandedGroups because we no longer store the groups in userDB
-                // as user-entered or compacted, but as programmatically expanded.
-                // This allows HttpServletRequest.isUserInRole() to now automatically retrieve the
-                // expandedGroups list of a user to check collectionConfig.xml security elements against.
-                
-                groups = user.getExpandedGroups();
-            } else {
-                groups = UserTermInfo.expandGroups(groups); // ensure groups are stored expanded in userDB
-            }
-            if (accountstatus.equals(""))
-            {
-                accountstatus = user.getAccountStatus().equals("") ? "true" : user.getAccountStatus();
-            }
-            if (comment.equals(""))
-            {
-                comment = user.getComment();
-            }
-            if (email.equals(""))
-            {
-                email = user.getEmail();
-            }
-
-            //System.err.println("**** " + username + " " + password + " " + groups + " " + accountstatus + " " + comment + " " + email);
-            dw.modifyUserInfo(username, password, groups, accountstatus, comment, email); // other than username and pwd, remaining fields are allowed to be ""
-        }
 
         dw.closeDatabase();
 
     }
+
+  public static void modifyUser(DerbyWrapper dw, UserTermInfo user, String username, String password, String groups, String addgroups, String accountstatus, String comment, String email) {  
+                   
+    if (groups == null && addgroups != null) {
+      groups = user.getExpandedGroups(); // get the groups from db, as we want to add on to what is already there
+    }
+    if (addgroups != null) {
+      if (!groups.equals("")) {
+        groups += ",";
+      }
+      groups += addgroups;
+    }
+    System.out.println("Modifying existing user: un=" + username + ", pw=" + password + ", groups=" + groups + ", status=" + accountstatus + ", comment=" + comment + ", email=" + email);
+    dw.modifyUserInfo(username, password, groups, accountstatus, comment, email);
+  }
 }
+
+