From 33ce11cc3759f105e895658ec092eb033b4abed3 Mon Sep 17 00:00:00 2001
From: gakin <gakin>
Date: Wed, 21 Dec 2016 15:43:53 +0000
Subject: [PATCH] SSDM-4554 Add INSTANCE_ETL_SERVER to "Roles allowed" for the
methods in CommonServer used for master data registration
SVN: 37536
---
.../openbis/generic/server/CommonServer.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java
index 44ddc935656..9057fbd1f94 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java
@@ -1356,7 +1356,7 @@ public final class CommonServer extends AbstractCommonServer<ICommonServerForInt
}
@Override
- @RolesAllowed(RoleWithHierarchy.INSTANCE_ADMIN)
+ @RolesAllowed({ RoleWithHierarchy.INSTANCE_ADMIN, RoleWithHierarchy.INSTANCE_ETL_SERVER })
public String assignPropertyType(final String sessionToken, NewETPTAssignment assignment)
{
assert sessionToken != null : "Unspecified session token";
@@ -1436,7 +1436,7 @@ public final class CommonServer extends AbstractCommonServer<ICommonServerForInt
}
@Override
- @RolesAllowed(RoleWithHierarchy.INSTANCE_ADMIN)
+ @RolesAllowed({ RoleWithHierarchy.INSTANCE_ADMIN, RoleWithHierarchy.INSTANCE_ETL_SERVER })
public void registerPropertyType(final String sessionToken, final PropertyType propertyType)
{
assert sessionToken != null : "Unspecified session token";
@@ -1461,7 +1461,7 @@ public final class CommonServer extends AbstractCommonServer<ICommonServerForInt
}
@Override
- @RolesAllowed(RoleWithHierarchy.INSTANCE_ADMIN)
+ @RolesAllowed({ RoleWithHierarchy.INSTANCE_ADMIN, RoleWithHierarchy.INSTANCE_ETL_SERVER })
@Capability("REGISTER_VOCABULARY")
public void registerVocabulary(final String sessionToken, final NewVocabulary vocabulary)
{
@@ -1859,7 +1859,7 @@ public final class CommonServer extends AbstractCommonServer<ICommonServerForInt
}
@Override
- @RolesAllowed(RoleWithHierarchy.INSTANCE_ADMIN)
+ @RolesAllowed({ RoleWithHierarchy.INSTANCE_ADMIN, RoleWithHierarchy.INSTANCE_ETL_SERVER })
public void registerSampleType(String sessionToken, SampleType entityType)
{
final Session session = getSession(sessionToken);
@@ -1887,7 +1887,7 @@ public final class CommonServer extends AbstractCommonServer<ICommonServerForInt
}
@Override
- @RolesAllowed(RoleWithHierarchy.INSTANCE_ADMIN)
+ @RolesAllowed({ RoleWithHierarchy.INSTANCE_ADMIN, RoleWithHierarchy.INSTANCE_ETL_SERVER })
public void registerMaterialType(String sessionToken, MaterialType entityType)
{
final Session session = getSession(sessionToken);
@@ -1904,7 +1904,7 @@ public final class CommonServer extends AbstractCommonServer<ICommonServerForInt
}
@Override
- @RolesAllowed(RoleWithHierarchy.INSTANCE_ADMIN)
+ @RolesAllowed({ RoleWithHierarchy.INSTANCE_ADMIN, RoleWithHierarchy.INSTANCE_ETL_SERVER })
public void registerExperimentType(String sessionToken, ExperimentType entityType)
{
final Session session = getSession(sessionToken);
@@ -1921,7 +1921,7 @@ public final class CommonServer extends AbstractCommonServer<ICommonServerForInt
}
@Override
- @RolesAllowed(RoleWithHierarchy.INSTANCE_ADMIN)
+ @RolesAllowed({ RoleWithHierarchy.INSTANCE_ADMIN, RoleWithHierarchy.INSTANCE_ETL_SERVER })
public void registerFileFormatType(String sessionToken, FileFormatType type)
{
checkSession(sessionToken);
@@ -1939,7 +1939,7 @@ public final class CommonServer extends AbstractCommonServer<ICommonServerForInt
}
@Override
- @RolesAllowed(RoleWithHierarchy.INSTANCE_ADMIN)
+ @RolesAllowed({ RoleWithHierarchy.INSTANCE_ADMIN, RoleWithHierarchy.INSTANCE_ETL_SERVER })
public void registerDataSetType(String sessionToken, DataSetType entityType)
{
final Session session = getSession(sessionToken);
--
GitLab