Changeset 1283

Timestamp:

04/05/19 10:25:31 (5 years ago)

Author:

bln4

Message:

When loading in messages from the mail databases now uses the timestamp last-accessed companion file to only load in new ones.

Location:

trunk/src/org/expeditee

Files:

• auth/Actions.java (modified) (19 diffs)
• auth/Mail.java (modified) (4 diffs)
• gui/FrameCreator.java (modified) (2 diffs)
• gui/FrameIO.java (modified) (3 diffs)

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

@@ -100 +100 @@
                 if (!DisplayController.isMailMode()) {
                         Mail.clear();
-                        Authenticator.getInstance().loadMailDatabase();
+                        AuthenticatorBrowser.getInstance().loadMailDatabase();
                 }
                 DisplayController.ToggleMailMode();
@@ -172 +172 @@
                         createAccount(userData);
                         login(userData);
-                        Authenticator.Authenticated = true;
+                        AuthenticatorBrowser.Authenticated = true;
                 } else {
                         MessageBay.errorMessage(Constants.ERROR_INSUFFICIENT_INFORMATION_PROVIDED);
@@ -189 +189 @@
                 if (userdata.isPresent()) { 
                         login(userdata.get());
-                        Authenticator.Authenticated = true;
+                        AuthenticatorBrowser.Authenticated = true;
                 } else {
                         MessageBay.errorMessage(Constants.ERROR_INSUFFICIENT_INFORMATION_PROVIDED);
@@ -211 +211 @@
                 final Collection<Text> textItems = DisplayController.getCurrentFrame().getTextItems();
                 
-                if (!Authenticator.Authenticated) {
+                if (!AuthenticatorBrowser.Authenticated) {
                         MessageBay.errorMessage(Constants.ERROR_MUST_BE_LOGGED_IN);
                 } else {
@@ -230 +230 @@
         
         public static void AuthGotoAccountManagement() {
-                if (Authenticator.Authenticated) {
+                if (AuthenticatorBrowser.Authenticated) {
                         DisplayController.setCurrentFrame(FrameIO.LoadFrame(Constants.FRAME_MULTIUSER1), false);
                 } else {
@@ -284 +284 @@
                 Collection<Text> textItems = currentFrame.getTextItems();
                 
-                if (!Authenticator.Authenticated) {
+                if (!AuthenticatorBrowser.Authenticated) {
                         MessageBay.errorMessage(Constants.ERROR_MUST_BE_LOGGED_IN);
                         return;
@@ -369 +369 @@
                 rand.nextBytes(keyBytes);
                 SecretKey key = new SecretKeySpec(keyBytes, SymmetricAlgorithm);
-                Authenticator.getInstance().putKey(username, password, key);
+                AuthenticatorBrowser.getInstance().putKey(username, password, key);
                 String personalKey = Base64.getEncoder().encodeToString(key.getEncoded());
                 //      Public and private keys
@@ -401 +401 @@
                 Map<String, Consumer<Frame>> notifiers = new HashMap<String, Consumer<Frame>>();
                 notifiers.put(Constants.SETTINGS_AUTH, frame -> {
-                        Authenticator.CREDENTIALS_FRAME = frame.getNumber();
+                        AuthenticatorBrowser.CREDENTIALS_FRAME = frame.getNumber();
                         Collection<Text> textItems = frame.getTextItems();
                         for (Text t: textItems) {
@@ -424 +424 @@
                         f.getAllItems().stream().forEach(item -> item.setOwner(username));
                         f.setChanged(true);
-                        if (f.getNumber() != Authenticator.CREDENTIALS_FRAME) {
+                        if (f.getNumber() != AuthenticatorBrowser.CREDENTIALS_FRAME) {
                                 f.setEncryptionLabel("Profile");
                         }
@@ -441 +441 @@
                 }
                 
-                if (Authenticator.CREDENTIALS_FRAME == -1) {
+                if (AuthenticatorBrowser.CREDENTIALS_FRAME == -1) {
                         System.err.println("authActions::Unable to establish credentials frame for new profile frame.  Account creation failed.");
                         return;
@@ -456 +456 @@
                 credentialsFile.createNewFile();
                 FileWriter out = new FileWriter(credentialsFile);
-                out.write(Authenticator.CREDENTIALS_FRAME + ".exp");
+                out.write(AuthenticatorBrowser.CREDENTIALS_FRAME + ".exp");
                 out.flush();
                 out.close();
                 //      migrate credentials frame
-                Frame credentialsFrame = FrameIO.LoadFrame(username + Authenticator.CREDENTIALS_FRAME);
+                Frame credentialsFrame = FrameIO.LoadFrame(username + AuthenticatorBrowser.CREDENTIALS_FRAME);
                 Path destinationDirectory = Paths.get(credentialsDir.getAbsolutePath());
-                Path destinationFile = destinationDirectory.resolve(Authenticator.CREDENTIALS_FRAME + ExpReader.EXTENTION);
+                Path destinationFile = destinationDirectory.resolve(AuthenticatorBrowser.CREDENTIALS_FRAME + ExpReader.EXTENTION);
                 FrameIO.migrateFrame(credentialsFrame, destinationFile);
                 
@@ -498 +498 @@
                 
                 try {
-                        personalKey = Authenticator.getInstance().getSecretKey(username, password);
+                        personalKey = AuthenticatorBrowser.getInstance().getSecretKey(username, password);
                 } catch (Exception e) {
                         // leave personalKey null
@@ -523 +523 @@
 
                 Frame oneFrame = null;
-                if (!username.equals(Authenticator.ADMINACCOUNT)) {
+                if (!username.equals(AuthenticatorBrowser.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.
@@ -534 +534 @@
                         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();
+                                if (f != null && f.getData() != null && f.getData().contains("MultiuserCredentials")) {
+                                        AuthenticatorBrowser.CREDENTIALS_FRAME = f.getNumber();
                                 }
                         }
@@ -549 +549 @@
                         // Check mail
                         MailBay.clear();
-                        Authenticator.getInstance().loadMailDatabase();
+                        AuthenticatorBrowser.getInstance().loadMailDatabase();
                         Text keyItem = org.expeditee.settings.identity.secrets.KeyList.PrivateKey.get();
                         if (keyItem.getData() != null) {
@@ -555 +555 @@
                                 byte[] keyBytes = Base64.getDecoder().decode(keyEncoded);
                                 PrivateKey key = KeyFactory.getInstance(AsymmetricAlgorithm).generatePrivate(new PKCS8EncodedKeySpec(keyBytes));
-                                List<MailEntry> mailForLoggingInUser = Mail.getEntries(UserSettings.UserName.get(), key);
+                                List<MailEntry> mailForLoggingInUser = Mail.getEntries(UserSettings.UserName.get(), key);                       
                                 for (MailEntry mail: mailForLoggingInUser) {
                                         MailBay.addMessage(mail.timestamp, mail.message, mail.message2, mail.options);
                                 }
                         }
+                        Path deadDropPath = Paths.get(FrameIO.DEAD_DROPS_PATH);
+                        for (File connectionDir: deadDropPath.toFile().listFiles()) {
+                                if (connectionDir.isDirectory()) {
+                                        Path deaddropforcontactPath = Paths.get(connectionDir.getAbsolutePath());
+                                        AuthenticatorBrowser.getInstance().updateLastReadMailTime(deaddropforcontactPath);
+                                }
+                        }
+                        
                 } else {
-                        UserSettings.UserName.set(Authenticator.ADMINACCOUNT);
+                        UserSettings.UserName.set(AuthenticatorBrowser.ADMINACCOUNT);
                         oneFrame = FrameIO.LoadFrame("multiuser1");
                 }
@@ -606 +614 @@
                 String colleagueOne = userData.get(AuthenticationTag.ColleagueOne);
                 String colleagueTwo = userData.get(AuthenticationTag.ColleagueTwo);
-                PublicKey colleagueOneKey = Authenticator.getInstance().getPublicKey(colleagueOne);
-                PublicKey colleagueTwoKey = Authenticator.getInstance().getPublicKey(colleagueTwo);
+                PublicKey colleagueOneKey = AuthenticatorBrowser.getInstance().getPublicKey(colleagueOne);
+                PublicKey colleagueTwoKey = AuthenticatorBrowser.getInstance().getPublicKey(colleagueTwo);
                 if (colleagueOneKey == null) {
                         MessageBay.errorMessage("Unable to get public key for colleague: " + colleagueOne);
@@ -626 +634 @@
                         mail = new MailEntry(time, sender, colleagueTwo, topic, message, arguments);
                         Mail.sendMail(mail, colleagueTwo);
-                        Authenticator.getInstance().markRequestedColleagues(UserSettings.UserName.get());
+                        AuthenticatorBrowser.getInstance().markRequestedColleagues(UserSettings.UserName.get());
                         return true;
                 }
@@ -661 +669 @@
                 final String newpassword = userdata.get(AuthenticationTag.NewPassword);
 
-                final SecretKey key = Authenticator.getInstance().getSecretKey(username, password);
+                final SecretKey key = AuthenticatorBrowser.getInstance().getSecretKey(username, password);
                 if (key == null) {
                         MessageBay.errorMessage("The username + existing password combination was incorrect.");
                 } else {
-                        Authenticator.getInstance().putKey(username, newpassword, key);
+                        AuthenticatorBrowser.getInstance().putKey(username, newpassword, key);
                         MessageBay.displayMessage("Password changed successfully.");
                 }

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

@@ -2 +2 @@
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.file.Path;
@@ -17 +18 @@
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Base64;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Scanner;
 
 import javax.crypto.BadPaddingException;
@@ -78 +83 @@
                 PublicKey publicKey = null;
                 try {
-                        publicKey = Authenticator.getInstance().getPublicKey(colleagueName);
+                        publicKey = AuthenticatorBrowser.getInstance().getPublicKey(colleagueName);
                 } catch (InvalidKeySpecException | NoSuchAlgorithmException | KeyStoreException | CertificateException
                                 | ClassNotFoundException | IOException | SQLException e) {
@@ -182 +187 @@
                                 }
                                 
-                                //String arguments = new String(c.doFinal(Base64.getDecoder().decode(mail.args)));
-                                filtered.add(new MailEntry(mail.timestamp, sender, receiverDecrypted, message, message2, options));
+                                Path lastAccessedFile = Paths.get(FrameIO.DEAD_DROPS_PATH).resolve(sender).resolve(name + ".last-accessed");
+                                SimpleDateFormat format = new SimpleDateFormat("ddMMMyyyy[HH:mm]");
+                                MailEntry mailEntry = new MailEntry(mail.timestamp, sender, receiverDecrypted, message, message2, options);
+                                try (Scanner in = new Scanner(lastAccessedFile.toFile())) {
+                                        Date lastAccessedTimestamp = format.parse(in.nextLine());
+                                        Date mailTimestamp = format.parse(mail.timestamp);
+                                        if (mailTimestamp.after(lastAccessedTimestamp)) {
+                                                filtered.add(mailEntry);
+                                        }
+                                } catch (FileNotFoundException e) {
+                                        // It may not have been created yet, then err on the safe side and add it in.
+                                        filtered.add(mailEntry);
+                                } catch (ParseException e) {
+                                        // If we fail to parse, then err on the safe side and add it in.
+                                        filtered.add(mailEntry);
+                                }                       
+                                
                         }
                 }

trunk/src/org/expeditee/gui/FrameCreator.java

@@ -115 +115 @@
                 int lastNumber = FrameIO.getLastNumber(framesetName);
                 for (int i = 1; i <= lastNumber; i++) {
-                        Frame frame = FrameIO.LoadFrame(framesetName + i, path.toAbsolutePath().toString());
+                        Frame frame = FrameIO.LoadFrame(framesetName + i, path.toAbsolutePath().toString() + File.separator);
                         this.framesCreated.add(frame);
                 }
@@ -147 +147 @@
                         resetGlobals(toUse);
                         _firstFrame = toUse;
-                        
-                        path.toAbsolutePath().resolve(framesetName);
                 } catch (InvalidFramesetNameException e) {
                         e.printStackTrace();

trunk/src/org/expeditee/gui/FrameIO.java

@@ -50 +50 @@
 import org.expeditee.agents.ExistingFramesetException;
 import org.expeditee.agents.InvalidFramesetNameException;
-import org.expeditee.auth.Authenticator;
+import org.expeditee.auth.AuthenticatorBrowser;
 import org.expeditee.auth.EncryptedExpReader;
 import org.expeditee.auth.EncryptedExpWriter;
@@ -375 +375 @@
                         List<String> directoriesToSearch = FolderSettings.FrameDirs.getAbsoluteDirs();
                         
-                        if (Authenticator.Authenticated) {
+                        if (AuthenticatorBrowser.Authenticated) {
                                 // if we are running Expeditee Authenticated, consult user profile as location for framesets first
                                 String profilePath = FrameIO.PROFILE_PATH + UserSettings.UserName.get() + File.separator;
@@ -1102 +1102 @@
                         // if its a new frame or an existing Exp frame...
                         if (fullPath == null || fullPath.endsWith(ExpReader.EXTENTION)) {                               
-                                if (toSave.getNumber() != Authenticator.CREDENTIALS_FRAME && 
+                                if (toSave.getNumber() != AuthenticatorBrowser.CREDENTIALS_FRAME && 
                                                 toSave.getEncryptionLabel() != null) {
                                         writer = new EncryptedExpWriter(toSave.getEncryptionLabel());