Changeset 5122

Timestamp:

05/02/14 13:00:44 (10 years ago)

Author:

olhsha@mpi.nl

Message:

fixing access bug (READ action was != "read" access)

Location:

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend

Files:

• nb-configuration.xml (added)
• src/main/java/eu/dasish/annotation/backend/dao/impl/DBDispatcherImlp.java (modified) (2 diffs)
• src/main/java/eu/dasish/annotation/backend/rest/RequestWrappers.java (modified) (1 diff)
• src/main/webapp/WEB-INF/web.xml (modified) (1 diff)

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBDispatcherImlp.java

@@ -387 +387 @@
         } else {
             if (publicAttribute.equals(Access.READ)) {
-                return (access.equals(Access.NONE) ? Access.READ : access);
+                if (access.equals(Access.NONE)) {
+                    return Access.READ;
+                } else {
+                   return access; 
+                }
             } else {
                 return Access.WRITE;
@@ -423 +427 @@
                     return true;
                 }
-                return this.getAccess(resourceID, principalID).value().equals(action.name());
+                String access = this.getAccess(resourceID, principalID).name();
+                String actionName = action.name();
+                return access.equals(actionName);
             }
             case CACHED_REPRESENTATION: {

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/RequestWrappers.java

@@ -89 +89 @@
             } else {
                 this.FORBIDDEN_RESOURCE_ACTION(externalId, resource.name(), action.name());
+                resourceResource.loggerServer.debug("Principal "+resourceResource.dbDispatcher.getResourceExternalIdentifier(principalID, Resource.PRINCIPAL)+" cannot "+action.name()+" "+resource.name()+" with the id "+externalId);
                 resourceResource.httpServletResponse.sendError(HttpServletResponse.SC_FORBIDDEN);
                 return null;

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web.xml

@@ -47 +47 @@
     <context-param>
         <param-name>eu.dasish.annotation.backend.logout</param-name>
-        <!-- <param-value>/ds/webannotator?shhaaDo=lO</param-value> -->
-        <!-- <param-value>/ds/webannotator/j_spring_security_logout</param-value> -->
-        <param-value>/annotator-backend/j_spring_security_logout</param-value>
+<!--        <param-value>/ds/webannotator?shhaaDo=lO</param-value>-->
+<!--       <param-value>/ds/webannotator/j_spring_security_logout</param-value>-->
+         <param-value>/annotator-backend/j_spring_security_logout</param-value>
     </context-param>