Changeset 1363 for trunk/src/org/expeditee/auth/mail/Mail.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.

Location:

trunk/src/org/expeditee/auth/mail

Files:

• . (added)
• Mail.java (moved) (moved from trunk/src/org/expeditee/auth/Mail.java ) (7 diffs)

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

@@ -1 @@
-package org.expeditee.auth;
+package org.expeditee.auth.mail;
 
 import java.io.File;
@@ -36 +36 @@
 import javax.crypto.spec.SecretKeySpec;
 
-import org.expeditee.auth.gui.MailBay;
+import org.expeditee.auth.AuthenticatorBrowser;
+import org.expeditee.auth.mail.gui.MailBay;
+import org.expeditee.encryption.Actions;
 import org.expeditee.gui.FrameIO;
 import org.expeditee.settings.UserSettings;
@@ -58 +60 @@
         public static void sendOneOffMail(MailEntry mail, String colleagueName, byte[] key) {
                 // Ensure dead drop area is set up.
-                Path databaseFileDirPath = ensureDeadDrops(colleagueName);
+                Path databaseFileDirPath = ensureDeadDrops(colleagueName, mail.sender);
                 
                 // Ensure the database file exists.
@@ -136 +138 @@
         }
         
+        private static Path ensureDeadDrops(String colleagueName, String sender) {
+                String me = sender.toLowerCase();
+                String them = colleagueName.toLowerCase();
+                Path parent = Paths.get(FrameIO.PARENT_FOLDER).resolve("resources-" + sender).resolve("deaddrops");
+                Path databaseFileDirPath = parent.resolve(me + "+" + them);
+                if (!databaseFileDirPath.toFile().exists()) {
+                        databaseFileDirPath = parent.resolve(them + "+" + me);
+                }
+                return databaseFileDirPath;
+        }
+        
         private static void sendMail(MailEntry mail, PublicKey key, Path databaseFile) {
                 try {
@@ -209 +222 @@
                 statement.close();
                 c.close();
+                System.err.println("Message written to database: " + databaseFile.toString());
         }
                 
@@ -235 +249 @@
                 sb.append("Read one-off secure message." + sep);
                 sb.append(mail.timestamp + sep);
-                sb.append(mail.sender + sep);
+                sb.append(mail.sender.substring(1) + sep);
                 sb.append(mail.receiver + sep);
                 sb.append(mail.message + sep);
@@ -368 +382 @@
                 }
         }
+
+        public static void decryptOneOffSecureMessage(SecretKey key, List<String> data) {
+                byte[] topicBytes = Base64.getDecoder().decode(data.get(3));
+                String topic = new String(org.expeditee.encryption.Actions.DecryptSymmetric(topicBytes, key));
+                byte[] messageBytes = Base64.getDecoder().decode(data.get(4));
+                String message = new String(org.expeditee.encryption.Actions.DecryptSymmetric(messageBytes, key));
+                Map<String, String> options = new HashMap<String, String>();
+                for (int i = 5; i < data.size(); i+=2) {
+                        byte[] optionKeyBytes = Base64.getDecoder().decode(data.get(i));
+                        String k = new String(org.expeditee.encryption.Actions.DecryptSymmetric(optionKeyBytes, key));
+                        byte[] optionValueBytes = Base64.getDecoder().decode(data.get(i + 1));
+                        String v = new String(org.expeditee.encryption.Actions.DecryptSymmetric(optionValueBytes, key));
+                        options.put(k, v);
+                }
+                MailBay.addMessage(data.get(0), topic, message, options);
+        }
 }