Changeset 1227 for trunk/src/org/expeditee/auth/EncryptedExpWriter.java

Timestamp:

01/31/19 16:34:06 (5 years ago)

Author:

bln4

Message:

org.expeditee.auth.EncryptedExpReader ->
org.expeditee.auth.EncryptedExpWriter ->
Actions ->
AttributeUtils ->
Frame ->
FrameIO ->
UserSettings ->

Changed how reading and writing encrypted files worked. A Frame attribute is now consulted to determine what to use as key for encryption. The 'profile' attribute setting is used to signal that the users personal aes key is used. Further enhancement will mean that other labels will be able to be used.

Actions ->

MailMode action now consults the database to reaquire the mail.

File:

• trunk/src/org/expeditee/auth/EncryptedExpWriter.java (moved) (moved from trunk/src/org/expeditee/auth/EncryptedProfileExpWriter.java ) (4 diffs)

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

@@ -19 +19 @@
 import org.ngikm.cryptography.CryptographyConstants;
 
-public class EncryptedProfileExpWriter extends ExpWriter implements CryptographyConstants {
-        private SecretKey personalKey;
+public class EncryptedExpWriter extends ExpWriter implements CryptographyConstants {
+        private SecretKey key;
+        private String label;
         private static final String nl = "\n";
         
-        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);          
+        public EncryptedExpWriter(String encryptionLabel) throws IOException {
+                if (encryptionLabel.compareTo("Profile") == 0) {
+                        // obtain personal key
+                        Text text = KeyList.PersonalKey.get();
+                        byte[] keyBytes = Base64.getDecoder().decode(text.getData().get(0));
+                        key = new SecretKeySpec(keyBytes, SymmetricAlgorithm);
+                        label = "Profile";
+                } else {
+                        byte[] keyBytes = resolveKeyFromLabel(encryptionLabel);
+                        key = new SecretKeySpec(keyBytes, SymmetricAlgorithm);
+                        label = encryptionLabel;
+                }
         }
 
@@ -33 +41 @@
         protected void preOutputFrame() {
                 try {
-                        final String line = EncryptedExpReader.ENCRYPTED_EXP_FLAG + nl;
+                        String line = EncryptedExpReader.ENCRYPTED_EXP_FLAG + label + nl;
                         _writer.write(line);
                         _stringWriter.append(line);
@@ -47 +55 @@
                 
                 // prepare line to write out
-                final byte[] encrypted = EncryptSymmetric(line.getBytes(), personalKey);
-                final String toWrite = Base64.getEncoder().encodeToString(encrypted) + nl;
+                byte[] encrypted = EncryptSymmetric(line.getBytes(), key);
+                String toWrite = Base64.getEncoder().encodeToString(encrypted) + nl;
                 
                 // output
@@ -55 +63 @@
         }
         
-        private static byte[] EncryptSymmetric(final byte[] toEncrypt, final SecretKey key) {
+        private byte[] resolveKeyFromLabel(String label) {
+                return null;
+        }
+        
+        private static byte[] EncryptSymmetric(byte[] toEncrypt, SecretKey key) {
                 try {
-                        final Cipher cipher = Cipher.getInstance(SymmetricAlgorithm + SymmetricAlgorithmParameters);
+                        Cipher cipher = Cipher.getInstance(SymmetricAlgorithm + SymmetricAlgorithmParameters);
                         cipher.init(Cipher.ENCRYPT_MODE, key);
                         //could use modulus
-                        final int length = (int) ((Math.ceil(toEncrypt.length / 16f)) * 16);
-                        final byte[] toEncryptSizeAdjusted = Arrays.copyOf(toEncrypt, length);
-                        final byte[] result = cipher.doFinal(toEncryptSizeAdjusted);
+                        int length = (int) ((Math.ceil(toEncrypt.length / 16f)) * 16);
+                        byte[] toEncryptSizeAdjusted = Arrays.copyOf(toEncrypt, length);
+                        byte[] result = cipher.doFinal(toEncryptSizeAdjusted);
                         return result;
                 } catch (final NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException