You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2013/09/25 15:41:48 UTC
svn commit: r1526174 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak:
security/authorization/permission/PermissionProviderImpl.java
util/TreeLocation.java
Author: angela
Date: Wed Sep 25 13:41:47 2013
New Revision: 1526174
URL: http://svn.apache.org/r1526174
Log:
OAK-444 : Authorization for the jcr version store
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/TreeLocation.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java?rev=1526174&r1=1526173&r2=1526174&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java Wed Sep 25 13:41:47 2013
@@ -29,6 +29,7 @@ import org.apache.jackrabbit.oak.api.Roo
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.apache.jackrabbit.oak.core.IdentifierManager;
import org.apache.jackrabbit.oak.core.ImmutableRoot;
import org.apache.jackrabbit.oak.core.ImmutableTree;
import org.apache.jackrabbit.oak.core.TreeTypeProvider;
@@ -55,14 +56,17 @@ import static com.google.common.base.Pre
/**
* PermissionProviderImpl... TODO
* <p/>
- * FIXME: define read/write access patterns on version-store content
- * FIXME: proper access permissions on activity-store and configuration-store
* FIXME: decide on where to filter out hidden items (OAK-753)
*/
public class PermissionProviderImpl implements PermissionProvider, AccessControlConstants, PermissionConstants {
private static final Logger log = LoggerFactory.getLogger(PermissionProviderImpl.class);
+ private static final Set<String> V_ROOT_NAMES = ImmutableSet.of(
+ JcrConstants.JCR_VERSIONSTORAGE,
+ VersionConstants.JCR_CONFIGURATIONS,
+ VersionConstants.JCR_ACTIVITIES);
+
private final Root root;
private final String workspaceName;
@@ -145,15 +149,17 @@ public class PermissionProviderImpl impl
// TODO: OAK-753 decide on where to filter out hidden items.
return true;
case TreeTypeProvider.TYPE_VERSION:
- TreeLocation location = getVersionableLocation(tree, property);
+ TreeLocation location = getLocation(tree, property);
if (location == null) {
- // TODO: review permission evaluation on hierarchy nodes within the different version stores.
- return compiledPermissions.isGranted(tree, property, permissions);
+ // unable to determine the location of the versionable item -> deny access.
+ return false;
}
Tree versionableTree = (property == null) ? location.getTree() : location.getParent().getTree();
if (versionableTree != null) {
return compiledPermissions.isGranted(versionableTree, property, permissions);
} else {
+ // versionable node does not exist (anymore) in this workspace;
+ // use best effort calculation based on the item path.
return compiledPermissions.isGranted(location.getPath(), permissions);
}
default:
@@ -168,15 +174,12 @@ public class PermissionProviderImpl impl
long permissions = Permissions.getPermissions(jcrActions, location, isAcContent);
boolean isGranted = false;
- if (!location.exists()) {
- // TODO: deal with version content
+ PropertyState property = location.getProperty();
+ Tree tree = (property == null) ? location.getTree() : location.getParent().getTree();
+ if (tree != null) {
+ isGranted = isGranted(tree, property, permissions);
+ } else if (!isVersionStorePath(oakPath)) {
isGranted = compiledPermissions.isGranted(oakPath, permissions);
- } else {
- PropertyState property = location.getProperty();
- Tree tree = (property == null) ? location.getTree() : location.getParent().getTree();
- if (tree != null) {
- isGranted = isGranted(tree, property, permissions);
- }
}
return isGranted;
}
@@ -222,53 +225,82 @@ public class PermissionProviderImpl impl
}
private ReadStatus getVersionContentReadStatus(@Nonnull Tree versionStoreTree, @Nullable PropertyState property) {
- TreeLocation location = getVersionableLocation(versionStoreTree, property);
- ReadStatus status;
+ TreeLocation location = getLocation(versionStoreTree, property);
+ ReadStatus status = ReadStatus.DENY_THIS;
if (location != null) {
Tree tree = (property == null) ? location.getTree() : location.getParent().getTree();
- if (tree == null) {
+ if (tree != null) {
+ status = compiledPermissions.getReadStatus(tree, property);
+ } else {
+ // versionable node does not exist (anymore) in this workspace;
+ // use best effort calculation based on the item path.
long permission = (property == null) ? Permissions.READ_NODE : Permissions.READ_PROPERTY;
if (compiledPermissions.isGranted(location.getPath(), permission)) {
status = ReadStatus.ALLOW_THIS;
- } else {
- status = ReadStatus.DENY_THIS;
}
- } else {
- status = compiledPermissions.getReadStatus(tree, property);
}
- } else {
- // TODO: review access on hierarchy nodes within the different version stores.
- status = compiledPermissions.getReadStatus(versionStoreTree, property);
}
return status;
}
@CheckForNull
- private TreeLocation getVersionableLocation(@Nonnull Tree versionStoreTree, @Nullable PropertyState property) {
+ private TreeLocation getLocation(@Nonnull Tree versionStoreTree, @Nullable PropertyState property) {
String relPath = "";
String propName = (property == null) ? "" : property.getName();
String versionablePath = null;
Tree t = versionStoreTree;
- while (t.exists() && !t.isRoot() && !JcrConstants.JCR_VERSIONSTORAGE.equals(t.getName())) {
- String name = t.getName();
+ while (t.exists() && !t.isRoot() && !V_ROOT_NAMES.contains(t.getName())) {
String ntName = checkNotNull(TreeUtil.getPrimaryTypeName(t));
- if (VersionConstants.JCR_FROZENNODE.equals(name) && t != versionStoreTree) {
+ if (VersionConstants.JCR_FROZENNODE.equals(t.getName()) && t != versionStoreTree) {
relPath = PathUtils.relativize(t.getPath(), versionStoreTree.getPath());
} else if (JcrConstants.NT_VERSIONHISTORY.equals(ntName)) {
PropertyState prop = t.getProperty(workspaceName);
if (prop != null) {
versionablePath = PathUtils.concat(prop.getValue(Type.PATH), relPath, propName);
}
- break;
+ return createLocation(versionablePath);
+ } else if (VersionConstants.NT_CONFIGURATION.equals(ntName)) {
+ String rootId = TreeUtil.getString(t, VersionConstants.JCR_ROOT);
+ versionablePath = new IdentifierManager(root).getPath(rootId);
+ return createLocation(versionablePath);
+ } else if (VersionConstants.NT_ACTIVITY.equals(ntName)) {
+ return createLocation(versionStoreTree, property);
}
t = t.getParent();
}
- if (versionablePath == null || versionablePath.length() == 0) {
- log.debug("Unable to determine versionable path of the version store node.");
+ // intermediate node in the version, configuration or activity store that
+ // matches none of the special conditions checked above -> regular permission eval.
+ return createLocation(versionStoreTree, property);
+ }
+
+ private static boolean isVersionStorePath(@Nonnull String oakPath) {
+ if (oakPath.indexOf(JcrConstants.JCR_SYSTEM) == 1) {
+ for (String p : VersionConstants.SYSTEM_PATHS) {
+ if (oakPath.startsWith(p)) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ @CheckForNull
+ private TreeLocation createLocation(@Nullable String oakPath) {
+ if (oakPath != null && PathUtils.isAbsolute(oakPath)) {
+ return TreeLocation.create(immutableRoot, oakPath);
+ } else {
+ log.debug("Unable to create location for path " + oakPath);
return null;
+ }
+ }
+
+ @Nonnull
+ private static TreeLocation createLocation(@Nonnull Tree tree, @Nullable PropertyState property) {
+ if (property == null) {
+ return TreeLocation.create(tree);
} else {
- return TreeLocation.create(immutableRoot, versionablePath);
+ return TreeLocation.create(tree, property);
}
}
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/TreeLocation.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/TreeLocation.java?rev=1526174&r1=1526173&r2=1526174&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/TreeLocation.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/TreeLocation.java Wed Sep 25 13:41:47 2013
@@ -18,11 +18,6 @@
*/
package org.apache.jackrabbit.oak.util;
-import static com.google.common.base.Objects.toStringHelper;
-import static com.google.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.oak.commons.PathUtils.elements;
-import static org.apache.jackrabbit.oak.commons.PathUtils.isAbsolute;
-
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
@@ -31,6 +26,11 @@ import org.apache.jackrabbit.oak.api.Roo
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.commons.PathUtils;
+import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.Preconditions.checkArgument;
+import static org.apache.jackrabbit.oak.commons.PathUtils.elements;
+import static org.apache.jackrabbit.oak.commons.PathUtils.isAbsolute;
+
/**
* A {@code TreeLocation} denotes a location inside a tree.
* <p>
@@ -47,11 +47,19 @@ public abstract class TreeLocation {
/**
* Create a new {@code TreeLocation} instance for a {@code tree}
*/
- public static TreeLocation create(Tree tree) {
+ public static TreeLocation create(@Nonnull Tree tree) {
return new NodeLocation(tree);
}
/**
+ * Create a new {@code TreeLocation} instance for the specified {@code tree}
+ * and {@code property}.
+ */
+ public static TreeLocation create(@Nonnull Tree tree, @Nonnull PropertyState property) {
+ return new PropertyLocation(tree, property.getName());
+ }
+
+ /**
* Create a new {@code TreeLocation} instance for the item
* at the given {@code path} in {@code root}.
*/