Changeset 1243 for trunk/src/org/expeditee/auth/Authenticator.java

Timestamp:

03/15/19 16:51:32 (5 years ago)

Author:

bln4

Message:

Alterations to how mail works to work better in a cloud environment.
General code tidying and updating to work with larger changes happening to Expeditee.

File:

• trunk/src/org/expeditee/auth/Authenticator.java (modified) (16 diffs)

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

@@ -5 +5 @@
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.Writer;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.security.KeyFactory;
 import java.security.KeyStore;
@@ -22 +22 @@
 import java.sql.Connection;
 import java.sql.DriverManager;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 import java.util.Arrays;
 import java.util.Base64;
@@ -30 +30 @@
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Scanner;
 import java.util.stream.Stream;
 
@@ -36 +37 @@
 
 import org.expeditee.actions.Actions;
+import org.expeditee.auth.tags.Constants;
 import org.expeditee.core.Dimension;
 import org.expeditee.core.Point;
@@ -50 +52 @@
 import org.expeditee.gui.FrameUtils;
 import org.expeditee.gui.MessageBay;
+import org.expeditee.io.ExpReader;
+import org.expeditee.items.Item;
 import org.expeditee.items.ItemUtils;
 import org.expeditee.items.Text;
 import org.expeditee.settings.Settings;
 import org.expeditee.settings.UserSettings;
-import org.expeditee.settings.auth.secrets.KeyList;
+import org.expeditee.settings.identity.secrets.KeyList;
 import org.ngikm.cryptography.CryptographyConstants;
 
@@ -60 +64 @@
         
         // The frame number of the frame containing the current authenticated users public key.
-        public static final int PUBLIC_KEY_FRAME = 4;
+        public static int CREDENTIALS_FRAME = 13;
+        
+        public static boolean Authenticated = false;
         
         private final KeyStore keyStore = KeyStore.getInstance(KeystoreType);
+                
         private static final byte[] TRUE = "yes".getBytes();
         private static final byte[] FALSE = "no".getBytes();
@@ -82 +89 @@
 
                 // draw the window
-                final GraphicsManager g = EcosystemManager.getGraphicsManager();
+                GraphicsManager g = EcosystemManager.getGraphicsManager();
                 g.setWindowLocation(new Point(50, 50));
                 DisplayController.Init();
@@ -98 +105 @@
                 
                 // navigate to authentication frame
-                final Frame authFrame = FrameIO.LoadFrame("authentication1");
+                Frame authFrame = FrameIO.LoadFrame("authentication1");
                 DisplayController.setCurrentFrame(authFrame, true);
                 
                 // set initial values
-                final Stream<Text> usernameItemsStream = authFrame.getTextItems().stream().filter(t -> t.getData() != null && t.getData().contains("txtUsername"));
-                final Stream<Text> passwordItemsStream = authFrame.getTextItems().stream().filter(t -> t.getData() != null && t.getData().contains("txtPassword"));
+                Stream<Text> usernameItemsStream = authFrame.getTextItems().stream().filter(t -> t.getData() != null && t.getData().contains("txtUsername"));
+                Stream<Text> passwordItemsStream = authFrame.getTextItems().stream().filter(t -> t.getData() != null && t.getData().contains("txtPassword"));
                 usernameItemsStream.forEach(txtUsername -> txtUsername.setText(System.getProperty("user.name", "")));
                 passwordItemsStream.forEach(txtPassword -> txtPassword.setText(System.getProperty("user.password", "")));
@@ -109 +116 @@
                 MessageBay.warningMessages(org.expeditee.actions.Actions.Init());
                 
-                // ensure database
+                // class load database classes
                 Class.forName("org.sqlite.JDBC");
-                if (!mailDatabaseExists()) { 
-                        createMailDatabase();
-                }
-        }
-        
-        private void createMailDatabase() throws ClassNotFoundException, SQLException {
-                Connection c = DriverManager.getConnection("jdbc:sqlite:" + FrameIO.PARENT_FOLDER + "/expmail.db");
-                Statement createTable = c.createStatement();
-                String sql = "CREATE TABLE EXPMAIL (" + 
-                                "SND            TEXT                                    NOT NULL, " + 
-                                "REC            TEXT                                    NOT NULL, " + 
-                                "MSG            TEXT                                    NOT NULL, " +
-                                "MSG2           TEXT                                    NOT NULL, " + 
-                                "OPTS           ARRAY                                   NOT NULL, " +
-                                "OPTSVAL        ARRAY                                   NOT NULL)";
-                createTable.executeUpdate(sql);
-                createTable.close();
-                c.close();
-        }
-        
-        final void loadMailDatabase() throws SQLException {
-                Connection c = DriverManager.getConnection("jdbc:sqlite:" + FrameIO.PARENT_FOLDER + "/expmail.db");
-                Statement query = c.createStatement();
-                ResultSet results = query.executeQuery("SELECT * FROM EXPMAIL");
-                Mail.clear();
-                while (results.next()) {
-                        String from = results.getString("snd");
-                        String to = results.getString("rec");
-                        String msg = results.getString("msg");
-                        String msg2 = results.getString("msg2");
-                        String[] opts = results.getString("opts").split(",");
+        }
+                
+        private void loadKeystore()
+                        throws IOException, NoSuchAlgorithmException, CertificateException, FileNotFoundException {
+                final File keyStoreFile = new File(FrameIO.PARENT_FOLDER + KEYSTOREFILENAME);
+                if (!keyStoreFile.exists()) { 
+                        keyStore.load(null, Constants.CREDENTIALS_KEYSTORE_PASSWORD.toCharArray());
+                } else {
+                        try (final InputStream in = new FileInputStream(FrameIO.PARENT_FOLDER + KEYSTOREFILENAME)) {
+                                keyStore.load(in, Constants.CREDENTIALS_KEYSTORE_PASSWORD.toCharArray());
+                        }
+                }
+        }
+        
+        final void loadMailFromDirectory(Path contactDir) throws SQLException {
+                // Load in all mail.
+                Connection c = DriverManager.getConnection("jdbc:sqlite:" + contactDir.resolve("expmail.db"));
+                String sql = "SELECT * FROM EXPMAIL";
+                PreparedStatement query = c.prepareStatement(sql);
+                ResultSet allMail = query.executeQuery();
+
+                // Construct all mail objects using content from database.
+                while(allMail.next()) {
+                        String timestamp = allMail.getString("time");
+                        String from = allMail.getString("snd");
+                        String to = allMail.getString("rec");
+                        String msg = allMail.getString("msg");
+                        String msg2 = allMail.getString("msg2");
+                        String[] opts = allMail.getString("opts").split(",");
                         opts[0] = opts[0].replace("[", "");
                         opts[opts.length - 1] = opts[opts.length - 1].replace("]", "");
-                        String[] optsVal = results.getString("optsval").split(",");
+                        String[] optsVal = allMail.getString("optsval").split(",");
                         optsVal[0] = optsVal[0].replace("[", "");
                         optsVal[optsVal.length - 1] = optsVal[optsVal.length - 1].replace("]", "");
@@ -155 +160 @@
                         }
                         
-                        Mail.addEntry(new Mail.MailEntry(from, to, msg, msg2, options));
-                }
-                results.close();
+                        Mail.addEntry(new Mail.MailEntry(timestamp, from, to, msg, msg2, options));
+                }
+                
+                // Disconnect from database.
+                allMail.close();
                 query.close();
                 c.close();
         }
         
-        private boolean mailDatabaseExists() {
-                final File file = new File(FrameIO.PARENT_FOLDER + "/expmail.db");
-                return file.exists();
-        }
-                
-        private void loadKeystore()
-                        throws IOException, NoSuchAlgorithmException, CertificateException, FileNotFoundException {
-                final File keyStoreFile = new File(FrameIO.PARENT_FOLDER + KEYSTOREFILENAME);
-                if (!keyStoreFile.exists()) { 
-                        keyStore.load(null, "ExpediteeAuthPassword".toCharArray());
-                } else {
-                        try (final InputStream in = new FileInputStream(FrameIO.PARENT_FOLDER + KEYSTOREFILENAME)) {
-                                keyStore.load(in, "ExpediteeAuthPassword".toCharArray());
+        final void loadMailDatabase() throws SQLException {
+                Path contactsPath = Paths.get(FrameIO.CONTACTS_PATH);
+                File[] contacts = contactsPath.toFile().listFiles();
+                for (int i = 0; i < contacts.length; i++) {
+                        if (contacts[i].isDirectory()) {
+                                Path contact = Paths.get(contacts[i].getAbsolutePath());
+                                loadMailFromDirectory(contact);
                         }
                 }
@@ -195 +196 @@
                 final KeyStore.ProtectionParameter entryPassword = new KeyStore.PasswordProtection(password.toCharArray());
                 keyStore.setEntry(label, entry, entryPassword);
-                keyStore.store(new FileOutputStream(FrameIO.PARENT_FOLDER + KEYSTOREFILENAME), "ExpediteeAuthPassword".toCharArray());
-        }
-        
-        final void putEmail(String username, String email) throws KeyStoreException, NoSuchAlgorithmException, CertificateException, FileNotFoundException, IOException {
-                // Establish location of email file
-                String emailFilePath = FrameIO.PROFILE_PATH + username + File.separator + username + ".email";
-                File emailFile = new File(emailFilePath);
-                
-                // Delete old version if it exists.
-                if (emailFile.exists()) { 
-                        emailFile.delete();
-                }
-                
-                // Write email to file
-                emailFile.createNewFile();
-                Writer w = new FileWriter(emailFile);
-                w.write(email);
-                w.flush();
-                w.close();
-                
-                // TODO: set rights on file to be read only by 'owner' once installed on drive.
-        }
-        
-        final boolean hasRegisteredEmail(String username) throws KeyStoreException {
-                String emailFilePath = FrameIO.PROFILE_PATH + username + File.separator + username + ".email";
-                File emailFile = new File(emailFilePath);
-                return emailFile.exists();
+                keyStore.store(new FileOutputStream(FrameIO.PARENT_FOLDER + KEYSTOREFILENAME), Constants.CREDENTIALS_KEYSTORE_PASSWORD.toCharArray());
         }
         
@@ -232 +207 @@
                         } else if (entry.getSecretKey().getEncoded() == TRUE) {
                                 keyStore.deleteEntry(email + username);
-                                keyStore.store(new FileOutputStream(FrameIO.PARENT_FOLDER + KEYSTOREFILENAME), "ExpediteeAuthPassword".toCharArray());
+                                keyStore.store(new FileOutputStream(FrameIO.PARENT_FOLDER + KEYSTOREFILENAME), Constants.CREDENTIALS_KEYSTORE_PASSWORD.toCharArray());
                                 return true;
                         } else { return false; }
@@ -251 +226 @@
                 final KeyStore.ProtectionParameter entryPassword = new KeyStore.PasswordProtection(intergalacticNumber.toCharArray());
                 keyStore.setEntry(email + username, entry, entryPassword);
-                keyStore.store(new FileOutputStream(FrameIO.PARENT_FOLDER + KEYSTOREFILENAME), "ExpediteeAuthPassword".toCharArray());
+                keyStore.store(new FileOutputStream(FrameIO.PARENT_FOLDER + KEYSTOREFILENAME), Constants.CREDENTIALS_KEYSTORE_PASSWORD.toCharArray());
                 
                 return intergalacticNumber;
         }
         
-        final PublicKey getPublicKey(String username) throws InvalidKeySpecException, NoSuchAlgorithmException {
-                Frame withTargetPublic = FrameIO.LoadFrame(username + Authenticator.PUBLIC_KEY_FRAME);
-                Collection<Text> textItems = withTargetPublic.getTextItems(); 
-                textItems.removeIf(t -> !t.getText().startsWith("PublicKey"));
-                
-                if (textItems.isEmpty()) {
+        final PublicKey getPublicKey(String username) throws InvalidKeySpecException, NoSuchAlgorithmException, FileNotFoundException {
+                // load in frame with public key on it.
+                String credentialsFramesetPath = FrameIO.CONTACTS_PATH + username + "-credentials" + File.separator;
+                if (!new File(credentialsFramesetPath).exists()) {
                         return null;
-                } else {
-                        String keyEncoded = textItems.stream().findFirst().get().getData().get(0);
-                        byte[] keyBytes = Base64.getDecoder().decode(keyEncoded);
-                        PublicKey key = KeyFactory.getInstance(AsymmetricAlgorithm).generatePublic(new X509EncodedKeySpec(keyBytes));
-                        return key;
-                }
+                }
+                Scanner in = new Scanner(new File(credentialsFramesetPath + "credentials.inf"));
+                String credentialsFrameNumber = in.nextLine().replace(ExpReader.EXTENTION, "");
+                in.close();
+                Frame frame = FrameIO.LoadFrame(username + "-credentials" + credentialsFrameNumber, FrameIO.CONTACTS_PATH);
+                if (frame == null) {
+                        return null;
+                }
+                
+                // obtain public key from frame
+                Collection<Item> canditates = org.expeditee.auth.Actions.getByContent(frame, "PublicKey");
+                String keyEncoded = "";
+                for (Item i: canditates) {
+                        if (i.getData() != null) {
+                                keyEncoded = i.getData().get(0);
+                        }
+                }
+                if (keyEncoded.isEmpty()) {
+                        return null;
+                }
+                byte[] keyBytes = Base64.getDecoder().decode(keyEncoded);
+                return KeyFactory.getInstance(AsymmetricAlgorithm).generatePublic(new X509EncodedKeySpec(keyBytes));
         }
         
@@ -275 +264 @@
                 KeyStore.ProtectionParameter entryPassword = new KeyStore.PasswordProtection(KeyList.PersonalKey.get().getText().toCharArray());
                 keyStore.setEntry(username + "colleaguesRequested", entry, entryPassword);
-                keyStore.store(new FileOutputStream(FrameIO.PARENT_FOLDER + KEYSTOREFILENAME), "ExpediteeAuthPassword".toCharArray());
+                keyStore.store(new FileOutputStream(FrameIO.PARENT_FOLDER + KEYSTOREFILENAME), Constants.CREDENTIALS_KEYSTORE_PASSWORD.toCharArray());
         }
         
@@ -282 +271 @@
                 KeyStore.ProtectionParameter entryPassword = new KeyStore.PasswordProtection(KeyList.PersonalKey.get().getText().toCharArray());
                 keyStore.setEntry(username + "colleaguesRequested", entry, entryPassword);
-                keyStore.store(new FileOutputStream(FrameIO.PARENT_FOLDER + KEYSTOREFILENAME), "ExpediteeAuthPassword".toCharArray());
+                keyStore.store(new FileOutputStream(FrameIO.PARENT_FOLDER + KEYSTOREFILENAME), Constants.CREDENTIALS_KEYSTORE_PASSWORD.toCharArray());
         }
         
@@ -296 +285 @@
         }
         
-        final void putColleagues(String username, String[] colleagues) throws KeyStoreException {
-                String alias = username + "colleagues";
-                final SecretKeySpec secretKeySpec = new SecretKeySpec((colleagues[0] + System.getProperty("line.separator") + colleagues[1]).getBytes(), SymmetricAlgorithm);
-                KeyStore.SecretKeyEntry entry = new KeyStore.SecretKeyEntry(secretKeySpec);
-                KeyStore.ProtectionParameter entryPassword = new KeyStore.PasswordProtection(KeyList.PersonalKey.get().getText().toCharArray());
-                keyStore.setEntry(alias, entry, entryPassword);
-        }
-        
-        final String[] getColleagues(String username) throws KeyStoreException, NoSuchAlgorithmException, UnrecoverableEntryException {
-                String alias = username + "colleagues";
-                if (!keyStore.containsAlias(alias)) {
-                        return null;
-                } else {
-                        KeyStore.ProtectionParameter entryPassword = new KeyStore.PasswordProtection(KeyList.PersonalKey.get().getText().toCharArray());
-                        KeyStore.SecretKeyEntry entry = (SecretKeyEntry) keyStore.getEntry(alias, entryPassword);
-                        byte[] colleaguesEncoded = entry.getSecretKey().getEncoded();
-                        String colleagues = new String(colleaguesEncoded);
-                        return colleagues.split(System.getProperty("line.separator"));
-                }
-        }
+//      final void putColleagues(String username, String[] colleagues) throws KeyStoreException {
+//              String alias = username + "colleagues";
+//              final SecretKeySpec secretKeySpec = new SecretKeySpec((colleagues[0] + System.getProperty("line.separator") + colleagues[1]).getBytes(), SymmetricAlgorithm);
+//              KeyStore.SecretKeyEntry entry = new KeyStore.SecretKeyEntry(secretKeySpec);
+//              KeyStore.ProtectionParameter entryPassword = new KeyStore.PasswordProtection(KeyList.PersonalKey.get().getText().toCharArray());
+//              keyStore.setEntry(alias, entry, entryPassword);
+//      }
+//      
+//      final String[] getColleagues(String username) throws KeyStoreException, NoSuchAlgorithmException, UnrecoverableEntryException {
+//              String alias = username + "colleagues";
+//              if (!keyStore.containsAlias(alias)) {
+//                      return null;
+//              } else {
+//                      KeyStore.ProtectionParameter entryPassword = new KeyStore.PasswordProtection(KeyList.PersonalKey.get().getText().toCharArray());
+//                      KeyStore.SecretKeyEntry entry = (SecretKeyEntry) keyStore.getEntry(alias, entryPassword);
+//                      byte[] colleaguesEncoded = entry.getSecretKey().getEncoded();
+//                      String colleagues = new String(colleaguesEncoded);
+//                      return colleagues.split(System.getProperty("line.separator"));
+//              }
+//      }
         
         private static void setInputManagerWindowRoutines()     {