Changeset 37694

Timestamp:

2023-04-21T15:59:29+12:00 (12 months ago)

Author:

davidb

Message:

GoogleSignin Code now upgraded so a new Google user is auto-registered -- but with no groups assigned, so essentially a user account with no capabilities within the DL

File:

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

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

@@ -24 +24 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.Statement;
 import java.sql.SQLException;
 import java.util.Collections;
@@ -316 +317 @@
         return null;
     }
-    
+
+
+    /* Based on method addUser() in DerbyWrapper.java */
+
+    public boolean registerGoogleUser(String google_verified_email)
+    {
+    // Takes the details of a email-verified Google User who is signed in,
+    // and creates a username in the Greenstone3 User database with minimal permissions
+
+    String USERS = org.greenstone.gsdl3.util.DerbyWrapper.USERS;
+        
+    String greenstone_username = google_verified_email;
+    String greenstone_password = "";
+    String accountstatus = "enabled";
+    String comment = "Google verified-email Registered User Account";
+    
+    try {
+            Connection dbConnection = open();
+            if (dbConnection == null) {
+        System.err.println("googleSigninJDBCRealm::registerGoogleUser(): failed to open connection to database");
+        return false;
+            }
+        
+        Statement state = dbConnection.createStatement();
+        String sql_insert_user = "insert into " + USERS + " values ('" + greenstone_username + "', '" + greenstone_password + "', '" + accountstatus + "', '" + comment + "', '" + google_verified_email + "')";
+        
+        state.execute(sql_insert_user);
+        
+        dbConnection.commit();
+        state.close();
+    }
+    catch (Throwable e) {
+        System.out.println("exception thrown:");
+        if (e instanceof SQLException) {
+        SQLException sql_e =(SQLException)e;
+
+        // Inline version of printSQLError from DerbyWrapper
+        while (sql_e != null) {
+            System.out.println(sql_e.toString());
+            sql_e = sql_e.getNextException();
+        }
+        }
+        else {
+        e.printStackTrace();
+        }
+        
+        System.out.println("Error:" + e.getMessage());
+        return false;
+    }
+    
+    return true;
+    }
+
+    /* Is the following needed anymore??? */
+    /* XXXX */
     protected String mapFromGoogleEmailToGreenstoneUser(String google_email)    
     {
@@ -324 +379 @@
     }
         
-    public String getGreenstoneUsernameFromGoogleTokenId(String googlesignin_id_token)
-    {   
+    public String[] getGreenstoneUsernameFromGoogleTokenId(String googlesignin_id_token)
+    {
+    
     //System.err.println("**** GoogleSigninJDBCRealm::getGreenstoneUsernameFromGoogleTokenId():" + googlesignin_id_token);
     
-    String greenstone_username = null;
+    String greenstone_username     = null;
+    String google_verified_email   = null;
+    String google_user_subject     = null;
     
     if (googlesignin_id_token != null) {
@@ -349 +407 @@
             
 
+            google_user_subject = google_user; // google user id??
+            
             if (verified) {
+            google_verified_email = google_user_email;
             greenstone_username = getUsernameFromEmail(google_user_email);
-            if (greenstone_username == null) {
+            if (greenstone_username == null) {              
                 System.err.println("Google login successful with verified email address '"+google_user_email+"' HOWEVER no matching email entry fround in Greenstone JDBC UserTable");
             }
@@ -375 +436 @@
     
     //System.err.println("***** End of getGoogleSinginInfo()");
-    
-    return greenstone_username;
+
+    String[] return_info = new String[] { greenstone_username, google_verified_email, google_user_subject };
+
+    return return_info;
     }
 
@@ -398 +461 @@
         
         // Google Client Token ID has been passed in as 'credentials'
-        String greenstone_username = getGreenstoneUsernameFromGoogleTokenId(credentials);
-
+        String[] google_to_greenstone_info = getGreenstoneUsernameFromGoogleTokenId(credentials);
+        String greenstone_username   = google_to_greenstone_info[0];
+        String google_verified_email = google_to_greenstone_info[1];
+        String google_user_subject   = google_to_greenstone_info[2];
+        
         if (greenstone_username != null) {
         System.err.println("**** Using the following username derived from verified Google email address as Greenstone3 username = '" + greenstone_username + "'");
@@ -406 +472 @@
         }
         else {
-        System.err.println("GoogleSigninJDBCRealm::authenticate(): failed to match 'google_id_token' to valid Greenstone user account");
+        System.err.println("GoogleSigninJDBCRealm::authenticate(): no existing match for 'google_id_token' to valid Greenstone user account");
+        // Auto-register the Google user
+        if (google_verified_email != null) {
+            System.err.println("GoogleSigninJDBCRealm::authenticate(): auto registering Google verified-email account for " + google_verified_email);
+            boolean register_status_ok = registerGoogleUser(google_verified_email);
+
+            if (register_status_ok) {
+            // The google_verified_email is used as the greenstone username, to ensure it is unique
+            principal = super.getPrincipal(google_verified_email);
+            }
+            else {
+            System.err.println("GoogleSigninJDBCRealm::authenticate(): auto-registration failed");
+            }
+        }
+        else {
+            System.err.println("GoogleSigninJDBCRealm::authenticate(): Rejecting login attempt, account has a non-verified Google email address");
+        }
         }
     }
     else {
-        // Regular Greenstone3 User Login case
-        System.out.println("***> beginning normal authentication");
+        // Regular Greenstone3 User Login case
+        System.out.println("***> beginning normal authentication");
         principal = super.authenticate(username,credentials);
     }