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

Timestamp:

04/17/19 14:23:09 (5 years ago)

Author:

bln4

Message:

Officially added code to encrypt frames with custom built labels. Minimal error checking implemented so far and logical things may not happen when unexpected data.

File:

• trunk/src/org/expeditee/auth/EncryptedExpWriter.java (modified) (4 diffs)

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

@@ -6 +6 @@
 import java.util.Arrays;
 import java.util.Base64;
+import java.util.Collection;
 import java.util.List;
 
@@ -15 +16 @@
 import javax.crypto.spec.SecretKeySpec;
 
+import org.expeditee.gui.Frame;
+import org.expeditee.gui.FrameIO;
+import org.expeditee.gui.MessageBay;
 import org.expeditee.io.ExpWriter;
 import org.expeditee.items.Text;
+import org.expeditee.settings.UserSettings;
 import org.expeditee.settings.identity.secrets.KeyList;
 import org.ngikm.cryptography.CryptographyConstants;
@@ -36 +41 @@
                         label = "Profile";
                 } else {
-                        byte[] keyBytes = resolveKeyFromLabel(encryptionLabel);
+                        byte[] keyBytes = resolveKeyFromLabel(encryptionLabel, _framename);
                         key = new SecretKeySpec(keyBytes, SymmetricAlgorithm);
                         label = encryptionLabel;
@@ -67 +72 @@
         }
         
-        private byte[] resolveKeyFromLabel(String label) {
-                return null;
+        protected static byte[] resolveKeyFromLabel(String label, String framename) {
+                String credentialsFrameName = UserSettings.ProfileName.get() + AuthenticatorBrowser.CREDENTIALS_FRAME;
+                Frame credentialsFrame = FrameIO.LoadFrame(credentialsFrameName);
+                Collection<Text> textItems = credentialsFrame.getTextItems();
+                textItems.removeIf(t -> !t.getText().equals("Secrets"));
+                textItems.removeIf(t -> !t.hasLink());
+                if (textItems.isEmpty()) {
+                        MessageBay.errorMessage("Unable to find label " + label + " to encrypt frame " + framename + ".");
+                        return null;
+                } else {
+                        Text linkToSecretsFrame = textItems.iterator().next();
+                        Frame secretsFrame = FrameIO.LoadFrame(linkToSecretsFrame.getParent().getFramesetName() + linkToSecretsFrame.getLink());
+                        Collection<Text> labels = secretsFrame.getTextItems();
+                        labels.removeIf(lbl -> lbl.getText().equals(label));
+                        labels.removeIf(lbl -> lbl.getData() == null || lbl.getData().size() == 0);
+                        if (labels.isEmpty()) {
+                                MessageBay.errorMessage("Unable to find label " + label + " to encrypt frame " + framename + ".");
+                                return null;
+                        }
+                        
+                        Text labelItem = labels.iterator().next();
+                        String data = labelItem.getData().get(0);
+                        if (data.contains("{")) {
+                                MessageBay.errorMessage("You only have a fraction of the required key to access " + framename + ".");
+                                return null;
+                        } else {
+                                try {
+                                        return Base64.getDecoder().decode(data);
+                                } catch (IllegalArgumentException e) {
+                                        MessageBay.errorMessage("Unable to create key out of data stored in label " + label + ".");
+                                        return null;
+                                }
+                        }
+                }
         }