Changeset 1400 for trunk

Timestamp:

05/31/19 11:39:55 (5 years ago)

Author:

bln4

Message:

Can now encrypt specific items on an encrypted frame.

Location:

trunk/src/org/expeditee/encryption/io

Files:

• EncryptedExpReader.java (modified) (3 diffs)
• EncryptedExpWriter.java (modified) (3 diffs)

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

@@ -12 +12 @@
 import java.util.Arrays;
 import java.util.Base64;
+import java.util.Collection;
 
 import javax.crypto.BadPaddingException;
@@ -23 +24 @@
 import org.expeditee.gui.Frame;
 import org.expeditee.io.ExpReader;
+import org.expeditee.items.Item;
 import org.expeditee.items.Text;
 import org.expeditee.settings.identity.secrets.KeyList;
@@ -72 +74 @@
         public Frame readFrame(final BufferedReader reader) throws IOException {
                 if (accessDenied) { return null; }
-                else return super.readFrame(reader);
+                else {
+                        Frame unencryptedFrame = super.readFrame(reader);
+                        individualItemDecryption(unencryptedFrame);
+                        return unencryptedFrame;
+                }
+        }
+        
+        private void individualItemDecryption(Frame frame) {
+                // Find items with their own encryption label.
+                Collection<Item> itemsWithEncryptionLabel = frame.getAllItems();
+                itemsWithEncryptionLabel.removeIf(i -> i.getEncryptionLabel() == null || i.getEncryptionLabel().isEmpty());
+                
+                for (Item i: itemsWithEncryptionLabel) {
+                        // Decrypt the Text Items
+                        if (i instanceof Text) {
+                                byte[] keyBytes = EncryptedExpWriter.resolveKeyFromLabel(i.getEncryptionLabel(), "");
+                                if (keyBytes == null) { continue; }
+                                SecretKeySpec key = new SecretKeySpec(keyBytes, SymmetricAlgorithm);
+                                byte[] decryptedBytes = DecryptSymmetric(Base64.getDecoder().decode(i.getText()), key);
+                                i.setText(new String(decryptedBytes));
+                        }
+                }
         }
         

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

@@ -22 +22 @@
 import org.expeditee.gui.MessageBay;
 import org.expeditee.io.ExpWriter;
+import org.expeditee.items.Item;
 import org.expeditee.items.Text;
 import org.expeditee.settings.UserSettings;
@@ -60 +61 @@
         
         @Override
+        public void outputFrame(Frame frame) throws IOException {
+                individualItemEncryption(frame);
+                super.outputFrame(frame);
+        }
+        
+        @Override
         protected void writeLine(String line) throws IOException {
                 // do not write empty lines
@@ -71 +78 @@
                 _writer.write(toWrite);
                 _stringWriter.append(toWrite);
+        }
+        
+        private void individualItemEncryption(Frame frame) {
+                // Find items with their own encryption label.
+                Collection<Item> itemsWithEncryptionLabel = frame.getAllItems();
+                itemsWithEncryptionLabel.removeIf(i -> i.getEncryptionLabel() == null || i.getEncryptionLabel().isEmpty());
+                
+                for (Item i: itemsWithEncryptionLabel) {
+                        // Encrypt the Text Items
+                        if (i instanceof Text) {
+                                byte[] keyBytes = resolveKeyFromLabel(i.getEncryptionLabel(), "(actually item) on " + i.getParent().getName());
+                                if (keyBytes == null) { continue; } 
+                                SecretKeySpec key = new SecretKeySpec(keyBytes, SymmetricAlgorithm);
+                                byte[] encryptedBytes = EncryptSymmetric(i.getText().getBytes(), key);
+                                i.setText(Base64.getEncoder().encodeToString(encryptedBytes));
+                        }
+                }
         }