Changeset 1494 for trunk/src/org/expeditee/encryption/Actions.java

Timestamp:

12/05/19 15:40:01 (4 years ago)

Author:

bnemhaus

Message:

Preperation for David's presentation.

File:

• trunk/src/org/expeditee/encryption/Actions.java (modified) (8 diffs)

trunk/src/org/expeditee/encryption/Actions.java

@@ -34 +34 @@
 public class Actions implements CryptographyConstants {
         
-        public static void SetSurrogateFor(Text surrogate, Text action) {
+        public static void SetAsSurrogateFor(Text surrogate, Text action) {
                 Frame frame = DisplayController.getCurrentFrame();
                 String[] split = action.getText().split(" ");
@@ -48 +48 @@
                         }
                 } else {
-                        MessageBay.displayMessage("Usage: SetSurrogateFor Int, inject desired surrogate.");
+                        FreeItems.getInstance().add(SetAsSurrogateForUsage());
                 }
         }
@@ -69 +69 @@
         }
         
+        public static Text JoinSecret() {
+                return AuthJoinSecretUsage();
+        }
+        
         public static Text JoinSecret(Text key) {
                 return AuthJoinSecret(key);
         }
         
+        public static void Encrypt() {
+                AuthEncryptUsage();
+        }
+        
         public static void Encrypt(Text labelWithKey) {
                 AuthEncrypt(labelWithKey);
+        }
+        
+        public static void Decrypt() {
+                AuthDecryptUsage();
         }
         
@@ -125 +137 @@
                 
                 return key;
+        }
+        
+        public static Text AuthJoinSecret() {
+                return AuthJoinSecretUsage();
         }
                 
@@ -157 +173 @@
         
         public static void AuthEncrypt(Text labelWithKey) {
-                // Obtain encryption key
-                String keyEncoded = labelWithKey.getData().get(0);
-                byte[] keyDecoded = Base64.getDecoder().decode(keyEncoded);
-                SecretKey key = new SecretKeySpec(keyDecoded, SymmetricAlgorithm);
-                
-                // Perform encryption
-                Frame toEncrypt = FrameIO.LoadFrame(labelWithKey.getLink());
-                Collection<Text> textItems = toEncrypt.getTextItems();
-                for (Text t: textItems) {
-                        byte[] encrypted = EncryptSymmetric(t.getText().getBytes(), key);
-                        t.setText(Base64.getEncoder().encodeToString(encrypted));
-                }
-                
-                // Save changes
-                FrameIO.SaveFrame(toEncrypt);
+                try {
+                        // Obtain encryption key
+                        String keyEncoded = labelWithKey.getData().get(0);
+                        byte[] keyDecoded = Base64.getDecoder().decode(keyEncoded);
+                        SecretKey key = new SecretKeySpec(keyDecoded, SymmetricAlgorithm);
+                        
+                        // Perform encryption
+                        Frame toEncrypt = FrameIO.LoadFrame(labelWithKey.getLink());
+                        Collection<Text> textItems = toEncrypt.getTextItems();
+                        for (Text t: textItems) {
+                                byte[] encrypted = EncryptSymmetric(t.getText().getBytes(), key);
+                                t.setText(Base64.getEncoder().encodeToString(encrypted));
+                        }
+                        
+                        // Save changes
+                        FrameIO.SaveFrame(toEncrypt);
+                } catch (Exception e) {
+                        FreeItems.getInstance().add(AuthEncryptUsage());
+                }
         }
         
         public static void AuthDecrypt(Text labelWithKey) {
-                // Obtain encryption key
-                String keyEncoded = labelWithKey.getData().get(0);
-                byte[] keyDecoded = Base64.getDecoder().decode(keyEncoded);
-                SecretKey key = new SecretKeySpec(keyDecoded, SymmetricAlgorithm);
-                
-                // Perform decryption
-                Frame toDecrypt = FrameIO.LoadFrame(labelWithKey.getLink());
-                Collection<Text> textItems = toDecrypt.getTextItems();
-                for (Text t: textItems) {
-                        byte[] decrypted = DecryptSymmetric(Base64.getDecoder().decode(t.getText().getBytes()), key);
-                        t.setText(new String(decrypted));
-                }
-                
-                // Save changes
-                FrameIO.SaveFrame(toDecrypt);
+                try {
+                        // Obtain encryption key
+                        String keyEncoded = labelWithKey.getData().get(0);
+                        byte[] keyDecoded = Base64.getDecoder().decode(keyEncoded);
+                        SecretKey key = new SecretKeySpec(keyDecoded, SymmetricAlgorithm);
+                        
+                        // Perform decryption
+                        Frame toDecrypt = FrameIO.LoadFrame(labelWithKey.getLink());
+                        Collection<Text> textItems = toDecrypt.getTextItems();
+                        for (Text t: textItems) {
+                                byte[] decrypted = DecryptSymmetric(Base64.getDecoder().decode(t.getText().getBytes()), key);
+                                t.setText(new String(decrypted));
+                        }
+                        
+                        // Save changes
+                        FrameIO.SaveFrame(toDecrypt);   
+                } catch (Exception e) {
+                        FreeItems.getInstance().add(AuthDecryptUsage());
+                }
         }
         
@@ -240 +264 @@
         }
         
+        private static Text AuthJoinSecretUsage() {
+                String nl = System.getProperty("line.separator");
+                String tab = "   ";
+                StringBuilder message = new StringBuilder("Usage: " + nl);
+                message.append(tab + "With Text Item attached to cursor: " + nl);
+                message.append(tab + tab + "Content matches pattern \"<SecretName> <Amount of Coperation Required> <Total Number of Shares>\"" + nl);
+                message.append(tab + tab + "Data contains <Amount of Coperation Required> partial keys" + nl);
+                message.append(tab + "Left click on this action." + nl);
+                message.append(tab + "Resulting Text Item will contain joined key in data.");
+                return generateUsageText(message);
+        }
+        
         private static Text AuthSplitSecretUsage() {
                 String nl = System.getProperty("line.separator");
@@ -248 +284 @@
                 message.append(tab + tab + "Context Example: \"SecretName 3 Sandra John Billy Sally Sam Tim\"" + nl);
                 message.append(tab + tab + "Data contains key data" + nl);
-                message.append(tab + "Middle click on this action." + nl);
+                message.append(tab + "Left click on this action." + nl);
                 message.append(tab + "Resulting Text Item will contain shares in data.");
                 return generateUsageText(message);
@@ -261 +297 @@
                 message.append(tab + tab + "Content represents the desired label name for the generated secret." + nl);
                 message.append(tab + tab + "This action will overwrite any existing data." + nl);
-                message.append(tab + "Middle click on this action." + nl);
+                message.append(tab + "Left click on this action." + nl);
                 message.append(tab + "Text Item will now contain a full key in its data." + nl);
                 message.append(tab + "Resulting Text Item is now a Secret and can be placed on secrets frame.");
+                return generateUsageText(message);
+        }
+        
+        private static Text AuthEncryptUsage() {
+                String nl = System.getProperty("line.separator");
+                String tab = "   ";
+                StringBuilder message = new StringBuilder("Usage: " + nl);
+                message.append(tab + "Note: this action was used for demonstration purposes earlier in development." + nl);
+                message.append(tab + "(It can now be considered deprecated by Encryption Label and surrogate functionality)" + nl);
+                message.append(tab + "With Text Item attached to cursor: " + nl);
+                message.append(tab + tab + "Data contains key data." + nl);
+                message.append(tab + tab + "Must be linked to frame you wish to encrypt." + nl);
+                message.append(tab + "Left click on this action." + nl);
+                message.append(tab + "Content on linked frame will now be encrypted.");
+                return generateUsageText(message);
+        }
+        
+        private static Text AuthDecryptUsage() {
+                String nl = System.getProperty("line.separator");
+                String tab = "   ";
+                StringBuilder message = new StringBuilder("Usage: " + nl);
+                message.append(tab + "Note: this action was used for demonstration purposes earlier in development." + nl);
+                message.append(tab + "(It can now be considered deprecated by Encryption Label and surrogate functionality)" + nl);
+                message.append(tab + "With Text Item attached to cursor: " + nl);
+                message.append(tab + tab + "Data contains key data." + nl);
+                message.append(tab + tab + "Must be linked to frame that was previously encrypted." + nl);
+                message.append(tab + "Left click on this action." + nl);
+                message.append(tab + "Content on linked frame will now be decrypted.");
+                return generateUsageText(message);
+        }
+        
+        private static Text SetAsSurrogateForUsage() {
+                String nl = System.getProperty("line.separator");
+                String tab = "   ";
+                StringBuilder message = new StringBuilder("Usage: " + nl);
+                message.append(tab + "Change arugment to be the ID of the desired primary item." + nl);
+                message.append(tab + "(An items ID is available in its extracted properties)" + nl);
+                message.append(tab + "With Text Item attached to cursor: " + nl);
+                message.append(tab + tab + "Attached Item is desired surrogate." + nl);
+                message.append(tab + "Left click on this action." + nl);
+                message.append(tab + "Item will respect surrogate mode once placed on frame." + nl);
                 return generateUsageText(message);
         }