Changeset 1363 for trunk/src/org/expeditee/auth/Actions.java

Timestamp:

05/17/19 14:37:12 (5 years ago)

Author:

bln4

Message:

It is now possible to complete the process of recovering access to a Expeditee account. Further work, in the form of frames in the authentication frameset, are to follow.
A refactoring/tidy up has also been completed.

File:

• trunk/src/org/expeditee/auth/Actions.java (modified) (17 diffs)

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

@@ -23 +23 @@
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -39 +38 @@
 import org.expeditee.agents.ExistingFramesetException;
 import org.expeditee.agents.InvalidFramesetNameException;
-import org.expeditee.auth.Mail.MailEntry;
 import org.expeditee.auth.account.Authenticate;
 import org.expeditee.auth.account.Authenticate.AuthenticationResult;
@@ -45 +43 @@
 import org.expeditee.auth.account.Create.CreateResult;
 import org.expeditee.auth.account.Password;
-import org.expeditee.auth.gui.MailBay;
+import org.expeditee.auth.mail.Mail;
+import org.expeditee.auth.mail.Mail.MailEntry;
+import org.expeditee.auth.mail.gui.MailBay;
 import org.expeditee.auth.tags.AuthenticationTag;
-import org.expeditee.core.Colour;
 import org.expeditee.gio.gesture.StandardGestureActions;
 import org.expeditee.gui.DisplayController;
@@ -56 +55 @@
 import org.expeditee.items.Text;
 import org.expeditee.settings.UserSettings;
-import org.expeditee.settings.identity.passwordrecovery.Colleagues;
 import org.expeditee.settings.identity.secrets.KeyList;
 import org.expeditee.stats.Formatter;
@@ -63 +61 @@
 public class Actions implements CryptographyConstants {
         
-        //Debug Functions
+        //      Start Debug Actions
         public static void SendTestMessage(String colleagueName) throws InvalidKeySpecException, NoSuchAlgorithmException, FileNotFoundException, KeyStoreException, CertificateException, ClassNotFoundException, IOException, SQLException {
                 String time = org.expeditee.stats.Formatter.getDateTime();
@@ -75 +73 @@
                 MessageBay.displayMessage("Test message sent.");
         }
+        
         public static void SendTestMessageHemi(String param) {
                 String time = Formatter.getDateTime();
@@ -87 +86 @@
                 MessageBay.displayMessage("Test message sent.");
         }
+        
         public static void SendTestOneOffMessage(String colleagueName) {
                 String time = Formatter.getDateTime();
@@ -101 +101 @@
                 Mail.sendOneOffMail(mail, colleagueName, key);
         }
-        public static void AuthOneOffSecureMessage(Text cursor, Text actionItem) {
-                byte[] keyBytes = Base64.getDecoder().decode(cursor.getText());
-                SecretKey key = new SecretKeySpec(keyBytes, SymmetricAlgorithm);
-                List<String> data = actionItem.getData();
-                String topic = new String(org.expeditee.auth.sharing.Actions.DecryptSymmetric(Base64.getDecoder().decode(data.get(3)), key));
-                String message = new String(org.expeditee.auth.sharing.Actions.DecryptSymmetric(Base64.getDecoder().decode(data.get(4)), key));
-                Map<String, String> options = new HashMap<String, String>();
-                for (int i = 5; i < data.size(); i+=2) {
-                        String k = new String(org.expeditee.auth.sharing.Actions.DecryptSymmetric(Base64.getDecoder().decode(data.get(i)), key));
-                        String v = new String(org.expeditee.auth.sharing.Actions.DecryptSymmetric(Base64.getDecoder().decode(data.get(i + 1)), key));
-                        options.put(k, v);
-                }
-                MailBay.addMessage(data.get(0), topic, message, options);
-                StandardGestureActions.Refresh();
-        }
-        public static void SetPWColleagues(String colleagueOne, String colleagueTwo) {
-                Colleagues.Colleague_One.set(colleagueOne);
-                Colleagues.Colleague_Two.set(colleagueTwo);
-                Colleagues.Colleague_One_Email.set("[email protected]");
-                Colleagues.Colleague_Two_Email.set("[email protected]");
-        }
         
         private static String userbackup = "authadmin";
@@ -128 +107 @@
                 UserSettings.UserName.set(userbackup);
                 userbackup = backup;
+        }
+        //      End Debug Actions
+        
+        //      Start Misc Auth Actions
+        /**
+         * Action ran by user to read a message using a single use distributed Symmetric key 
+         * @param cursor The content on the cursor should be a text item whose content is the 
+         * Symmetric key to use, represented as a Base64 encoded string.
+         * @param actionItem The action item will contain the encrypted message in its data.
+         */
+        public static void AuthOneOffSecureMessage(Text cursor, Text actionItem) {
+                byte[] keyBytes = Base64.getDecoder().decode(cursor.getText());
+                SecretKey key = new SecretKeySpec(keyBytes, SymmetricAlgorithm);
+                List<String> data = actionItem.getData();
+                Mail.decryptOneOffSecureMessage(key, data);
+                StandardGestureActions.Refresh();
         }
         
@@ -166 +161 @@
         }
         
+        /**
+         * Action used to navigate to multiuser1 (multiuser abilities) if authenticated and authentication1 (login) is not so. 
+         */
+        public static void AuthGotoAccountManagement() {
+                if (AuthenticatorBrowser.Authenticated) {
+                        DisplayController.setCurrentFrame(FrameIO.LoadFrame("multiuser1"), false);
+                } else {
+                        DisplayController.setCurrentFrame(FrameIO.LoadFrame("authentication1"), false);
+                }
+        }
+        
+        /**
+         * Gets all items on a specified frame that contain the specified data.
+         */
+        public static Collection<Item> getByData(Frame frame, String data) {
+                Collection<Item> allItems = frame.getAllItems();
+                allItems.removeIf(i -> i.getData() == null || !i.hasData(data));
+                return allItems;
+        }
+        
+        /**
+         * Gets all items on a specified frame that contains the specified content.
+         */
+        public static Collection<Item> getByContent(Frame frame, String content) {
+                Collection<Item> allItems = frame.getAllItems();
+                allItems.removeIf(i -> i.getText().compareTo(content) != 0);
+                return allItems;
+        }
+        //      End Misc Auth Actions
+        
+        //      Start Regain Account Access Actions 
+        /**
+         * Action ran by user to specify who their password colleagues are.  These are the 
+         * individuals who will be consulted if and when the user needs to regain access 
+         * to their account.  
+         * @param colleagueOne
+         * @param colleagueTwo
+         */
+        public static void AuthSetPWColleagues(String colleagueOne, String colleagueTwo) {
+                Password.setPWColleagues(colleagueOne, colleagueTwo);
+        }
+        
+        /**
+         * Action ran by user to oblige with a request from colleague who has nominated the
+         * user as a pw colleague.  Will email (not Expeditee mail) the colleague the password
+         * share that the user has stored on their secrets frame. 
+         * @param colleagueName
+         */
+        public static void AuthEmailPasswordShare(String colleagueName) {
+                Password.emailPasswordShare(colleagueName);
+        }
+        
+        /**
+         * Action ran by user to regain access to their account by providing:
+         *      their username
+         *      two password shares obtained from pw colleagues
+         *      their desired new password
+         */
+        public static void AuthRegainAccountAccess() {
+                Collection<Text> textItems = DisplayController.getCurrentFrame().getTextItems();
+                Optional<Map<AuthenticationTag, String>> userdata = AuthenticationTag.fetchUserData(textItems, false, 
+                                AuthenticationTag.Username, AuthenticationTag.NewPassword, AuthenticationTag.NewPasswordAgain, 
+                                AuthenticationTag.PasswordSliceOne, AuthenticationTag.PasswordSliceTwo);
+                if (userdata.isPresent()) {
+                        // Confirm new requested passwords match
+                        Map<AuthenticationTag, String> userData = userdata.get();
+                        if (!userData.get(AuthenticationTag.NewPassword).equals(userData.get(AuthenticationTag.NewPasswordAgain))) {
+                                return;
+                        }
+                        
+                        Password.regainAccountAccess(userData);
+                }
+        }
+                
+        /**
+         * Actions used to generate and deliver an intergalactic number to a users public email
+         * address after they have began the password recovery process.
+         */
+        public static void AuthDistributeIntergalacticNumber() {
+                Collection<Text> textItems = DisplayController.getCurrentFrame().getTextItems();
+                Optional<Map<AuthenticationTag, String>> userdata = 
+                                AuthenticationTag.fetchUserData(textItems, false, AuthenticationTag.Username);
+                if (userdata.isPresent()) {
+                        Map<AuthenticationTag, String> userData = userdata.get();
+                        String username = userData.get(AuthenticationTag.Username);
+                        String email = getEmailFromUsername(username);
+                        userData.put(AuthenticationTag.Email, email);
+                        Password.generateAndDeliverIntergalacticNumber(userData);
+                        MessageBay.displayMessage("A identity number has been sent to the email "
+                                        + "associated with your account.  Enter it below to proceed.");
+                }
+        }
+        
+        /**
+         * Action used by user to submit their intergalactic number along with their username
+         * in order to confirm that they own the public email address registered to their account.
+         * This is part of the process of recoverying access to an account.
+         */
+        public static void AuthSubmitIntergalacticNumber() {
+                Collection<Text> textItems = DisplayController.getCurrentFrame().getTextItems();
+                Optional<Map<AuthenticationTag, String>> userdata = 
+                                AuthenticationTag.fetchUserData(textItems, false, AuthenticationTag.Username, 
+                                                AuthenticationTag.IntergalacticNumber);
+                if (userdata.isPresent()) {
+                        Password.confirmIntergalacticNumberAndAlertColleagues(userdata.get());
+                }
+        }
+        //      End Regain Account Access Actions 
+        
+        //      Start Create Account Actions
         /**
          * Action used to created a new user account.
@@ -235 +340 @@
                 }
         }
-        
+        //      End Create Account Actions
+        
+        //      Start Account Login Actions
         /**
          * Action used to start authentication as a specified user.  
@@ -258 +365 @@
         }
         
+        /**
+         * Action used by the user to log out of their account.
+         */
         public static void AuthLogout() {
                 MessageBay.displayMessage(Authenticate.logout().toString());
         }
-        
+        //      End Account Login Actions
+        
+        //      Start Change Access Actions
         /**
          * Action used to change the currently authenticated users password.
@@ -295 +407 @@
                 }
         }
-        
-        public static void AuthGotoAccountManagement() {
-                if (AuthenticatorBrowser.Authenticated) {
-                        DisplayController.setCurrentFrame(FrameIO.LoadFrame("multiuser1"), false);
-                } else {
-                        DisplayController.setCurrentFrame(FrameIO.LoadFrame("authentication1"), false);
-                }
-        }
-        
-        public static void AuthDistributeIntergalacticNumber() {
-                Collection<Text> textItems = DisplayController.getCurrentFrame().getTextItems();
-                Optional<Map<AuthenticationTag, String>> userdata = 
-                                AuthenticationTag.fetchUserData(textItems, false, AuthenticationTag.Username);
-                if (userdata.isPresent()) {
-                        Map<AuthenticationTag, String> userData = userdata.get();
-                        String username = userData.get(AuthenticationTag.Username);
-                        String email = getEmailFromUsername(username);
-                        userData.put(AuthenticationTag.Email, email);
-                        Password.generateAndDeliverIntergalacticNumber(userData);
-                        MessageBay.displayMessage("A identity number has been sent to the email "
-                                        + "associated with your account.  Enter it below to proceed.");
-                }
-        }
-        
-        public static void AuthSubmitIntergalacticNumber() {
-                Collection<Text> textItems = DisplayController.getCurrentFrame().getTextItems();
-                Optional<Map<AuthenticationTag, String>> userdata = 
-                                AuthenticationTag.fetchUserData(textItems, false, AuthenticationTag.Username, 
-                                                AuthenticationTag.IntergalacticNumber);
-                if (userdata.isPresent()) {
-                        Map<AuthenticationTag, String> tags = userdata.get();
-                        String username = tags.get(AuthenticationTag.Username);
-                        String intergalacticNumber = tags.get(AuthenticationTag.IntergalacticNumber);
-                        boolean match = false;
-                        try {
-                                match = AuthenticatorBrowser.getInstance().confirmIntergalaticNumber(username, intergalacticNumber);
-                        } catch (NoSuchAlgorithmException | KeyStoreException | CertificateException | ClassNotFoundException
-                                        | IOException | SQLException e) {
-                                e.printStackTrace();
-                                return;
-                        }
-                        if (!match) {
-                                MessageBay.errorMessage("The provided identity number does not match the one stored on file.");
-                                return;
-                        }
-                        String[] colleagues = getPasswordColleaguesFromUsername(username);
-                        Password.confirmIntergalacticNumberAndAlertColleagues(userdata.get(), colleagues);
-                }
-        }
-        
+        // End Change Access Actions
+        
+        // Start Private Helper Functions.  
+        /**
+         * Gets the public email address associated with the specified username.
+         * @param username
+         * @return
+         */
         private static String getEmailFromUsername(String username) {
                 Path credentialsDirPath = Paths.get(FrameIO.PROFILE_PATH).resolve(username).resolve(username + "-credentials");
@@ -374 +444 @@
                 }
         }
-        
-        private static String[] getPasswordColleaguesFromUsername(String username) {
-                Path credentialsDirPath = Paths.get(FrameIO.PROFILE_PATH).resolve(username).resolve(username + "-credentials");
-                Path credentialsFilePath = credentialsDirPath.resolve("pwcolleagues.inf");
-                String fileName = null;
-                if (credentialsFilePath.toFile().exists()) {
-                        try (Scanner in = new Scanner(credentialsFilePath)) {
-                                fileName = in.nextLine();
-                        } catch (IOException e) {
-                                MessageBay.errorMessage("Unable to password colleague frame for specified user, are they registered on this computer?");
-                                return null;
-                        }
-                } else {
-                        MessageBay.errorMessage("Unable to password colleague frame for specified user, are they registered on this computer?");
-                        return null;
-                }
-                
-                int number = Integer.parseInt(fileName.replace(".exp", ""));
-                Frame pwColleagueFrame = FrameIO.LoadFrame(username + number, FrameIO.PROFILE_PATH);
-                Collection<Text> textItems = pwColleagueFrame.getTextItems();
-                textItems.removeIf(text -> !text.getText().startsWith("Colleague"));
-                
-                String[] ret = new String[4];
-                Iterator<Text> it = textItems.iterator();
-                while(it.hasNext()) {
-                        String content = it.next().getText().toLowerCase().trim();
-                        if (content.contains("colleague_one:")) {
-                                ret[0] = content.replace("colleague_one:", "").trim();
-                        } else if (content.contains("colleague_two:")) {
-                                ret[1] = content.replace("colleague_two:", "").trim();
-                        } else if (content.contains("colleague_one_email:")) {
-                                ret[2] = content.replace("colleague_one_email:", "").trim();
-                        } else if (content.contains("colleague_two_email:")) {
-                                ret[3] = content.replace("colleague_two_email:", "").trim();
-                        }
-                }
-                return ret;
-        }
-        
+        //      End Private Helper Functions.
+        
+        //      Start Future Functionality
         public static void AuthShareFrameset() throws IOException {
                 Collection<Text> textItems = DisplayController.getCurrentFrame().getTextItems();
@@ -431 +465 @@
                 }
         }
-
-        /**
-         * Navigation action for progressing the process of recruiting colleagues to assist in password recovery.
-         * Hides certain content that AuthSubmitPWCollegues goes onto show if it does not fail.
-         */
-        public static void AuthGotoColleagueSubmissionFrame() {
-                Frame destination = FrameIO.LoadFrame("authentication7");
-                DisplayController.setCurrentFrame(destination, true);
-                Collection<Item> toHide = getByData(destination, "ShowOnProgress");
-                for (Item i: toHide) {
-                        i.setVisible(false);
-                }
+        
+        /*
+         * Function to share a specified frameset.
+         * Currently, this moves the frameset to the 'Shared By Me' directory and then relies on the user to use Google Drive functionality to share it appropriately.
+         */
+        private static void shareFrameset(Frame toShare) throws IOException {   
+                File destinationDir = new File(FrameIO.SHARED_FRAMESETS_PATH + File.separator + toShare.getFramesetName());
+                File sourceDir = new File(toShare.getFramesetPath());
+                
+                if (destinationDir.exists()) {
+                        MessageBay.errorMessage("A frameset by this name already exists.");
+                        return;
+                }
+                
+                destinationDir.mkdir();
+                List<Path> files = Files.walk(sourceDir.toPath()).collect(Collectors.toList());
+                Files.move(files.get(0), destinationDir.toPath(), StandardCopyOption.ATOMIC_MOVE);
+                
+                MessageBay.displayMessage("The frameset " + toShare.getFramesetName() + " has been moved to " + destinationDir + ".  Google Drive functionality can now be used to share it with colleagues.");
         }
         
@@ -493 +534 @@
         }
         
-//      public static void AuthSetupPasswordRecovery() throws KeyStoreException, FileNotFoundException, NoSuchAlgorithmException, CertificateException, ClassNotFoundException, IOException, SQLException, UnrecoverableEntryException {
-//              if (!UserSettings.Authenticated.get()) {
-//                      MessageBay.errorMessage("You must be logged in to perform this action.");
-//              } else if (!Authenticator.getInstance().hasRegisteredEmail(UserSettings.UserName.get())) {
-//                      Frame registerEmailFrame = FrameIO.LoadFrame("authentication4");
-//                      DisplayController.setCurrentFrame(registerEmailFrame, true);
-//              } else if (!Authenticator.getInstance().hasRequestedColleagues(UserSettings.UserName.get()) && Authenticator.getInstance().getColleagues(UserSettings.UserName.get()) == null) {
-//                      Frame submitColleaguesFrame = FrameIO.LoadFrame("authentication5");
-//                      DisplayController.setCurrentFrame(submitColleaguesFrame, true);
-//              } else if (Authenticator.getInstance().hasRequestedColleagues(UserSettings.UserName.get()) && Authenticator.getInstance().getColleagues(UserSettings.UserName.get()) == null) {
-//                      MessageBay.displayMessage("You have already nominated two colleagues to assist you in the process of password recovery and are awaiting their response."
-//                                      + "  You will be alerted on Expeditee startup when they have both responded.");
-//              } else if (Authenticator.getInstance().getColleagues(UserSettings.UserName.get()) != null) {
-//                      MessageBay.displayMessage("You have completed the Password Recovery Setup process, there is nothing more to do here.");
-//              }
-//      }
-        
-        public static void AuthConfirmPasswordColleagueRelationship(String colleagueName) {
-                
-        }
-        
-        public static void AuthDenyPasswordColleagueRelationship(String colleagueName) throws InvalidKeySpecException, NoSuchAlgorithmException, 
-                KeyStoreException, FileNotFoundException, CertificateException, ClassNotFoundException, IOException, SQLException {
-                denyPasswordColleagueRelationship(colleagueName);
-        }
-        
-        public static void AuthClearPWColleaguesNominated() {
-                
-        }
-        
         /*
-         * Function to share a specified frameset.
-         * Currently, this moves the frameset to the 'Shared By Me' directory and then relies on the user to use Google Drive functionality to share it appropriately.
-         */
-        private static void shareFrameset(Frame toShare) throws IOException {   
-                File destinationDir = new File(FrameIO.SHARED_FRAMESETS_PATH + File.separator + toShare.getFramesetName());
-                File sourceDir = new File(toShare.getFramesetPath());
-                
-                if (destinationDir.exists()) {
-                        MessageBay.errorMessage("A frameset by this name already exists.");
-                        return;
-                }
-                
-                destinationDir.mkdir();
-                List<Path> files = Files.walk(sourceDir.toPath()).collect(Collectors.toList());
-                Files.move(files.get(0), destinationDir.toPath(), StandardCopyOption.ATOMIC_MOVE);
-                
-                MessageBay.displayMessage("The frameset " + toShare.getFramesetName() + " has been moved to " + destinationDir + ".  Google Drive functionality can now be used to share it with colleagues.");
-        }
-        
-        private static void denyPasswordColleagueRelationship(String colleagueName) throws InvalidKeySpecException, NoSuchAlgorithmException, KeyStoreException, FileNotFoundException, CertificateException, ClassNotFoundException, IOException, SQLException {
-                String time = org.expeditee.stats.Formatter.getDateTime();
-                String sender = UserSettings.UserName.get();
-                String message = "You have received a reply from " + sender + " reguarding your request for assistance.";
-                String message2 = "Unfortunately " + sender + " has indicated that they are unable to help you with your potential password recovery.";
-                Map<String, String> options = new HashMap<String, String>();
-                options.put("Clear Preview Colleague Nominations", "AuthClearPWColleaguesNominated");
-                MailEntry mail = new MailEntry(time, sender, colleagueName, message, message2, options);
-                Mail.sendMail(mail, colleagueName);
-        }
-        
+         * Function to submit a request to specified contacts to be the current users pw colleagues.
+         */
         private static boolean submitPWColleagues(Map<AuthenticationTag, String> userData) throws InvalidKeySpecException, NoSuchAlgorithmException, KeyStoreException, FileNotFoundException, CertificateException, ClassNotFoundException, IOException, SQLException {
                 String colleagueOne = userData.get(AuthenticationTag.ColleagueOne);
@@ -581 +564 @@
                 }
         }
-        
-        public static void TickBox(final Text item) {
-                if (item.getBackgroundColor() != Colour.RED) {
-                        item.setBackgroundColor(Colour.RED);
-                } else {
-                        item.setBackgroundColor(Colour.GREEN);
-                }
-        }
-        
-        /*
-         * Gets all items on a specified frame that contain the specified data.
-         */
-        public static Collection<Item> getByData(final Frame frame, final String data) {
-                final Collection<Item> allItems = frame.getAllItems();
-                allItems.removeIf(i -> i.getData() == null || !i.hasData(data));
-                return allItems;
-        }
-        
-        public static Collection<Item> getByContent(final Frame frame, final String content) {
-                final Collection<Item> allItems = frame.getAllItems();
-                allItems.removeIf(i -> i.getText().compareTo(content) != 0);
-                return allItems;
-        }
+        // End Future Functionality
 }