Changeset 1506 for trunk/src/org/expeditee/gui/AttributeUtils.java

Timestamp:

01/31/20 13:49:48 (4 years ago)

Author:

bnemhaus

Message:

Permissions for encrypting frames are now respected. (Group level permissions still need testing and maybe implementation)

The current implementation of Hetrogeneous Owner requires that the owner of the frame specify the available labels. Injecting the property "HetrogeneousEncryptionLabels: <label name>" into the frame name item adds the specified label to the list of labels that those with 'Hetrogeneous (Owner)' permission are able to use.

File:

• trunk/src/org/expeditee/gui/AttributeUtils.java (modified) (2 diffs)

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

@@ -204 +204 @@
                         
                         // Encryption Frame attributes
-                        _FrameAttrib.put("FrameEncryptionLabel",                Frame.class.getMethod("getFrameEncryptionLabel"), 
-                                                                                                                        Frame.class.getMethod("setFrameEncryptionLabel", pString));
-                        _FrameAttrib.put("EncryptionFramePermission",   Frame.class.getMethod("getFrameEncryptionPermission"), 
-                                                                                                                        Frame.class.getMethod("setFrameEncryptionPermission", pEncPermission));
-                        _FrameAttrib.put("HomogeneousEncryptionLabel",  Frame.class.getMethod("getHomogeneousEncryptionLabel"), 
-                                                                                                                        Frame.class.getMethod("setHomogeneousEncryptionLabel", pString));
-                        _FrameAttrib.put("EncryptionPermission",                Frame.class.getMethod("getEncryptionPermission"), 
-                                                                                                                        Frame.class.getMethod("setEncryptionPermission", pEncPermission));
+                        _FrameAttrib.put("FrameEncryptionLabel",                        Frame.class.getMethod("getFrameEncryptionLabel"), 
+                                                                                                                                Frame.class.getMethod("setFrameEncryptionLabel", pString));
+                        _FrameAttrib.put("EncryptionFramePermission",           Frame.class.getMethod("getFrameEncryptionPermission"), 
+                                                                                                                                Frame.class.getMethod("setFrameEncryptionPermission", pEncPermission));
+                        _FrameAttrib.put("HomogeneousEncryptionLabel",          Frame.class.getMethod("getHomogeneousEncryptionLabel"), 
+                                                                                                                                Frame.class.getMethod("setHomogeneousEncryptionLabel", pString));
+                        _FrameAttrib.put("EncryptionPermission",                        Frame.class.getMethod("getEncryptionPermission"), 
+                                                                                                                                Frame.class.getMethod("setEncryptionPermission", pEncPermission));
+                        _FrameAttrib.put("HetrogeneousEncryptionLabels",        Frame.class.getMethod("getHetrogeneousFrameOwnerLabels"), 
+                                                                                                                                Frame.class.getMethod("addToHetrogeneousFrameOwnerLabels", pString));
                         
                         // aliases for Standard frame attribute settings
@@ -220 +222 @@
                         // aliases for Encryption frame attribute settings
                         _FrameAttrib.alias("encframelabel",     "FrameEncryptionLabel");
+                        _FrameAttrib.alias("EncryptionFrameLabel", "FrameEncryptionLabel");
                         _FrameAttrib.alias("encframeperm",      "EncryptionFramePermission");
                         _FrameAttrib.alias("homoenclabel",      "HomogeneousEncryptionLabel");