Changeset 1202 for trunk/src/org/expeditee/auth/EncryptedProfileExpWriter.java

Timestamp:

01/30/19 12:49:25 (5 years ago)

Author:

bln4

Message:

Initial commit of functionality concerning multiuser login, further to come.

Actions.java -> Actions that allow users to authenticate and secure their accounts.
AuthenticationTag.java -> Enum like structure for text fields associated with authentication.
Authenticator.java -> Startup functionality for when Expeditee is run in authentication mode.
EncryptedExpReader.java -> Reads exp files previously encrypted with EncryptedExpWriter (not currently used) and EncryptedProfileExpWriter
Mail.java -> Functions for transforming database stored messages into datastructures used to display those messages to the MailBay.

File:

• trunk/src/org/expeditee/auth/EncryptedProfileExpWriter.java (copied) (copied from trunk/src/org/expeditee/auth/io/EncryptedExpWriter.java ) (6 diffs)

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

@@ -1 @@
-package org.expeditee.auth.io;
+package org.expeditee.auth;
 
 import java.io.IOException;
 import java.security.InvalidKeyException;
-import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableEntryException;
-import java.security.cert.CertificateException;
 import java.util.Arrays;
 import java.util.Base64;
@@ -17 +14 @@
 import javax.crypto.spec.SecretKeySpec;
 
-import org.expeditee.auth.Authenticator;
 import org.expeditee.io.ExpWriter;
-import org.expeditee.settings.UserSettings;
+import org.expeditee.items.Text;
+import org.expeditee.settings.auth.secrets.KeyList;
 import org.ngikm.cryptography.CryptographyConstants;
 
-public class EncryptedExpWriter extends ExpWriter implements CryptographyConstants {
-        private SecretKey key;
+public class EncryptedProfileExpWriter extends ExpWriter implements CryptographyConstants {
+        private SecretKey personalKey;
         private static final String nl = "\n";
         
-        public EncryptedExpWriter() throws IOException {
-                try {
-                        final Authenticator auth = new Authenticator();
-                        SecretKey key = auth.getSecretKey(UserSettings.UserName.get(), System.getProperty("password"));
-                        if (key == null) {
-                                final byte[] keyBytes = pad(UserSettings.UserName.get().getBytes("UTF-8"));
-                                key = new SecretKeySpec(keyBytes, SymmetricAlgorithm);
-                                auth.putKey(UserSettings.UserName.get(), System.getProperty("password"), key);
-                        }
-                        this.key = key;                 
-                } catch (final KeyStoreException | NoSuchAlgorithmException | CertificateException | IOException | UnrecoverableEntryException e) {
-                        e.printStackTrace();
-                }
-                
+        public EncryptedProfileExpWriter() throws IOException {
+                // obtain personal key
+                final Text text = KeyList.PersonalKey.get();
+                final byte[] keyBytes = Base64.getDecoder().decode(text.getData().get(0));
+                personalKey = new SecretKeySpec(keyBytes, SymmetricAlgorithm);          
         }
 
@@ -45 +33 @@
         protected void preOutputFrame() {
                 try {
-                        final String line = EncryptedExpReader.ENCRYPTED_EXP_FLAG + " " + UserSettings.UserName.get() + nl;
+                        final String line = EncryptedExpReader.ENCRYPTED_EXP_FLAG + nl;
                         _writer.write(line);
                         _stringWriter.append(line);
@@ -59 +47 @@
                 
                 // prepare line to write out
-                final byte[] encrypted = EncryptSymmetric(line.getBytes(), key);
+                final byte[] encrypted = EncryptSymmetric(line.getBytes(), personalKey);
                 final String toWrite = Base64.getEncoder().encodeToString(encrypted) + nl;
                 
@@ -67 +55 @@
         }
         
-        private byte[] pad(final byte[] bytes) {
-                int c = 16;
-                while (c - bytes.length < 0) { c *= 2; }
-                return Arrays.copyOf(bytes, c);
-        }
-        
         private static byte[] EncryptSymmetric(final byte[] toEncrypt, final SecretKey key) {
-                // toEncrypt = Base64.getDecoder().decode(toEncrypt);
                 try {
                         final Cipher cipher = Cipher.getInstance(SymmetricAlgorithm + SymmetricAlgorithmParameters);
@@ -81 +62 @@
                         final int length = (int) ((Math.ceil(toEncrypt.length / 16f)) * 16);
                         final byte[] toEncryptSizeAdjusted = Arrays.copyOf(toEncrypt, length);
-                        //System.err.println("(" + toEncryptSizeAdjusted.length + ")" + "Before Encryption Data: "
-                        //              + Arrays.toString(toEncryptSizeAdjusted));
                         final byte[] result = cipher.doFinal(toEncryptSizeAdjusted);
-                        //System.err.println("(" + result.length + ")" + "Encrypted Data: " + Arrays.toString(result));
                         return result;
                 } catch (final NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException