From 80afd0f53b2a2024513fbd1fded37b0c82996157 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Thu, 6 Sep 2012 07:25:42 +0000
Subject: [PATCH] BIS-166 Authorization annotations moved from IServer to
AbstractServer.
SVN: 26526
---
.../systemsx/cisd/openbis/generic/server/AbstractServer.java | 5 +++++
.../ch/systemsx/cisd/openbis/generic/shared/IServer.java | 5 -----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
index bc12d8b4822..f8caa8bfb60 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
@@ -59,6 +59,7 @@ import ch.systemsx.cisd.openbis.generic.server.plugin.SampleServerPluginRegistry
import ch.systemsx.cisd.openbis.generic.shared.IRemoteHostValidator;
import ch.systemsx.cisd.openbis.generic.shared.IServer;
import ch.systemsx.cisd.openbis.generic.shared.ResourceNames;
+import ch.systemsx.cisd.openbis.generic.shared.authorization.annotation.RolesAllowed;
import ch.systemsx.cisd.openbis.generic.shared.authorization.validator.ExpressionValidator;
import ch.systemsx.cisd.openbis.generic.shared.basic.EntityVisitComparatorByTimeStamp;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
@@ -69,6 +70,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.GridCustomColumn;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.MaterialIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewSample;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewSamplesWithTypes;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy.RoleCode;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleType;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.displaysettings.IDisplaySettingsUpdate;
@@ -415,6 +417,7 @@ public abstract class AbstractServer<T> extends AbstractServiceWithLogger<T> imp
}
@Override
+ @RolesAllowed(RoleWithHierarchy.INSTANCE_ADMIN)
public void deactivatePersons(String sessionToken, List<String> personsCodes)
{
checkSession(sessionToken);
@@ -436,6 +439,7 @@ public abstract class AbstractServer<T> extends AbstractServiceWithLogger<T> imp
}
@Override
+ @RolesAllowed(RoleWithHierarchy.INSTANCE_ADMIN)
public int countActivePersons(String sessionToken)
{
checkSession(sessionToken);
@@ -820,6 +824,7 @@ public abstract class AbstractServer<T> extends AbstractServiceWithLogger<T> imp
}
@Override
+ @RolesAllowed(RoleWithHierarchy.INSTANCE_ADMIN)
public void setSessionUser(String sessionToken, String userID)
{
Session session = getSession(sessionToken);
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IServer.java
index 79151668f80..fd984d2611f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IServer.java
@@ -24,12 +24,10 @@ import ch.systemsx.cisd.common.exceptions.AuthorizationFailureException;
import ch.systemsx.cisd.common.exceptions.InvalidSessionException;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.openbis.generic.shared.authorization.ISessionProvider;
-import ch.systemsx.cisd.openbis.generic.shared.authorization.annotation.RolesAllowed;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.ObjectKind;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DisplaySettings;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.GridCustomColumn;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.displaysettings.IDisplaySettingsUpdate;
import ch.systemsx.cisd.openbis.generic.shared.dto.SessionContextDTO;
@@ -121,14 +119,12 @@ public interface IServer extends ISessionProvider
@Transactional
@DatabaseCreateOrDeleteModification(value =
{ ObjectKind.PERSON, ObjectKind.AUTHORIZATION_GROUP, ObjectKind.ROLE_ASSIGNMENT })
- @RolesAllowed(RoleWithHierarchy.INSTANCE_ADMIN)
public void deactivatePersons(String sessionToken, List<String> personsCodes);
/**
* @return number of active users
*/
@Transactional(readOnly = true)
- @RolesAllowed(RoleWithHierarchy.INSTANCE_ADMIN)
public int countActivePersons(String sessionToken);
/**
@@ -139,7 +135,6 @@ public interface IServer extends ISessionProvider
* address or else it will throw an {@link AuthorizationFailureException}.
*/
@Transactional(readOnly = true)
- @RolesAllowed(RoleWithHierarchy.INSTANCE_ADMIN)
public void setSessionUser(String sessionToken, String userID);
}
--
GitLab