Changeset 25338 for main/trunk/greenstone3/src/java

Timestamp:

2012-04-03T20:56:04+12:00 (12 years ago)

Author:

ak19

Message:

1. Replacing ChangePwdUsersDB.java with new file ModifyUsersDB.java, since the latter allows you to modify any and all fields for a username. 2. Now build.xml's config-admin target has been updated to call ModifyUsersDB with a new password for the admin user. A new target, config-user, takes user input to set any or all fields of any username. This can then be called by the release-kit if we wish to add a demo user during installation as we did in the GS2 releasekit. 3. Updated txt2usersDB.java to take the append flag: with this flag on, it will no longer delete the entire DB and read a new DB in from the input text file, but will append the additional entries in the input text file to the existing entries in the usersDB.

Location:

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

Files:

• ModifyUsersDB.java (added)
• txt2usersDB.java (modified) (6 diffs)

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

@@ -21 +21 @@
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.File;
 import java.io.FileReader;
 import java.sql.SQLException;
+
+import org.greenstone.gsdl3.service.Authentication;
 
 public class txt2usersDB {
     
     public static void main(String[] args) throws SQLException{
-    
-    if (args.length!=2){
-        System.out.println("Usage: java org.greenstone.gsdl3.txt2usersDB full_path_of_the_text_file full_path_of_the_usersDB");
+    boolean appending = false;
+
+    String usage = "Usage: java org.greenstone.gsdl3.txt2usersDB full_path_of_the_text_file full_path_of_the_usersDB [-append]";
+    if (args.length < 2){
+        System.out.println(usage);
         System.exit(0);
     }
+    File txtfile = new File(args[0]);
+    if(!txtfile.exists()) {
+        System.out.println("File " + args[0] + " does not exist.");
+        System.out.println(usage);      
+        System.exit(0);
+    }
+
     try {
         BufferedReader in = new BufferedReader(new FileReader(args[0]));
@@ -37 +49 @@
         DerbyWrapper dw=new DerbyWrapper();
         dw.connectDatabase(args[1],false);
-        boolean delete_rows = dw.deleteAllUser();
-        dw.closeDatabase();
-        if (!delete_rows){
-        System.out.println("Couldn't delete rows of the users table");
-        System.exit(0);
-        }
+
+        if(args.length > 2 && args[2].equals("-append")) {
+            appending = true;
+        } else {
+        // no appending, replace existing database: the text file 
+        // represents the new database, so delete the existing DB first
+        boolean delete_rows = dw.deleteAllUser();
+        dw.closeDatabase();
+        if (!delete_rows){
+            System.out.println("Couldn't delete rows of the users table");
+            System.exit(0);
+        }
+        } 
+
         String username=null;
         String password=null;
@@ -49 +69 @@
         String comment=null;
         String email=null;
+
         while ((str = in.readLine()) != null) {
         //ystem.out.println(str);
@@ -88 +109 @@
             groups=str.substring(str.indexOf(">")+1,str.length());
             }
-            if (field.equals("password")){
-            //password=dw.rot13(str.substring(str.indexOf(">")+1,str.length()));
+            if (field.equals("password")){          
             password=str.substring(str.indexOf(">")+1,str.length());
             }
@@ -97 +117 @@
         }
         else if (str.equals("----------------------------------------------------------------------")
-             || str.equals("-------------------------------------")) {          
+             || str.equals("-------------------------------------")) {
             
-            if ((username!=null) && (password!=null) && (groups!=null) && (accountstatus!=null) && (comment!=null) && (email!=null)) {
+            if ((username!=null) && (password!=null) && (groups!=null) && (accountstatus!=null) && (comment!=null)) {
             dw.connectDatabase(args[1],false);
-            dw.addUser(username, password, groups, accountstatus, comment, email);
+
+            // check if it's a new user or already exists in the database
+            UserQueryResult findUserResult = dw.findUser(username);
+            
+            if(findUserResult == null) { // add new user
+                if(password.length() >= 3 && password.length() <= 8) { // if not yet encrypted, encrypt first
+                password = Authentication.hashPassword(password);
+                } // if > 8 chars, password for user being added was already encrypted (hashed-and-hexed)
+                dw.addUser(username, password, groups, accountstatus, comment, email);
+            } 
+
+            else { // modify existing user
+                // if any of the other fields are not specified, get them from the database
+                UserTermInfo user = findUserResult.getUserTerms().get(0);
+                
+                if(password.length() < 3 || password.length() > 8) { // includes empty string case
+                password = user.password;
+                } else { // need to first encrypt (hash-and-hex) the user-entered password
+                // Use the same encryption technique used by the Admin Authentication page
+                // This ensures that the password generated for a string remains consistent
+                password = Authentication.hashPassword(password);
+                }
+                groups = groups.equals("") ? user.groups : groups;
+                accountstatus = accountstatus.equals("") ? user.accountstatus : accountstatus;
+                comment = comment.equals("") ? user.comment : comment;
+
+                if (email == null) { // special checking for backwards compatibility since old DB did not have email field
+                email = "";
+                }
+                if(user.email == null) {
+                user.email = "";
+                }
+                if(email.equals("")) {
+                email = user.email; 
+                }
+                
+                //System.err.println("**** Password: " + password);             
+                //System.err.println("**** " + username + " " + password + " " + groups + " " + accountstatus + " " + comment + " " + email);
+                dw.modifyUserInfo(username, password, groups, accountstatus, comment, email);
+            }
+            
             username=null;
             password=null;
@@ -112 +172 @@
             }
         }
-        else { // encrypted passwords can span multiple lines for some reason
+        
+        // only true back when when hashed passwords weren't being converted to hex
+        //else { // encrypted passwords can span multiple lines for some reason
                // assume that is the case here
-            if(password != null) { 
-            password = password + "\n" + str;
-            }
-        }
-        }   
+        //if(password != null) { 
+        //  password = password + "\n" + str;
+        //  }
+        //}
+
+        }
+        //dw.closeDatabase();
         in.close();
     } catch (IOException e) {