Changeset 6058

Timestamp:

02/09/10 11:24:45 (6 months ago)

Author:

jmoore

Message:

ticket:1776 - Adding check for identical permissions in group filter in OmeroInterceptor

Location:

trunk/components

Files:

• server/src/ome/security/basic/OmeroInterceptor.java (modified) (1 diff)
• server/test/ome/server/itests/perms42/SetGroupPermissionsTest.java (modified) (1 diff)
• tools/OmeroPy/test/integration/permissions.py (modified) (4 diffs)

trunk/components/server/src/ome/security/basic/OmeroInterceptor.java

@@ -769 +769 @@
 
             // see https://trac.openmicroscopy.org.uk/omero/ticket/1434
-            if (obj instanceof ExperimenterGroup) {
+            if (!currentP.identical(tmpPreviousP) &&
+                    obj instanceof ExperimenterGroup) {
                 throw new GroupSecurityViolation(
                         "Group permissions must be changed via IAdmin");

trunk/components/server/test/ome/server/itests/perms42/SetGroupPermissionsTest.java

@@ -125 +125 @@
     }
 
+    @Test
+    public void testCopiedFromPython() throws Exception {
+        
+        loginRoot();
+        
+        String uuid = iAdmin.getEventContext().getCurrentSessionUuid();
+        ExperimenterGroup new_gr1 = new ExperimenterGroup();
+        new_gr1.setName("group1_"+uuid);
+        Permissions p = Permissions.OPEN;
+        new_gr1.getDetails().setPermissions(p);
+        long g1_id = iAdmin.createGroup(new_gr1);
+            
+        //  update name of group1
+        ExperimenterGroup gr1 = iAdmin.getGroup(g1_id);
+        assertEquals("rwrw--", gr1.getDetails().getPermissions().toString());
+        String new_name = "changed_name_group1_" + uuid;
+        gr1.setName(new_name);
+        iAdmin.updateGroup(gr1);
+        ExperimenterGroup gr1_u = iAdmin.getGroup(g1_id);
+        assertEquals(new_name, gr1_u.getName());
+    }
 }

trunk/components/tools/OmeroPy/test/integration/permissions.py

@@ -46 +46 @@
         # update name of group1
         gr1 = admin.getGroup(g1_id)
-        self.assertEquals('rw----', str(gr1.details.permissions)) 
+        self.assertEquals('rw----', str(gr1.details.permissions))
         new_name = "changed_name_group1_%s" % uuid
         gr1.name = rstring(new_name)
-        admin.updateGroup(gr1)        
+        admin.updateGroup(gr1)
         gr1_u = admin.getGroup(g1_id)
         self.assertEquals(new_name, gr1_u.name.val)
@@ -76 +76 @@
         # update name of group1
         gr1 = admin.getGroup(g1_id)
-        self.assertEquals('rwr---', str(gr1.details.permissions)) 
+        self.assertEquals('rwr---', str(gr1.details.permissions))
         new_name = "changed_name_group1_%s" % uuid
         gr1.name = rstring(new_name)
-        admin.updateGroup(gr1)        
+        admin.updateGroup(gr1)
         gr1_u = admin.getGroup(g1_id)
         self.assertEquals(new_name, gr1_u.name.val)
@@ -106 +106 @@
         # update name of group1
         gr1 = admin.getGroup(g1_id)
-        self.assertEquals('rwrw--', str(gr1.details.permissions)) 
+        self.assertEquals('rwrw--', str(gr1.details.permissions))
         new_name = "changed_name_group1_%s" % uuid
         gr1.name = rstring(new_name)
-        admin.updateGroup(gr1)        
+        admin.updateGroup(gr1)
         gr1_u = admin.getGroup(g1_id)
         self.assertEquals(new_name, gr1_u.name.val)
-    
+
     def testCreatGroupAndchangePermissions(self):
         # this is the test of updating group permissions
@@ -190 +190 @@
         defaultGroup = admin.lookupGroup("default")
         listOfGroups = list()
-        listOfGroups.append(admin.lookupGroup("user"))        
+        listOfGroups.append(admin.lookupGroup("user"))
         eid1 = admin.createExperimenterWithPassword(new_exp1, rstring("ome"), defaultGroup, listOfGroups)
-        exp1 = getExperimenter(eid)
+        exp1 = admin.getExperimenter(eid1)
         
         #set owner of the group (user is not a member of)
-        admin_serv.addGroupOwners(gr1, [exp1])
+        admin.addGroupOwners(gr1, [exp1])
         # chech if is the leader
-        isLeader() ???    
-        
+        ec = admin.getEventContext()
+        self.assertTrue(gr1.id.val in ec.leaderOfGroups())
+
         # remove group owner
-        admin_serv.removeGroupOwners(gr1, [exp1])
+        admin.removeGroupOwners(gr1, [exp1])
         # chech if no longer is the leader
-        isLeader() ???
+        self.assertFalse(gr1.id.val in ec.leaderOfGroups())
 
         '''