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 2017/05/10 10:15:31 UTC
svn commit: r1794702 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core:
MutableRoot.java SecureNodeBuilder.java
Author: angela
Date: Wed May 10 10:15:31 2017
New Revision: 1794702
URL: http://svn.apache.org/viewvc?rev=1794702&view=rev
Log:
OAK-6205 : SecureNodeBuild keeps unused Context field
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java?rev=1794702&r1=1794701&r2=1794702&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java Wed May 10 10:15:31 2017
@@ -56,7 +56,6 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.PostValidationHook;
import org.apache.jackrabbit.oak.spi.commit.ValidatorProvider;
import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;
-import org.apache.jackrabbit.oak.spi.security.Context;
import org.apache.jackrabbit.oak.spi.security.SecurityConfiguration;
import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
import org.apache.jackrabbit.oak.spi.security.authorization.AuthorizationConfiguration;
@@ -160,7 +159,7 @@ class MutableRoot implements Root {
this.session = checkNotNull(session);
builder = store.getRoot().builder();
- secureBuilder = new SecureNodeBuilder(builder, permissionProvider, getAcContext());
+ secureBuilder = new SecureNodeBuilder(builder, permissionProvider);
rootTree = new MutableTree(this, secureBuilder, lastMove);
}
@@ -358,11 +357,6 @@ class MutableRoot implements Root {
}
@Nonnull
- private Context getAcContext() {
- return getAcConfig().getContext();
- }
-
- @Nonnull
private AuthorizationConfiguration getAcConfig() {
return securityProvider.getConfiguration(AuthorizationConfiguration.class);
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java?rev=1794702&r1=1794701&r2=1794702&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java Wed May 10 10:15:31 2017
@@ -16,19 +16,8 @@
*/
package org.apache.jackrabbit.oak.core;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.Iterables.filter;
-import static com.google.common.collect.Iterables.size;
-import static java.util.Collections.emptyList;
-import static org.apache.jackrabbit.oak.api.Type.BOOLEAN;
-import static org.apache.jackrabbit.oak.api.Type.NAME;
-import static org.apache.jackrabbit.oak.api.Type.NAMES;
-import static org.apache.jackrabbit.oak.api.Type.STRING;
-
import java.io.IOException;
import java.io.InputStream;
-
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -39,13 +28,22 @@ import org.apache.jackrabbit.oak.api.Pro
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.plugins.tree.TreeFactory;
-import org.apache.jackrabbit.oak.spi.security.Context;
import org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionProvider;
import org.apache.jackrabbit.oak.spi.security.authorization.permission.TreePermission;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.Iterables.filter;
+import static com.google.common.collect.Iterables.size;
+import static java.util.Collections.emptyList;
+import static org.apache.jackrabbit.oak.api.Type.BOOLEAN;
+import static org.apache.jackrabbit.oak.api.Type.NAME;
+import static org.apache.jackrabbit.oak.api.Type.NAMES;
+import static org.apache.jackrabbit.oak.api.Type.STRING;
+
class SecureNodeBuilder implements NodeBuilder {
/**
@@ -70,11 +68,6 @@ class SecureNodeBuilder implements NodeB
private final LazyValue<PermissionProvider> permissionProvider;
/**
- * Access control context for evaluating access rights to the underlying raw builder
- */
- private final Context acContext;
-
- /**
* Underlying node builder.
*/
private final NodeBuilder builder;
@@ -95,15 +88,19 @@ class SecureNodeBuilder implements NodeB
*/
private TreePermission rootPermission = null; // initialized lazily
+ /**
+ * Create the {@code SecureNodeBuilder} for the root node.
+ *
+ * @param builder The {@code NodeBuilder} of the root node.
+ * @param permissionProvider The {@code PermissionProvider} used to evaluation read access.
+ */
SecureNodeBuilder(
@Nonnull NodeBuilder builder,
- @Nonnull LazyValue<PermissionProvider> permissionProvider,
- @Nonnull Context acContext) {
+ @Nonnull LazyValue<PermissionProvider> permissionProvider) {
this.rootBuilder = this;
this.parent = null;
this.name = null;
this.permissionProvider = checkNotNull(permissionProvider);
- this.acContext = checkNotNull(acContext);
this.builder = checkNotNull(builder);
}
@@ -112,7 +109,6 @@ class SecureNodeBuilder implements NodeB
this.parent = parent;
this.name = name;
this.permissionProvider = parent.permissionProvider;
- this.acContext = parent.acContext;
this.builder = parent.builder.getChildNode(name);
}