Skip to content
Snippets Groups Projects
Commit 018f357b authored by brinn's avatar brinn
Browse files

Fix: check authorization for creating new experiments. Perform second check of... 

Fix: check authorization for creating new experiments. Perform second check of authorization only if authorization subject is different from caller.

SVN: 26787
parent 0f6b7f04
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
+ 94
− 50
View file @ 018f357b
...@@ -1393,9 +1393,10 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements ...@@ -1393,9 +1393,10 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
try try
{ {
final Session session = getSession(sessionToken); final Session session = getSession(sessionToken);
final String userId = operationDetails.tryUserIdOrNull();
boolean authorize = (userId != null);
Session sessionForEntityOperation = session; Session sessionForEntityOperation = session;
String userId = operationDetails.tryUserIdOrNull(); if (authorize)
if (userId != null)
{ {
sessionTokenForEntityOperation = sessionTokenForEntityOperation =
sessionManagerForEntityOperation.tryToOpenSession(userId, "dummy password"); sessionManagerForEntityOperation.tryToOpenSession(userId, "dummy password");
...@@ -1405,34 +1406,44 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements ...@@ -1405,34 +1406,44 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
} }
long spacesCreated = long spacesCreated =
createSpaces(sessionForEntityOperation, operationDetails, progressListener); createSpaces(sessionForEntityOperation, operationDetails, progressListener,
authorize);
long materialsCreated = long materialsCreated =
createMaterials(sessionForEntityOperation, operationDetails, progressListener); createMaterials(sessionForEntityOperation, operationDetails, progressListener,
authorize);
long projectsCreated = long projectsCreated =
createProjects(sessionForEntityOperation, operationDetails, progressListener); createProjects(sessionForEntityOperation, operationDetails, progressListener,
authorize);
long experimentsCreated = long experimentsCreated =
createExperiments(sessionForEntityOperation, operationDetails, progressListener); createExperiments(sessionForEntityOperation, operationDetails,
progressListener, authorize);
long experimentsUpdates = long experimentsUpdates =
updateExperiments(sessionForEntityOperation, operationDetails, progressListener); updateExperiments(sessionForEntityOperation, operationDetails,
progressListener, authorize);
long samplesCreated = long samplesCreated =
createSamples(sessionForEntityOperation, operationDetails, progressListener); createSamples(sessionForEntityOperation, operationDetails, progressListener,
authorize);
long samplesUpdated = long samplesUpdated =
updateSamples(sessionForEntityOperation, operationDetails, progressListener); updateSamples(sessionForEntityOperation, operationDetails, progressListener,
authorize);
long dataSetsCreated = long dataSetsCreated =
createDataSets(sessionForEntityOperation, operationDetails, progressListener); createDataSets(sessionForEntityOperation, operationDetails, progressListener,
authorize);
long dataSetsUpdated = long dataSetsUpdated =
updateDataSets(sessionForEntityOperation, operationDetails, progressListener); updateDataSets(sessionForEntityOperation, operationDetails, progressListener,
authorize);
long materialsUpdates = long materialsUpdates =
updateMaterials(sessionForEntityOperation, operationDetails, progressListener); updateMaterials(sessionForEntityOperation, operationDetails, progressListener,
authorize);
// If the id is not null, the caller wants to persist the fact that the operation was // If the id is not null, the caller wants to persist the fact that the operation was
// invoked and completed; // invoked and completed;
...@@ -1482,11 +1493,14 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements ...@@ -1482,11 +1493,14 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
} }
private long createSpaces(Session session, AtomicEntityOperationDetails operationDetails, private long createSpaces(Session session, AtomicEntityOperationDetails operationDetails,
IServiceConversationProgressListener progress) IServiceConversationProgressListener progress, boolean authorize)
{ {
ArrayList<SpacePE> spacePEsCreated = new ArrayList<SpacePE>(); ArrayList<SpacePE> spacePEsCreated = new ArrayList<SpacePE>();
List<NewSpace> newSpaces = operationDetails.getSpaceRegistrations(); List<NewSpace> newSpaces = operationDetails.getSpaceRegistrations();
assertSpaceCreationAllowed(session, newSpaces); if (authorize)
{
checkSpaceCreationAllowed(session, newSpaces);
}
int index = 0; int index = 0;
for (NewSpace newSpace : newSpaces) for (NewSpace newSpace : newSpaces)
...@@ -1499,7 +1513,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements ...@@ -1499,7 +1513,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
return index; return index;
} }
protected void assertSpaceCreationAllowed(Session session, List<NewSpace> newSpaces) protected void checkSpaceCreationAllowed(Session session, List<NewSpace> newSpaces)
{ {
if (newSpaces != null && newSpaces.isEmpty() == false) if (newSpaces != null && newSpaces.isEmpty() == false)
{ {
...@@ -1508,13 +1522,16 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements ...@@ -1508,13 +1522,16 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
} }
private long createMaterials(Session session, AtomicEntityOperationDetails operationDetails, private long createMaterials(Session session, AtomicEntityOperationDetails operationDetails,
IServiceConversationProgressListener progress) IServiceConversationProgressListener progress, boolean authorize)
{ {
MaterialHelper materialHelper = MaterialHelper materialHelper =
new MaterialHelper(session, businessObjectFactory, getDAOFactory(), new MaterialHelper(session, businessObjectFactory, getDAOFactory(),
getPropertiesBatchManager()); getPropertiesBatchManager());
Map<String, List<NewMaterial>> materialRegs = operationDetails.getMaterialRegistrations(); Map<String, List<NewMaterial>> materialRegs = operationDetails.getMaterialRegistrations();
assertMaterialCreationAllowed(session, materialRegs); if (authorize)
{
checkMaterialCreationAllowed(session, materialRegs);
}
int index = 0; int index = 0;
for (Entry<String, List<NewMaterial>> newMaterialsEntry : materialRegs.entrySet()) for (Entry<String, List<NewMaterial>> newMaterialsEntry : materialRegs.entrySet())
{ {
...@@ -1527,7 +1544,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements ...@@ -1527,7 +1544,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
} }
private long updateMaterials(Session session, AtomicEntityOperationDetails operationDetails, private long updateMaterials(Session session, AtomicEntityOperationDetails operationDetails,
IServiceConversationProgressListener progress) IServiceConversationProgressListener progress, boolean authorize)
{ {
MaterialHelper materialHelper = MaterialHelper materialHelper =
new MaterialHelper(session, businessObjectFactory, getDAOFactory(), new MaterialHelper(session, businessObjectFactory, getDAOFactory(),
...@@ -1535,7 +1552,10 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements ...@@ -1535,7 +1552,10 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
List<MaterialUpdateDTO> allMaterialUpdates = operationDetails.getMaterialUpdates(); List<MaterialUpdateDTO> allMaterialUpdates = operationDetails.getMaterialUpdates();
assertMaterialUpdateAllowed(session, allMaterialUpdates); if (authorize)
{
checkMaterialUpdateAllowed(session, allMaterialUpdates);
}
materialHelper.updateMaterials(allMaterialUpdates); materialHelper.updateMaterials(allMaterialUpdates);
...@@ -1544,7 +1564,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements ...@@ -1544,7 +1564,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
return allMaterialUpdates.size(); return allMaterialUpdates.size();
} }
protected void assertMaterialCreationAllowed(Session session, protected void checkMaterialCreationAllowed(Session session,
Map<String, List<NewMaterial>> materials) Map<String, List<NewMaterial>> materials)
{ {
if (materials != null && materials.isEmpty() == false) if (materials != null && materials.isEmpty() == false)
...@@ -1553,7 +1573,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements ...@@ -1553,7 +1573,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
} }
} }
protected void assertMaterialUpdateAllowed(Session session, protected void checkMaterialUpdateAllowed(Session session,
List<MaterialUpdateDTO> materialUpdates) List<MaterialUpdateDTO> materialUpdates)
{ {
if (materialUpdates != null && materialUpdates.isEmpty() == false) if (materialUpdates != null && materialUpdates.isEmpty() == false)
...@@ -1595,11 +1615,14 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements ...@@ -1595,11 +1615,14 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
} }
private long createProjects(Session session, AtomicEntityOperationDetails operationDetails, private long createProjects(Session session, AtomicEntityOperationDetails operationDetails,
IServiceConversationProgressListener progress) IServiceConversationProgressListener progress, boolean authorize)
{ {
ArrayList<ProjectPE> projectPEsCreated = new ArrayList<ProjectPE>(); ArrayList<ProjectPE> projectPEsCreated = new ArrayList<ProjectPE>();
List<NewProject> newProjects = operationDetails.getProjectRegistrations(); List<NewProject> newProjects = operationDetails.getProjectRegistrations();
assertProjectCreationAllowed(session, newProjects); if (authorize)
{
checkProjectCreationAllowed(session, newProjects);
}
int index = 0; int index = 0;
for (NewProject newProject : newProjects) for (NewProject newProject : newProjects)
{ {
...@@ -1611,7 +1634,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements ...@@ -1611,7 +1634,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
return index; return index;
} }
protected void assertProjectCreationAllowed(Session session, List<NewProject> newProjects) protected void checkProjectCreationAllowed(Session session, List<NewProject> newProjects)
{ {
if (newProjects != null && newProjects.isEmpty() == false) if (newProjects != null && newProjects.isEmpty() == false)
{ {
...@@ -1637,7 +1660,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements ...@@ -1637,7 +1660,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
} }
private long createSamples(Session session, AtomicEntityOperationDetails operationDetails, private long createSamples(Session session, AtomicEntityOperationDetails operationDetails,
IServiceConversationProgressListener progress) IServiceConversationProgressListener progress, boolean authorize)
{ {
List<NewSample> newSamples = operationDetails.getSampleRegistrations(); List<NewSample> newSamples = operationDetails.getSampleRegistrations();
List<NewSample> containerSamples = new ArrayList<NewSample>(); List<NewSample> containerSamples = new ArrayList<NewSample>();
...@@ -1663,8 +1686,11 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements ...@@ -1663,8 +1686,11 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
} }
} }
assertInstanceSampleCreationAllowed(session, instanceSamples); if (authorize)
assertSpaceSampleCreationAllowed(session, spaceSamples); {
checkInstanceSampleCreationAllowed(session, instanceSamples);
checkSpaceSampleCreationAllowed(session, spaceSamples);
}
String userIdOrNull = operationDetails.tryUserIdOrNull(); String userIdOrNull = operationDetails.tryUserIdOrNull();
PersonPE registratorOrNull = tryFindPersonForUserIdOrEmail(userIdOrNull); PersonPE registratorOrNull = tryFindPersonForUserIdOrEmail(userIdOrNull);
...@@ -1685,7 +1711,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements ...@@ -1685,7 +1711,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
return newSamples.size(); return newSamples.size();
} }
private void assertInstanceSampleCreationAllowed(Session session, private void checkInstanceSampleCreationAllowed(Session session,
List<NewSample> instanceSamples) List<NewSample> instanceSamples)
{ {
if (instanceSamples.isEmpty() == false) if (instanceSamples.isEmpty() == false)
...@@ -1694,7 +1720,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements ...@@ -1694,7 +1720,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
} }
} }
private void assertSpaceSampleCreationAllowed(Session session, List<NewSample> spaceSamples) private void checkSpaceSampleCreationAllowed(Session session, List<NewSample> spaceSamples)
{ {
if (spaceSamples.isEmpty() == false) if (spaceSamples.isEmpty() == false)
{ {
...@@ -1704,7 +1730,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements ...@@ -1704,7 +1730,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
private long updateSamples(final Session session, private long updateSamples(final Session session,
AtomicEntityOperationDetails operationDetails, AtomicEntityOperationDetails operationDetails,
IServiceConversationProgressListener progress) IServiceConversationProgressListener progress, boolean authorize)
{ {
List<SampleUpdatesDTO> sampleUpdates = operationDetails.getSampleUpdates(); List<SampleUpdatesDTO> sampleUpdates = operationDetails.getSampleUpdates();
int sampleUpdateCount = sampleUpdates.size(); int sampleUpdateCount = sampleUpdates.size();
...@@ -1713,7 +1739,10 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements ...@@ -1713,7 +1739,10 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
return 0; return 0;
} }
progress.update("authorizingSampleUpdates", sampleUpdateCount, 0); progress.update("authorizingSampleUpdates", sampleUpdateCount, 0);
assertSampleUpdatesAllowed(session, sampleUpdates); if (authorize)
{
checkSampleUpdatesAllowed(session, sampleUpdates);
}
progress.update("authorizingSampleUpdates", sampleUpdateCount, sampleUpdateCount); progress.update("authorizingSampleUpdates", sampleUpdateCount, sampleUpdateCount);
final ISampleTable sampleTable = businessObjectFactory.createSampleTable(session); final ISampleTable sampleTable = businessObjectFactory.createSampleTable(session);
...@@ -1727,7 +1756,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements ...@@ -1727,7 +1756,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
return sampleUpdateCount; return sampleUpdateCount;
} }
private void assertSampleUpdatesAllowed(final Session session, private void checkSampleUpdatesAllowed(final Session session,
List<SampleUpdatesDTO> sampleUpdates) List<SampleUpdatesDTO> sampleUpdates)
{ {
List<SampleUpdatesDTO> instanceSamples = new ArrayList<SampleUpdatesDTO>(); List<SampleUpdatesDTO> instanceSamples = new ArrayList<SampleUpdatesDTO>();
...@@ -1743,11 +1772,11 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements ...@@ -1743,11 +1772,11 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
spaceSamples.add(sampleUpdate); spaceSamples.add(sampleUpdate);
} }
} }
assertInstanceSampleUpdateAllowed(session, instanceSamples); checkInstanceSampleUpdateAllowed(session, instanceSamples);
assertSpaceSampleUpdateAllowed(session, spaceSamples); checkSpaceSampleUpdateAllowed(session, spaceSamples);
} }
private void assertInstanceSampleUpdateAllowed(Session session, private void checkInstanceSampleUpdateAllowed(Session session,
List<SampleUpdatesDTO> instanceSamples) List<SampleUpdatesDTO> instanceSamples)
{ {
if (instanceSamples.isEmpty() == false) if (instanceSamples.isEmpty() == false)
...@@ -1756,7 +1785,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements ...@@ -1756,7 +1785,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
} }
} }
private void assertSpaceSampleUpdateAllowed(Session session, List<SampleUpdatesDTO> spaceSamples) private void checkSpaceSampleUpdateAllowed(Session session, List<SampleUpdatesDTO> spaceSamples)
{ {
if (spaceSamples.isEmpty() == false) if (spaceSamples.isEmpty() == false)
{ {
...@@ -1769,14 +1798,17 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements ...@@ -1769,14 +1798,17 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
* order * order
*/ */
private long createDataSets(Session session, AtomicEntityOperationDetails operationDetails, private long createDataSets(Session session, AtomicEntityOperationDetails operationDetails,
IServiceConversationProgressListener progress) IServiceConversationProgressListener progress, boolean authorize)
{ {
ArrayList<DataPE> dataSetsCreated = new ArrayList<DataPE>(); ArrayList<DataPE> dataSetsCreated = new ArrayList<DataPE>();
List<? extends NewExternalData> dataSetRegistrations = List<? extends NewExternalData> dataSetRegistrations =
operationDetails.getDataSetRegistrations(); operationDetails.getDataSetRegistrations();
assertDataSetCreationAllowed(session, dataSetRegistrations); if (authorize)
NewExternalDataDAG dag = new NewExternalDataDAG(dataSetRegistrations); {
List<? extends NewExternalData> orderedRegistrations = dag.getOrderedRegistrations(); checkDataSetCreationAllowed(session, dataSetRegistrations);
}
final NewExternalDataDAG dag = new NewExternalDataDAG(dataSetRegistrations);
final List<? extends NewExternalData> orderedRegistrations = dag.getOrderedRegistrations();
int index = 0; int index = 0;
for (NewExternalData dataSet : orderedRegistrations) for (NewExternalData dataSet : orderedRegistrations)
...@@ -1787,7 +1819,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements ...@@ -1787,7 +1819,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
return index; return index;
} }
private void assertDataSetCreationAllowed(Session session, private void checkDataSetCreationAllowed(Session session,
List<? extends NewExternalData> dataSets) List<? extends NewExternalData> dataSets)
{ {
if (dataSets != null && dataSets.isEmpty() == false) if (dataSets != null && dataSets.isEmpty() == false)
...@@ -1798,17 +1830,20 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements ...@@ -1798,17 +1830,20 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
private long updateDataSets(final Session session, private long updateDataSets(final Session session,
AtomicEntityOperationDetails operationDetails, AtomicEntityOperationDetails operationDetails,
IServiceConversationProgressListener progress) IServiceConversationProgressListener progress, boolean authorize)
{ {
List<DataSetBatchUpdatesDTO> dataSetUpdates = operationDetails.getDataSetUpdates(); final List<DataSetBatchUpdatesDTO> dataSetUpdates = operationDetails.getDataSetUpdates();
int dataSetUpdatesCount = dataSetUpdates.size(); final int dataSetUpdatesCount = dataSetUpdates.size();
if (dataSetUpdatesCount < 1) if (dataSetUpdatesCount < 1)
{ {
return 0; return 0;
} }
progress.update("authorizingDataSetUpdates", dataSetUpdatesCount, 0); progress.update("authorizingDataSetUpdates", dataSetUpdatesCount, 0);
assertDataSetUpdateAllowed(session, dataSetUpdates); if (authorize)
{
checkDataSetUpdateAllowed(session, dataSetUpdates);
}
progress.update("authorizingDataSetUpdates", dataSetUpdatesCount, dataSetUpdatesCount); progress.update("authorizingDataSetUpdates", dataSetUpdatesCount, dataSetUpdatesCount);
final IDataSetTable dataSetTable = businessObjectFactory.createDataSetTable(session); final IDataSetTable dataSetTable = businessObjectFactory.createDataSetTable(session);
...@@ -1823,7 +1858,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements ...@@ -1823,7 +1858,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
return dataSetUpdatesCount; return dataSetUpdatesCount;
} }
private void assertDataSetUpdateAllowed(Session session, List<DataSetBatchUpdatesDTO> dataSets) private void checkDataSetUpdateAllowed(Session session, List<DataSetBatchUpdatesDTO> dataSets)
{ {
if (dataSets != null && dataSets.isEmpty() == false) if (dataSets != null && dataSets.isEmpty() == false)
{ {
...@@ -1848,9 +1883,15 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements ...@@ -1848,9 +1883,15 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
} }
private long createExperiments(Session session, AtomicEntityOperationDetails operationDetails, private long createExperiments(Session session, AtomicEntityOperationDetails operationDetails,
IServiceConversationProgressListener progress) IServiceConversationProgressListener progress, boolean authorize)
{ {
List<NewExperiment> experimentRegistrations = operationDetails.getExperimentRegistrations(); final List<NewExperiment> experimentRegistrations =
operationDetails.getExperimentRegistrations();
if (authorize)
{
entityOperationChecker
.assertExperimentCreationAllowed(session, experimentRegistrations);
}
int index = 0; int index = 0;
for (NewExperiment experiment : experimentRegistrations) for (NewExperiment experiment : experimentRegistrations)
{ {
...@@ -1868,13 +1909,16 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements ...@@ -1868,13 +1909,16 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
} }
private long updateExperiments(Session session, AtomicEntityOperationDetails operationDetails, private long updateExperiments(Session session, AtomicEntityOperationDetails operationDetails,
IServiceConversationProgressListener progress) IServiceConversationProgressListener progress, boolean authorize)
{ {
List<ExperimentUpdatesDTO> updates = operationDetails.getExperimentUpdates(); List<ExperimentUpdatesDTO> updates = operationDetails.getExperimentUpdates();
for (ExperimentUpdatesDTO update : updates) for (ExperimentUpdatesDTO update : updates)
{ {
entityOperationChecker.assertExperimentUpdateAllowed(session, update); if (authorize)
{
entityOperationChecker.assertExperimentUpdateAllowed(session, update);
}
updateExperiment(session, update); updateExperiment(session, update);
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment