Changeset 1263 for trunk

Timestamp:

03/21/19 11:13:03 (5 years ago)

Author:

bln4

Message:

When starting Authenticator mode and the authadmin account has not been registered, have the user register it.

Location:

trunk/src/org/expeditee/auth

Files:

• Actions.java (modified) (3 diffs)
• Authenticator.java (modified) (5 diffs)

trunk/src/org/expeditee/auth/Actions.java

@@ -48 +48 @@
 import org.expeditee.auth.tags.Constants;
 import org.expeditee.core.Colour;
+import org.expeditee.gui.Browser;
 import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Frame;
@@ -473 +474 @@
                 String password = userdata.get(AuthenticationTag.Password);
                 
+                if (username.equals(Browser.USER_NOBODY)) {
+                        return;
+                }
+                
                 SecretKey personalKey = Authenticator.getInstance().getSecretKey(username, password);
                 if (personalKey == null) {
@@ -493 +498 @@
 //              });
 
-                
-                // Load in and cache the profile frame using the personal key fetched from keystore.
-                // Reset the personal key once finished so that setting parsing can correctly set it.
-                FrameIO.ClearCache();
-                Text personalKeyText = KeyList.PersonalKey.generateText();
-                personalKeyText.setData(Base64.getEncoder().encodeToString(personalKey.getEncoded()));
-                KeyList.PersonalKey.setSetting(personalKeyText);
-                Frame oneFrame = FrameIO.LoadProfile(username);
-                for (int i = 1; i <= FrameIO.getLastNumber(username); i++) {
-                        Frame f = FrameIO.LoadFrame(oneFrame.getFramesetName() + i);
-                        if (f.getData() != null && f.getData().contains("MultiuserCredentials")) {
-                                Authenticator.CREDENTIALS_FRAME = f.getNumber();
-                        }
+                Frame oneFrame = null;
+                if (!username.equals(Authenticator.ADMINACCOUNT)) {
+                        // Load in and cache the profile frame using the personal key fetched from keystore.
+                        // Reset the personal key once finished so that setting parsing can correctly set it.
+                        FrameIO.ClearCache();
+                        Text personalKeyText = KeyList.PersonalKey.generateText();
+                        personalKeyText.setData(Base64.getEncoder().encodeToString(personalKey.getEncoded()));
+                        KeyList.PersonalKey.setSetting(personalKeyText);
+                        oneFrame = FrameIO.LoadProfile(username);
+                        for (int i = 1; i <= FrameIO.getLastNumber(username); i++) {
+                                Frame f = FrameIO.LoadFrame(oneFrame.getFramesetName() + i);
+                                if (f.getData() != null && f.getData().contains("MultiuserCredentials")) {
+                                        Authenticator.CREDENTIALS_FRAME = f.getNumber();
+                                }
+                        }
+                                        
+                        // Parse the settings frame to update the settings datastructure.
+                        Text fakeLink = new Text("settings");
+                        fakeLink.setLink(oneFrame.getFramesetName() + "2");
+                        Settings.parseSettings(fakeLink);
+                        
+                        // Update default folders.
+                        UserSettings.setupDefaultFolders();
+
+                        // Check mail
+                        MailBay.clear();
+                        Authenticator.getInstance().loadMailDatabase();
+                        Text keyItem = org.expeditee.settings.identity.secrets.KeyList.PrivateKey.get();
+                        if (keyItem.getData() != null) {
+                                String keyEncoded = keyItem.getData().get(0);
+                                byte[] keyBytes = Base64.getDecoder().decode(keyEncoded);
+                                PrivateKey key = KeyFactory.getInstance(AsymmetricAlgorithm).generatePrivate(new PKCS8EncodedKeySpec(keyBytes));
+                                List<MailEntry> mailForLoggingInUser = Mail.getEntries(UserSettings.UserName.get(), key);
+                                for (MailEntry mail: mailForLoggingInUser) {
+                                        MailBay.addMessage(mail.timestamp, mail.message, mail.message2, mail.options);
+                                }
+                        }
+                } else {
+                        UserSettings.UserName.set(Authenticator.ADMINACCOUNT);
+                        oneFrame = FrameIO.LoadFrame("multiuser1");
                 }
                                 
-                // Parse the settings frame to update the settings datastructure.
-                Text fakeLink = new Text("settings");
-                fakeLink.setLink(oneFrame.getFramesetName() + "2");
-                Settings.parseSettings(fakeLink);
-                
-                // Update default folders.
-                UserSettings.setupDefaultFolders();
-
-                // Check mail
-                MailBay.clear();
-                Authenticator.getInstance().loadMailDatabase();
-                Text keyItem = org.expeditee.settings.identity.secrets.KeyList.PrivateKey.get();
-                if (keyItem.getData() != null) {
-                        String keyEncoded = keyItem.getData().get(0);
-                        byte[] keyBytes = Base64.getDecoder().decode(keyEncoded);
-                        PrivateKey key = KeyFactory.getInstance(AsymmetricAlgorithm).generatePrivate(new PKCS8EncodedKeySpec(keyBytes));
-                        List<MailEntry> mailForLoggingInUser = Mail.getEntries(UserSettings.UserName.get(), key);
-                        for (MailEntry mail: mailForLoggingInUser) {
-                                MailBay.addMessage(mail.timestamp, mail.message, mail.message2, mail.options);
-                        }
-                }
-                
                 Collection<Item> usernameFields = getByData(FrameIO.LoadFrame(Constants.FRAME_MULTIUSER1), "txtUsername");
                 usernameFields.forEach(usernameField -> usernameField.setText(username));

trunk/src/org/expeditee/auth/Authenticator.java

@@ -65 +65 @@
         // The frame number of the frame containing the current authenticated users public key.
         public static int CREDENTIALS_FRAME = 13;
+        public static final String ADMINACCOUNT = "authadmin";
         
         public static boolean Authenticated = false;
@@ -73 +74 @@
         private static final byte[] FALSE = "no".getBytes();
         private static final String KEYSTOREFILENAME = "keystore.ks" + File.separator;
-        
+                
         private static Authenticator instance;
         
@@ -81 +82 @@
         }
         
-        private Authenticator() throws KeyStoreException, FileNotFoundException, IOException, NoSuchAlgorithmException, CertificateException, ClassNotFoundException, SQLException {    
+        private Authenticator() throws KeyStoreException, FileNotFoundException, IOException, NoSuchAlgorithmException, CertificateException, ClassNotFoundException, SQLException {                    
                 UserSettings.setupDefaultFolders();
                         
@@ -89 +90 @@
                 Actions.LoadMethods(org.expeditee.auth.sharing.Actions.class);
 
+                // Does the account Authentication.ADMINACCOUNT exist?
+                // If not then we have get the user to assign a password to it.
+                if (!keyStore.containsAlias(Authenticator.ADMINACCOUNT)) {
+                        new File(FrameIO.PARENT_FOLDER).mkdirs();
+                        protectAdmin();
+                }
+                
                 // draw the window
                 GraphicsManager g = EcosystemManager.getGraphicsManager();
@@ -119 +127 @@
                 // class load database classes
                 Class.forName("org.sqlite.JDBC");
+        }
+
+        private void protectAdmin() throws KeyStoreException, NoSuchAlgorithmException, CertificateException,
+                        FileNotFoundException, IOException {
+                // Fetch desired password
+                Scanner in = new Scanner(System.in);
+                System.out.println("It appears you have not yet set up a password for the administration account on Expeditee.");
+                System.out.print("Please enter it now: ");
+                String password = in.nextLine();
+                System.out.print("And again: ");
+                if (in.nextLine().equals(password)) {
+                        // Register account.
+                        putKey(ADMINACCOUNT, password, new SecretKeySpec("null".getBytes(), AsymmetricAlgorithm));
+                        in.close();
+                } else {
+                        in.close();
+                        System.out.println("Mismatched passwords, lets try that again.");
+                        protectAdmin();
+                }
         }