Changeset 1407

Timestamp:

06/05/19 14:34:23 (5 years ago)

Author:

bln4

Message:

Group level permission is now completely a thing. If a frame has a Group property specified, then the value of that property will be used to look up a group frame in FrameIO.GROUP_PATH. It will then look on that frame for a list of members to the group. When doing permission checks, that list is passed in order to decide if the current user is a part of that group.

Location:

trunk/src/org/expeditee

Files:

• gui/Frame.java (modified) (4 diffs)
• gui/FrameUtils.java (modified) (2 diffs)
• items/Item.java (modified) (2 diffs)

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

@@ -31 +31 @@
 import java.util.Map;
 import java.util.Stack;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.expeditee.actions.Simple;
@@ -751 +753 @@
          */
         public void setPermission(PermissionTriple permission) {
-                List<String> groupMembers = new ArrayList<String>();
+                List<String> groupMembers = getGroupMembers();
                 
                 if (_permissionTriple != null && !_permissionTriple.getPermission(this._owner, groupMembers).equals(permission.getPermission(this._owner, groupMembers))) {
@@ -1196 +1198 @@
         }
 
-        public PermissionTriple getPermission()
-        {
+        public PermissionTriple getPermission() {
                 return _permissionTriple;
         }
         
-        public UserAppliedPermission getUserAppliedPermission()
-        {
+        public UserAppliedPermission getUserAppliedPermission() {
                 return getUserAppliedPermission(UserAppliedPermission.full);
         }
 
-        public UserAppliedPermission getUserAppliedPermission(UserAppliedPermission defaultPermission)
-        {
+        public UserAppliedPermission getUserAppliedPermission(UserAppliedPermission defaultPermission) {
                 if (_permissionTriple == null) {
                         return defaultPermission;
                 }
 
-                return _permissionTriple.getPermission(_owner, new ArrayList<String>());
+                return _permissionTriple.getPermission(_owner, getGroupMembers());
         }
 
@@ -2808 +2807 @@
                 this._groupFrame = frame;
         }
+        
+        public List<String> getGroupMembers() {
+                List<String> members = new ArrayList<String>();
+                if (getGroupFrame() != null) {
+                        Collection<Text> textItems = getGroupFrame().getTextItems();
+                        Stream<Text> memberLists = textItems.stream().filter(t -> 
+                                t.getText().toLowerCase().startsWith("@owner: ") || 
+                                t.getText().toLowerCase().startsWith("@members: "));
+                        for(Text t: memberLists.collect(Collectors.toList())) {
+                                if (t.getText().toLowerCase().startsWith("@owner: ")) {
+                                        members.add(t.getText().substring(8));
+                                } else if (t.getText().toLowerCase().startsWith("@members: ")) {
+                                        //10
+                                        String[] split = t.getText().substring(10).split(",");
+                                        for (String m: split) {
+                                                members.add(m.trim());
+                                        }
+                                }
+                        }
+                }
+                return members;
+        }
 
         private static final class History {

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

@@ -503 +503 @@
                 final PermissionTriple framePermissions = toDisplay.getPermission();
                 if (framePermissions != null
-                                && framePermissions.getPermission(toDisplay.getOwner(), new ArrayList<String>()) == UserAppliedPermission.denied) {
+                                && framePermissions.getPermission(toDisplay.getOwner(), toDisplay.getGroupMembers()) == UserAppliedPermission.denied) {
                         MessageBay.errorMessage("Insufficient permissions to navigate to frame: " + toDisplay.getName());
                         return;
@@ -1039 +1039 @@
                                                                 if (existingOverlay == null) {
                                                                         Overlay newOverlay = new Overlay(overlayFrame,
-                                                                                        permissionLevel.getPermission(overlayFrame.getOwner(), new ArrayList<String>()));
+                                                                                        permissionLevel.getPermission(overlayFrame.getOwner(), overlayFrame.getGroupMembers()));
                                                                         i.setOverlay(newOverlay);
                                                                         overlays.add(newOverlay);

trunk/src/org/expeditee/items/Item.java

@@ -494 +494 @@
         }
 
-        public void setPermission(PermissionTriple permissionPair)
-        {
+        public void setPermission(PermissionTriple permissionPair) {
+                List<String> groupMembers = getParent() != null ? getParent().getGroupMembers() : new ArrayList<String>();
                 _permissionTriple = permissionPair;
-                if (_permissionTriple.getPermission(_owner, new ArrayList<String>()) == UserAppliedPermission.denied) {
+                if (_permissionTriple.getPermission(_owner, groupMembers) == UserAppliedPermission.denied) {
                         this.getParent().moveItemToBodyHiddenDueToPermission(this);
                 }
@@ -507 +507 @@
 
         public UserAppliedPermission getUserAppliedPermission() {
+                List<String> groupMembers = getParent() != null ? getParent().getGroupMembers() : new ArrayList<String>();
                 String owner = _owner != null ? _owner : _parent != null ? _parent.getOwner() : null;
-                if(_permissionTriple != null) return _permissionTriple.getPermission(owner, new ArrayList<String>());
+                if(_permissionTriple != null) return _permissionTriple.getPermission(owner, groupMembers);
                 if(_overlayPermission != null) return _overlayPermission;
                 if(_parent != null) return _parent.getUserAppliedPermission();