Changeset 1267 for trunk

Timestamp:

03/22/19 16:13:57 (5 years ago)

Author:

bln4

Message:

 

File:

• trunk/src/org/expeditee/auth/Authenticator.java (modified) (2 diffs)

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

@@ -82 +82 @@
         }
         
-        private Authenticator() throws KeyStoreException, FileNotFoundException, IOException, NoSuchAlgorithmException, CertificateException, ClassNotFoundException, SQLException {                    
+        private Authenticator() throws KeyStoreException, FileNotFoundException, IOException, NoSuchAlgorithmException, CertificateException, ClassNotFoundException, SQLException {
+                System.out.println("Running Expeditee in Authentication Mode.");
                 UserSettings.setupDefaultFolders();
                         
@@ -133 +134 @@
                 // Fetch desired password
                 Scanner in = new Scanner(System.in);
-                System.out.println("You have definately not yet set up a password for the administration account on Expeditee.");
-                System.out.print("Please enter it now: ");
-                System.out.flush();
-                String password = in.nextLine();
-                System.out.print("And again: ");
-                System.out.flush();
-                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();
+                System.out.println("No administrative password set.");
+                boolean passwordIsSet = false;
+                
+                for (int i = 0; i < 3; i++) {
+                        System.out.print("Please enter it now: ");
+                        System.out.flush();
+                        String password = in.nextLine();
+                        System.out.print("And again: ");
+                        System.out.flush();
+                        if (in.nextLine().equals(password)) {
+                                // Register account.
+                                putKey(ADMINACCOUNT, password, new SecretKeySpec("null".getBytes(), AsymmetricAlgorithm));
+                                in.close();
+                                passwordIsSet = true;
+                                break;
+                        } else {
+                                System.out.println("Mismatched passwords, let's try that again.");
+                        }
+                }
+                
+                if (!passwordIsSet) {
+                        System.out.println("Failed to set an admin password.  Exiting Expeditee.");
+                        System.exit(1);
                 }
         }