inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert RM-2123 Update Java API to filter with current user's clearance.

Browse Source 
The circular dependency causes a problem when loading the Spring context.
Reverting to rethink the approach.

+review RM-47



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103856 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tom Page
2015-05-08 09:26:27 +00:00
parent 5927722e4d
commit 1c62f51937
2 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationServiceImpl.java
View File

@@ -61,7 +61,6 @@ public class ClassificationServiceImpl extends ServiceBaseImpl
private AttributeService attributeService; // TODO What about other code (e.g. REST API) accessing the AttrService?
private NodeService nodeService;
private SecurityClearanceService securityClearanceService;
private ClassificationServiceDAO classificationServiceDao;
/** The classification levels currently configured in this server. */
@@ -71,7 +70,6 @@ public class ClassificationServiceImpl extends ServiceBaseImpl
public void setAttributeService(AttributeService service) { this.attributeService = service; }
public void setNodeService(NodeService service) { this.nodeService = service; }
public void setSecurityClearanceService(SecurityClearanceService service) { this.securityClearanceService = service; }
/** Set the object from which configuration options will be read. */
public void setClassificationServiceDAO(ClassificationServiceDAO classificationServiceDao) { this.classificationServiceDao = classificationServiceDao; }
@@ -209,7 +207,8 @@ public class ClassificationServiceImpl extends ServiceBaseImpl
{
return Collections.emptyList();
}
ClassificationLevel usersLevel = securityClearanceService.getUserSecurityClearance().getClearanceLevel();
// FIXME Currently assume user has highest security clearance, this should be fixed as part of RM-2112.
ClassificationLevel usersLevel = levelManager.getMostSecureLevel();
return restrictList(levelManager.getClassificationLevels(), usersLevel);
}

31
rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationServiceImplUnitTest.java
View File

@@ -37,8 +37,6 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Stream;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Sets;
import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationServiceException.InvalidNode;
import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationServiceException.LevelIdNotFound;
@@ -52,7 +50,6 @@ import org.alfresco.service.cmr.attributes.AttributeService;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.PersonService.PersonInfo;
import org.alfresco.service.namespace.QName;
import org.apache.log4j.Appender;
import org.apache.log4j.Level;
@@ -65,6 +62,8 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import com.google.common.collect.Sets;
/**
* Unit tests for {@link ClassificationServiceImpl}.
*
@@ -73,7 +72,7 @@ import org.mockito.MockitoAnnotations;
*/
public class ClassificationServiceImplUnitTest
{
private static final ImmutableList<ClassificationLevel> DEFAULT_CLASSIFICATION_LEVELS = asLevelList("Top Secret", "rm.classification.topSecret",
private static final List<ClassificationLevel> DEFAULT_CLASSIFICATION_LEVELS = asLevelList("Top Secret", "rm.classification.topSecret",
"Secret", "rm.classification.secret",
"Confidential", "rm.classification.confidential",
"No Clearance", "rm.classification.noClearance");
@@ -92,7 +91,7 @@ public class ClassificationServiceImplUnitTest
* @param idsAndLabels A varargs/array of Strings like so: [ id0, label0, id1, label1... ]
* @throws IllegalArgumentException if {@code idsAndLabels} has a non-even length.
*/
public static ImmutableList<ClassificationLevel> asLevelList(String ... idsAndLabels)
public static List<ClassificationLevel> asLevelList(String ... idsAndLabels)
{
if (idsAndLabels.length % 2 != 0)
{
@@ -107,7 +106,7 @@ public class ClassificationServiceImplUnitTest
levels.add(new ClassificationLevel(idsAndLabels[i], idsAndLabels[i+1]));
}
return ImmutableList.copyOf(levels);
return levels;
}
@InjectMocks private ClassificationServiceImpl classificationServiceImpl;
@@ -117,7 +116,6 @@ public class ClassificationServiceImplUnitTest
@Mock private ClassificationServiceDAO mockClassificationServiceDAO;
@Mock private NodeService mockNodeService;
@Mock private DictionaryService mockDictionaryService;
@Mock private SecurityClearanceService mockSecurityClearanceService;
/** Using a mock appender in the class logger so that we can verify some of the logging requirements. */
@Mock private Appender mockAppender;
@Mock private ClassificationLevelManager mockLevelManager;
@@ -267,25 +265,6 @@ public class ClassificationServiceImplUnitTest
assertEquals("Expected an empty list when the target level is not found.", 0, actual.size());
}
/**
* Check that a user with security clearance of "Secret" (index 1 in the default list) can use the
* {@link getClassificationLevels} method to find the three classification levels up to their own.
*/
@Test public void getClassificationLevels()
{
PersonInfo personInfo = new PersonInfo(null, "userName", "firstName", "lastName");
ClassificationLevel clearanceLevel = DEFAULT_CLASSIFICATION_LEVELS.get(1);
SecurityClearance securityClearance = new SecurityClearance(personInfo , clearanceLevel);
when(mockSecurityClearanceService.getUserSecurityClearance()).thenReturn(securityClearance);
when(mockLevelManager.getClassificationLevels()).thenReturn(DEFAULT_CLASSIFICATION_LEVELS);
// Call the method under test.
List<ClassificationLevel> classificationLevels = classificationServiceImpl.getClassificationLevels();
List<ClassificationLevel> expectedLevels = DEFAULT_CLASSIFICATION_LEVELS.subList(1, 4);
assertEquals(expectedLevels , classificationLevels);
}
/** Classify a piece of content with a couple of reasons and check the NodeService is called correctly. */
@Test public void classifyContent_success()
{