Changeset 1461 for trunk

Timestamp:

11/29/19 15:33:47 (4 years ago)

Author:

bnemhaus

Message:

You cannot load an encrypted frame if you do not have the associated key.

Location:

trunk/src/org/expeditee

Files:

• encryption/io/EncryptedExpReader.java (modified) (5 diffs)
• gui/FrameIO.java (modified) (2 diffs)

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

@@ -46 +46 @@
         private static final String labelProfile = "Profile";
         private static final String labelNone = "None";
-        private SecretKey personalKey;
+        private SecretKey key;
         private boolean accessDenied = false;
         private boolean _readingSurrogates;
@@ -57 +57 @@
                 if (firstLine == null) return false;
                 return firstLine.startsWith(ENCRYPTED_EXP_FLAG);
+        }
+        
+        public static boolean isAccessibleExpediteeFile(final String path) throws IOException {
+                BufferedReader in = new BufferedReader(new FileReader(path));
+                String firstLine = in.readLine();
+                in.close();
+                if (firstLine == null) return false;
+                
+                if (firstLine.startsWith(ENCRYPTED_EXP_FLAG)) {
+                        String labelName = firstLine.replace(ENCRYPTED_EXP_FLAG, "");
+                        LabelInfo label = Label.getLabel(labelName);
+                        if (labelName.equals(labelProfile) || labelName.equals(labelNone) || label.type == Label.LabelResult.SuccessResolveLabelToKey) {
+                                return true;
+                        } else {
+                                return false;
+                        }
+                } else {
+                        // Not encrypted.
+                        return true;
+                }
         }
         
@@ -340 +360 @@
                                         Text text = KeyList.PersonalKey.get();
                                         byte[] keyBytes = Base64.getDecoder().decode(text.getData().get(0));
-                                        personalKey = new SecretKeySpec(keyBytes, SymmetricAlgorithm);
+                                        key = new SecretKeySpec(keyBytes, SymmetricAlgorithm);
                                         return readLine();
                                 } else if (label.equals(labelNone)) {
@@ -346 +366 @@
                                         return readLine();
                                 } else {
-                                        personalKey = resolveLabel(label);
-                                        if (personalKey == null) {
+                                        key = resolveLabel(label);
+                                        if (key == null) {
                                                 return null;
                                         } else {
@@ -357 +377 @@
                         // decrypt line and return result
                         byte[] toDecrypt = Base64.getDecoder().decode(line);
-                        byte[] decrypted = DecryptSymmetric(toDecrypt, personalKey);
+                        byte[] decrypted = DecryptSymmetric(toDecrypt, key);
                         if (decrypted == null) {
                                 accessDenied = true;

trunk/src/org/expeditee/gui/FrameIO.java

@@ -598 +598 @@
                         if (fullPath.endsWith(ExpReader.EXTENTION)) {
                                 if (EncryptedExpReader.isEncryptedExpediteeFile(fullPath)) {
-                                        reader = new EncryptedExpReader(frameName);
+                                        if (EncryptedExpReader.isAccessibleExpediteeFile(fullPath)) {
+                                                reader = new EncryptedExpReader(frameName);
+                                        } else {
+                                                String message = "Cannot load frame " + frameName + ".  It is encrypted and you do not have the associated key.";
+                                                System.err.println(message);
+                                                MessageBay.errorMessage(message);
+                                                return null;
+                                        }
                                 } else {
                                         reader = new ExpReader(frameName);
@@ -1754 +1761 @@
                 ResumeCache();
 
+                // 0 frame
                 base.reset();
                 base.resetDateCreated();
                 base.setFrameset(frameset);
                 base.setFrameNumber(0);
+                base.setOwner(UserSettings.UserName.get());
                 base.setTitle(base.getFramesetName() + "0");
                 base.setPath(path);
                 base.change();
-                base.setOwner(UserSettings.UserName.get());
                 SaveFrame(base, false);
 
+                // 1 frame
                 base.reset();
                 base.resetDateCreated();
                 base.setFrameNumber(1);
+                base.setOwner(UserSettings.UserName.get());
                 base.setTitle(frameset);
                 base.change();
-                base.setOwner(UserSettings.UserName.get());
                 SaveFrame(base, true);