Changeset 1277 for trunk/src/org/expeditee/auth/Mail.java

Timestamp:

04/02/19 15:22:06 (5 years ago)

Author:

bln4

Message:

Changes have been made to how mail is stored. Each user now has a location in their deaddrops folder (found inside their resources folder) that acts as an exchange location for each of their partnerships. Mail databases now belong in there.

Initial functionality to support the culling of already processed messages from the mail database has been implemented with more to follow.

File:

• trunk/src/org/expeditee/auth/Mail.java (modified) (6 diffs)

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

@@ -1 +1 @@
 package org.expeditee.auth;
 
+import java.io.File;
+import java.io.IOException;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.security.InvalidKeyException;
+import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
 import java.security.PublicKey;
+import java.security.cert.CertificateException;
+import java.security.spec.InvalidKeySpecException;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22 +29 @@
 import javax.crypto.NoSuchPaddingException;
 
+import org.expeditee.gui.FrameIO;
 import org.ngikm.cryptography.CryptographyConstants;
 
@@ -39 +47 @@
         }
         
-        public static void sendMail(MailEntry mail, PublicKey key, Path outbox) {
+        public static void sendMail(MailEntry mail, String colleagueName) {
+                // Ensure dead drop area is set up.
+                Path databaseFileDirPath = Paths.get(FrameIO.DEAD_DROPS_PATH).resolve(colleagueName);
+                Path databaseFilePath = databaseFileDirPath.resolve(colleagueName + ".db");
+                File databaseFile = databaseFilePath.toFile();
+                if (!databaseFile.exists()) {
+                        databaseFileDirPath.toFile().mkdirs();
+                        String sql = 
+                                        "CREATE TABLE EXPMAIL (" +
+                                        "TIME           TEXT                                    NOT NULL, " +
+                                        "SND            TEXT                                    NOT NULL, " + 
+                                        "REC            TEXT                                    NOT NULL, " + 
+                                        "MSG            TEXT                                    NOT NULL, " +
+                                        "MSG2           TEXT                                    NOT NULL, " + 
+                                        "OPTS           ARRAY                                   NOT NULL, " +
+                                        "OPTSVAL        ARRAY                                   NOT NULL)";
+                        try {
+                                Connection c = DriverManager.getConnection("jdbc:sqlite:" + databaseFile.getAbsolutePath());
+                                Statement createTable = c.createStatement();
+                                createTable.executeUpdate(sql);
+                                createTable.close();
+                                c.close();
+                        } catch (SQLException e) {
+                                System.err.println("Error while creating database file.");
+                                e.printStackTrace();
+                        }
+                }
+                
+                // Obtain public key
+                PublicKey publicKey = null;
+                try {
+                        publicKey = Authenticator.getInstance().getPublicKey(colleagueName);
+                } catch (InvalidKeySpecException | NoSuchAlgorithmException | KeyStoreException | CertificateException
+                                | ClassNotFoundException | IOException | SQLException e) {
+                        System.err.println("Error while sending message.  Unable to obtain public key for colleague " +  
+                                colleagueName + ".  Exception message: " + e.getMessage());
+                        return;
+                }
+                
+                // Check we got public key
+                if (publicKey == null) {
+                        System.err.println("Error while sending message.  Unable to obtain public key for colleague.  Have you exchanged contact details?");
+                        return;
+                }
+                
+                // Send message
+                sendMail(mail, publicKey, databaseFilePath);
+        }
+        
+        private static void sendMail(MailEntry mail, PublicKey key, Path databaseFile) {
                 try {
                         Cipher cipher = Cipher.getInstance(AsymmetricAlgorithm + AsymmetricAlgorithmParameters);
                         
                         // encrypt the necessary parts of the message
-                        cipher.init(Cipher.ENCRYPT_MODE, key);
-                        String time = Base64.getEncoder().encodeToString(cipher.doFinal(mail.timestamp.getBytes()));
+                        //cipher.init(Cipher.ENCRYPT_MODE, key);
+                        //String time = Base64.getEncoder().encodeToString(cipher.doFinal(mail.timestamp.getBytes()));
                         cipher.init(Cipher.ENCRYPT_MODE, key);
                         String sender = Base64.getEncoder().encodeToString(cipher.doFinal(mail.sender.getBytes()));
@@ -65 +122 @@
                         
                         // write to mail database
-                        Connection c = DriverManager.getConnection("jdbc:sqlite:" + outbox.resolve("expmail.db"));
+                        Connection c = DriverManager.getConnection("jdbc:sqlite:" + databaseFile);
                         String sql = "INSERT INTO EXPMAIL (TIME,SND,REC,MSG,MSG2,OPTS,OPTSVAL) VALUES (?, ?, ?, ?, ?, ?, ?);";
                         PreparedStatement statement = c.prepareStatement(sql);
-                        statement.setString(1, time);
+                        statement.setString(1, mail.timestamp);
                         statement.setString(2, sender);
                         statement.setString(3, rec);
@@ -110 +167 @@
                         if (receiverDecrypted.compareToIgnoreCase(name) == 0) {
                                 c.init(Cipher.DECRYPT_MODE, key);
-                                String timestamp = new String(c.doFinal(Base64.getDecoder().decode(mail.timestamp)));
-                                c.init(Cipher.DECRYPT_MODE, key);
                                 String sender = new String(c.doFinal(Base64.getDecoder().decode(mail.sender)));
                                 c.init(Cipher.DECRYPT_MODE, key);
@@ -128 +183 @@
                                 
                                 //String arguments = new String(c.doFinal(Base64.getDecoder().decode(mail.args)));
-                                filtered.add(new MailEntry(timestamp, sender, receiverDecrypted, message, message2, options));
+                                filtered.add(new MailEntry(mail.timestamp, sender, receiverDecrypted, message, message2, options));
                         }
                 }