Changeset 1270 for trunk/src/org/expeditee/auth

Timestamp:

03/25/19 14:33:31 (5 years ago)

Author:

bln4

Message:

On profile creation a new parameter has been introducted. By passing a map, the user is able to nominate settings frames for which to be notified of their construction.

The above functionalty has been used to programmatically establish the frame number for a users credentials frame.

On user account creation, the users credential frame is migrated to the <username>-credentials folder and a redirect is setup. Functionality for doing this has been generisised and placed in FrameIO.

Location:

trunk/src/org/expeditee/auth

Files:

• Actions.java (modified) (7 diffs)
• Authenticator.java (modified) (1 diff)
• tags/Constants.java (modified) (1 diff)

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

@@ -32 +32 @@
 import java.util.Optional;
 import java.util.Random;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
@@ -67 +68 @@
 
 public class Actions implements CryptographyConstants {
-                
+        
+        //Debug Functions
         public static void SendTestMessage(String colleagueName) throws InvalidKeySpecException, NoSuchAlgorithmException, FileNotFoundException, KeyStoreException, CertificateException, ClassNotFoundException, IOException, SQLException {
                 String time = org.expeditee.stats.Formatter.getDateTime();
@@ -79 +81 @@
                 Path outbox = Paths.get(FrameIO.PROFILE_PATH).resolve(sender).resolve(sender + "-credentials");
                 Mail.sendMail(mail, publicKey, outbox);
+        }
+        private static String userbackup = "authadmin";
+        public static void ToggleAuth() {
+                String backup = UserSettings.UserName.get();
+                UserSettings.UserName.set(userbackup);
+                userbackup = backup;
         }
         
@@ -394 +402 @@
                 initialSettings.put("org.expeditee.gui.folders.FolderSettings.AudioDirs", FolderSettings.AudioDirs);
                 
+                // Record the credentials frame number
+                Map<String, Consumer<Frame>> notifiers = new HashMap<String, Consumer<Frame>>();
+                notifiers.put(Constants.SETTINGS_AUTH, frame -> {
+                        Authenticator.CREDENTIALS_FRAME = frame.getNumber();
+                        Collection<Text> textItems = frame.getTextItems();
+                        for (Text t: textItems) {
+                                if (t.getText().equals("Secrets")) {
+                                        t.setPermission(new PermissionPair(UserAppliedPermission.followLinks, UserAppliedPermission.denied));
+                                        break;
+                                }
+                        }
+                });
+                
                 // Create users profile
-                Frame profile = FrameIO.CreateNewProfile(username, initialSettings);
+                Frame profile = FrameIO.CreateNewProfile(username, initialSettings, notifiers);
                 int lastNumber = FrameIO.getLastNumber(profile.getFramesetName());
                 for (int i = 1; i <= lastNumber; i++) {
@@ -407 +428 @@
                         f.getAllItems().stream().forEach(item -> item.setOwner(username));
                         f.setChanged(true);
-                        f.setEncryptionLabel("Profile");
+                        if (f.getNumber() != Authenticator.CREDENTIALS_FRAME) {
+                                f.setEncryptionLabel("Profile");
+                        }
                         Collection<Item> secretsLink = getByContent(f, "Secrets");
                         Collection<Item> publicKeyItem = getByContent(f, "PublicKey");
                         if (!secretsLink.isEmpty() && !publicKeyItem.isEmpty()) {
                                 //Then we are on credentials frame
-                                secretsLink.forEach(text -> text.setPermission(new PermissionPair(UserAppliedPermission.full, UserAppliedPermission.none)));
                                 f.addToData("MultiuserCredentials");
                         }
@@ -421 +443 @@
                         FrameIO.SaveFrame(f);
                         KeyList.PersonalKey.setSetting(backupPersonalKey);
+                }
+                
+                if (Authenticator.CREDENTIALS_FRAME == -1) {
+                        System.err.println("authActions::Unable to establish credentials frame for new profile frame.  Account creation failed.");
+                        return;
                 }
                 
@@ -436 +463 @@
                 out.flush();
                 out.close();
+                //      migrate credentials frame
+                Frame credentialsFrame = FrameIO.LoadFrame(username + Authenticator.CREDENTIALS_FRAME);
+                FrameIO.migrateFrame(credentialsFrame, Paths.get(credentialsDir.getAbsolutePath()).resolve(Authenticator.CREDENTIALS_FRAME + ".exp"));
                 //      outbox
                 Connection c = DriverManager.getConnection("jdbc:sqlite:" + credentialsDir.getAbsolutePath() + File.separator + "expmail.db");

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

@@ -64 +64 @@
         
         // The frame number of the frame containing the current authenticated users public key.
-        public static int CREDENTIALS_FRAME = 13;
+        public static int CREDENTIALS_FRAME = -1;
         public static final String ADMINACCOUNT = "authadmin";
         

trunk/src/org/expeditee/auth/tags/Constants.java

@@ -19 +19 @@
         public static final String SETTINGS_USER_SETTINGS_PROFILE_NAME = "settings.UserSettings.ProfileName";
         public static final String SETTINGS_USER_SETTINGS_USER_NAME = "settings.UserSettings.UserName";
+        public static final String SETTINGS_AUTH = "settings.identity";
         public static final String SETTINGS_AUTH_EMAIL = "settings.identity.Email";
         public static final String SETTINGS_AUTH_PUBLIC_KEY = "settings.identity.PublicKey";