Changeset 5923 for ComponentRegistry

Timestamp:

01/16/15 10:54:43 (9 years ago)

Author:

Twan Goosen

Message:

When saving a group component as new in private space, check whether referenced components are accessible to the current user (not just if they are already in the private space)
Fixes #717

Location:

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry

Files:

• ComponentRegistry.java (modified) (1 diff)
• impl/database/ComponentRegistryDbImpl.java (modified) (1 diff)
• rest/MDValidator.java (modified) (7 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/ComponentRegistry.java

@@ -249 +249 @@
 
     Number makeGroupMember(String principalName, String groupName) throws UserUnauthorizedException, ItemNotFoundException;
+    
+    boolean canCurrentUserAccessDescription(String cmdId) throws ItemNotFoundException, AuthenticationRequiredException;
 
     //long removeGroupMember(String principalName, String groupName) throws  UserUnauthorizedException, ItemNotFoundException;

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java

@@ -800 +800 @@
     }
 
-    private boolean canCurrentUserAccessDescription(String cmdId) throws ItemNotFoundException, AuthenticationRequiredException {
+    @Override
+    public boolean canCurrentUserAccessDescription(String cmdId) throws ItemNotFoundException, AuthenticationRequiredException {
         if (cmdId == null) {
             throw new ItemNotFoundException("Item with the null cmdIdentifier.");

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/MDValidator.java

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.rest;
 
+import clarin.cmdi.componentregistry.AuthenticationRequiredException;
 import clarin.cmdi.componentregistry.ComponentRegistry;
 import clarin.cmdi.componentregistry.ComponentRegistryException;
@@ -12 +13 @@
 import clarin.cmdi.componentregistry.components.CMDComponentSpec;
 import clarin.cmdi.componentregistry.components.CMDComponentType;
+import clarin.cmdi.componentregistry.impl.database.GroupService;
 import clarin.cmdi.componentregistry.model.BaseDescription;
 import clarin.cmdi.schema.cmd.Validator.Message;
@@ -39 +41 @@
     static final String SCHEMA_ERROR = "Error in reading general component schema: ";
     static final String IO_ERROR = "Error while reading specification or general component schema: ";
+    static final String INTERNAL_ERROR = "Internal error: ";    
     static final String COMPONENT_NOT_REGISTERED_IN_APPROPRIATE_SPACE_ERROR = "referenced component cannot be found in the appropriate registry components: ";
     static final String COMPONENT_REGISTRY_EXCEPTION_ERROR = "An exception occurred while accessing the component registry: ";
@@ -119 +122 @@
             } catch (NullIdException e3) {
                 errorMessages.add(COMPONENT_NOT_REGISTERED_ERROR + e3);
+            } catch(AuthenticationRequiredException e) {
+                errorMessages.add(INTERNAL_ERROR + e);
             }
         }
@@ -136 +141 @@
     }
 
-    private void validateComponents(CMDComponentSpec componentSpec) throws ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException, NullIdException {
+    private void validateComponents(CMDComponentSpec componentSpec) throws ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException, NullIdException, AuthenticationRequiredException {
         validateComponents(Collections.singletonList(componentSpec.getCMDComponent()));
     }
 
-    private void validateComponents(List<CMDComponentType> cmdComponents) throws ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException, NullIdException {
+    private void validateComponents(List<CMDComponentType> cmdComponents) throws ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException, NullIdException, AuthenticationRequiredException {
         for (CMDComponentType cmdComponentType : cmdComponents) {
             this.validateDescribedComponents(cmdComponentType);
@@ -147 +152 @@
     }
 
-    private void validateDescribedComponents(CMDComponentType cmdComponentType) throws ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException, NullIdException {
+    private void validateDescribedComponents(CMDComponentType cmdComponentType) throws ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException, NullIdException, AuthenticationRequiredException {
         this.checkComponentInSpace(cmdComponentType);
     }
 
-    private void checkComponentInSpace(CMDComponentType cmdComponentType) throws ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException, NullIdException {
+    private void checkComponentInSpace(CMDComponentType cmdComponentType) throws ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException, NullIdException, AuthenticationRequiredException {
         if (isDefinedInSeparateFile(cmdComponentType)) {
             String id = cmdComponentType.getComponentId();
@@ -160 +165 @@
             CMDComponentSpec registeredComponent = registry.getMDComponent(id);
             if (registeredComponent != null) {
-                String componentId = cmdComponentType.getComponentId();
-                Boolean isPublicB = registry.isItemPublic(id);// throws ItemNotFoundException
-                boolean isPublic = isPublicB.booleanValue();
-                if (isPublic) {  // if  a component is public, it is available for any registry
+                final String componentId = cmdComponentType.getComponentId();
+                if (registry.isItemPublic(id)) {  // if  a component is public, it is available for any registry
                     return;
                 };
                 // a private component for a private registry is available only if its owner is the owner of the resgitry
                 if (registry.getRegistrySpace().equals(RegistrySpace.PRIVATE)) {
-                    Number registryOwnerId = registry.getRegistryOwner().getId();
-                    Number componentOwnerId = registry.getBaseDescriptionOwnerId(cmdComponentType.getComponentId());
-                    if (registryOwnerId.equals(componentOwnerId)) {
+                    if(registry.canCurrentUserAccessDescription(componentId)) {
                         return;
-                    };
+                    }
                     errorMessages.add(COMPONENT_NOT_REGISTERED_IN_APPROPRIATE_SPACE_ERROR + componentId + " (private registry)");
                     return;