Skip further checks in predicates if caller has instance-wide write permissions.

SVN: 26785

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetUpdatesCollectionPredicate.java

@@ -73,6 +73,12 @@ public class DataSetUpdatesCollectionPredicate extends
     protected Status doEvaluation(PersonPE person, List<RoleWithIdentifier> allowedRoles,
             List<? extends DataSetUpdatesDTO> value)
     {
+        // Skip all further checks if the person has instance-wide write permissions.
+        if (hasInstanceWritePermissions(person, allowedRoles).isOK())
+        {
+            return Status.OK;
+        }
+
         List<TechId> techIds = new ArrayList<TechId>();
         List<SampleOwnerIdentifier> sampleIdentifiers = new ArrayList<SampleOwnerIdentifier>();
         for (DataSetUpdatesDTO dataSetUpdates : value)

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentUpdatesPredicate.java

@@ -58,11 +58,18 @@ public class ExperimentUpdatesPredicate extends AbstractPredicate<ExperimentUpda
     }
 
     @Override
-    protected
-    Status doEvaluation(final PersonPE person, final List<RoleWithIdentifier> allowedRoles,
+    protected Status doEvaluation(final PersonPE person,
+            final List<RoleWithIdentifier> allowedRoles,
             final ExperimentUpdatesDTO updates)
     {
         assert experimentTechIdPredicate.initialized : "Predicate has not been initialized";
+
+        // Skip all further checks if the person has instance-wide write permissions.
+        if (hasInstanceWritePermissions(person, allowedRoles).isOK())
+        {
+            return Status.OK;
+        }
+
         Status status;
         status =
                 experimentTechIdPredicate.doEvaluation(person, allowedRoles, updates

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewExternalDataPredicate.java

@@ -59,6 +59,12 @@ public class NewExternalDataPredicate extends AbstractPredicate<NewExternalData>
     protected Status doEvaluation(PersonPE person, List<RoleWithIdentifier> allowedRoles,
             NewExternalData value)
     {
+        // Skip all further checks if the person has instance-wide write permissions.
+        if (hasInstanceWritePermissions(person, allowedRoles).isOK())
+        {
+            return Status.OK;
+        }
+
         SampleIdentifier sampleIdentifier = value.getSampleIdentifierOrNull();
         if (sampleIdentifier != null)
         {

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleOwnerIdentifierPredicate.java

@@ -83,6 +83,12 @@ public class SampleOwnerIdentifierPredicate extends AbstractPredicate<SampleOwne
     public Status performEvaluation(final PersonPE person,
             final List<RoleWithIdentifier> allowedRoles, final SampleOwnerIdentifier value)
     {
+        // Skip all further checks if the person has instance-wide write permissions.
+        if (hasInstanceWritePermissions(person, allowedRoles).isOK())
+        {
+            return Status.OK;
+        }
+
         if (value.isDatabaseInstanceLevel())
         {
             return databaseInstanceIdentifierPredicate.doEvaluation(person, allowedRoles,

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleUpdatesCollectionPredicate.java

@@ -70,6 +70,12 @@ public class SampleUpdatesCollectionPredicate extends AbstractPredicate<List<Sam
     protected Status doEvaluation(PersonPE person, List<RoleWithIdentifier> allowedRoles,
             List<SampleUpdatesDTO> value)
     {
+        // Skip all further checks if the person has instance-wide write permissions.
+        if (hasInstanceWritePermissions(person, allowedRoles).isOK())
+        {
+            return Status.OK;
+        }
+
         List<TechId> techIds = new ArrayList<TechId>(value.size());
         List<SampleOwnerIdentifier> sampleIdentifiers =
                 new ArrayList<SampleOwnerIdentifier>(value.size());

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SpaceIdentifierPredicate.java

@@ -57,6 +57,12 @@ public class SpaceIdentifierPredicate extends AbstractSpacePredicate<SpaceIdenti
     protected Status doEvaluation(final PersonPE person,
             final List<RoleWithIdentifier> allowedRoles, final SpaceIdentifier spaceIdentifier)
     {
+        // Skip all further checks if the person has instance-wide write permissions.
+        if (hasInstanceWritePermissions(person, allowedRoles).isOK())
+        {
+            return Status.OK;
+        }
+
         assert initialized : "Predicate has not been initialized";
         final String spaceCode = SpaceCodeHelper.getSpaceCode(person, spaceIdentifier);
         final DatabaseInstancePE databaseInstance = getDatabaseInstance(spaceIdentifier);