fixed SecurityContext

fcrepo4 · Sep 4, 2015 · bb95cfe · bb95cfe
1 parent ac1bc9c
commit bb95cfe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/main/java/org/fcrepo/auth/webac/FedoraWebACUserSecurityContext.java b/src/main/java/org/fcrepo/auth/webac/FedoraWebACUserSecurityContext.java
@@ -57,9 +57,8 @@ protected FedoraWebACUserSecurityContext(final Principal userPrincipal,
      * @see org.modeshape.jcr.security.SecurityContext#hasRole(String)
      */
     @Override
-    public final boolean hasRole(final String roleName) {
+    public boolean hasRole(final String roleName) {
         LOGGER.debug("Checking hasRole({})", roleName);
-
         if (WEBAC_MODE_READ_VALUE.equals(roleName)) {
             return true;
         } else if (WEBAC_MODE_WRITE_VALUE.equals(roleName)) {
@@ -69,7 +68,7 @@ public final boolean hasRole(final String roleName) {
         } else if (WEBAC_MODE_CONTROL_VALUE.equals(roleName)) {
             return true;
         }
-        return false;
+        return super.hasRole(roleName);
     }
 
 }
diff --git a/src/main/java/org/fcrepo/auth/webac/WebACAuthorizationDelegate.java b/src/main/java/org/fcrepo/auth/webac/WebACAuthorizationDelegate.java
@@ -22,7 +22,7 @@
 
 import javax.jcr.Session;
 
-//import org.fcrepo.auth.common.FedoraUserSecurityContext;
+import org.fcrepo.auth.common.FedoraUserSecurityContext;
 import org.fcrepo.auth.roles.common.AbstractRolesAuthorizationDelegate;
 
 import org.slf4j.Logger;
@@ -78,9 +78,9 @@ public Principal getEveryonePrincipal() {
         return EVERYONE;
     }
 
-    //@Override
-    //public FedoraUserSecurityContext getFedoraUserSecurityContext(final Principal userPrincipal) {
-        //return new FedoraWebACUserSecurityContext(userPrincipal, this);
-    //}
+    @Override
+    public FedoraUserSecurityContext getFedoraUserSecurityContext(final Principal userPrincipal) {
+        return new FedoraWebACUserSecurityContext(userPrincipal, this);
+    }
 
 }