Changeset 1500 for trunk/src/org/expeditee/encryption/io/EncryptedExpReader.java

Timestamp:

01/20/20 15:04:45 (4 years ago)

Author:

bnemhaus

Message:

org.expeditee.auth.account.Password =>
org.expeditee.encryption.EncryptedExpReader =>

When performing account recovery, the username of the account you are trying to recover now actually needs to match the recovered key.
Also, the order that the password pieces are entered no longer matters.

File:

• trunk/src/org/expeditee/encryption/io/EncryptedExpReader.java (modified) (4 diffs)

trunk/src/org/expeditee/encryption/io/EncryptedExpReader.java

@@ -2 +2 @@
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileReader;
@@ -77 +78 @@
                         return true;
                 }
+        }       
+        
+        public static boolean isAccessibleExpediteeFile(String path, SecretKey key) throws IOException {
+                try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(path), "UTF-8"))) {
+                        String firstLine = in.readLine();
+                        if (firstLine == null) return false;            
+                        
+                        if (firstLine.startsWith(ENCRYPTED_EXP_FLAG)) {
+                                String secondLine = in.readLine();
+                                byte[] toDecrypt = Base64.getDecoder().decode(secondLine);
+                                byte[] decrypted = DecryptSymmetric(toDecrypt, key);
+                                return decrypted != null;
+                        } else {
+                                // Not encrypted.  Returns false because the caller of this
+                                // function is asking if this key is used to decrypt this file.
+                                return false;
+                        }
+                }
         }
         
@@ -326 +345 @@
                 } catch (final NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException
                                 | IllegalBlockSizeException | BadPaddingException e) {
-                        e.printStackTrace();
+                        //e.printStackTrace();
+                        System.err.println("Failed to decrypt '" + new String(toDecrypt) + "' with key " + new String(key.getEncoded()));
                         return null;
                 }
@@ -337 +357 @@
                         super(in);
                 }
-                
+                                
                 @Override
                 /**