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/12/10 11:27:56 UTC
svn commit: r1549803 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak:
osgi/ security/authorization/accesscontrol/ spi/security/
spi/security/authentication/token/ spi/security/authorization/
spi/security/authorization/access...
Author: angela
Date: Tue Dec 10 10:27:55 2013
New Revision: 1549803
URL: http://svn.apache.org/r1549803
Log:
OAK-1268 work in progress
Added:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/CompositeAuthorizationConfiguration.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManager.java (contents, props changed)
- copied, changed from r1547471, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/OsgiSecurityProvider.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenConfiguration.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfiguration.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/OsgiSecurityProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/OsgiSecurityProvider.java?rev=1549803&r1=1549802&r2=1549803&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/OsgiSecurityProvider.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/OsgiSecurityProvider.java Tue Dec 10 10:27:55 2013
@@ -53,8 +53,8 @@ public class OsgiSecurityProvider extend
@Reference(bind = "bindUserConfiguration")
private UserConfiguration userConfiguration;
- private CompositePrincipalConfiguration principalConfiguration = new CompositePrincipalConfiguration();
- private CompositeTokenConfiguration tokenConfiguration = new CompositeTokenConfiguration();
+ private CompositePrincipalConfiguration principalConfiguration = new CompositePrincipalConfiguration(this);
+ private CompositeTokenConfiguration tokenConfiguration = new CompositeTokenConfiguration(this);
private ConfigurationParameters config;
@@ -117,9 +117,9 @@ public class OsgiSecurityProvider extend
public Object addingService(ServiceReference reference) {
Object service = super.addingService(reference);
if (service instanceof TokenConfiguration) {
- tokenConfiguration.addConfiguration((TokenConfiguration) service, this);
+ tokenConfiguration.addConfiguration((TokenConfiguration) service);
} else if (service instanceof PrincipalConfiguration) {
- principalConfiguration.addConfiguration((PrincipalConfiguration) service, this);
+ principalConfiguration.addConfiguration((PrincipalConfiguration) service);
}
return service;
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java?rev=1549803&r1=1549802&r2=1549803&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java Tue Dec 10 10:27:55 2013
@@ -30,7 +30,6 @@ import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.jcr.AccessDeniedException;
-import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
import javax.jcr.UnsupportedRepositoryOperationException;
import javax.jcr.Value;
@@ -46,9 +45,7 @@ import com.google.common.base.Objects;
import com.google.common.collect.Lists;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlList;
-import org.apache.jackrabbit.api.security.JackrabbitAccessControlManager;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlPolicy;
-import org.apache.jackrabbit.api.security.authorization.PrivilegeManager;
import org.apache.jackrabbit.api.security.principal.ItemBasedPrincipal;
import org.apache.jackrabbit.api.security.principal.PrincipalManager;
import org.apache.jackrabbit.commons.iterator.AccessControlPolicyIteratorAdapter;
@@ -66,12 +63,11 @@ import org.apache.jackrabbit.oak.namepat
import org.apache.jackrabbit.oak.plugins.nodetype.ReadOnlyNodeTypeManager;
import org.apache.jackrabbit.oak.security.authorization.restriction.PrincipalRestrictionProvider;
import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
-import org.apache.jackrabbit.oak.spi.security.authorization.AuthorizationConfiguration;
import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.ACE;
+import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AbstractAccessControlManager;
import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AccessControlConstants;
import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.ImmutableACL;
import org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionConstants;
-import org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionProvider;
import org.apache.jackrabbit.oak.spi.security.authorization.permission.Permissions;
import org.apache.jackrabbit.oak.spi.security.authorization.restriction.Restriction;
import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionProvider;
@@ -79,7 +75,6 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBits;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBitsProvider;
-import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConfiguration;
import org.apache.jackrabbit.oak.util.NodeUtil;
import org.apache.jackrabbit.oak.util.PropertyBuilder;
import org.apache.jackrabbit.oak.util.TreeUtil;
@@ -95,71 +90,34 @@ import static com.google.common.base.Pre
* This implementation covers both editing access control content by path and
* by {@code Principal} resulting both in the same content structure.
*/
-public class AccessControlManagerImpl implements JackrabbitAccessControlManager, AccessControlConstants {
+public class AccessControlManagerImpl extends AbstractAccessControlManager implements AccessControlConstants {
private static final Logger log = LoggerFactory.getLogger(AccessControlManagerImpl.class);
- private final Root root;
- private final NamePathMapper namePathMapper;
- private final AuthorizationConfiguration acConfig;
-
- private final PrivilegeManager privilegeManager;
private final PrivilegeBitsProvider bitsProvider;
+ private final ReadOnlyNodeTypeManager ntMgr;
+
private final PrincipalManager principalManager;
private final RestrictionProvider restrictionProvider;
- private final ReadOnlyNodeTypeManager ntMgr;
private final Set<String> readPaths;
- private PermissionProvider permissionProvider;
-
public AccessControlManagerImpl(@Nonnull Root root, @Nonnull NamePathMapper namePathMapper,
- @Nonnull SecurityProvider securityProvider) {
- this.root = root;
- this.namePathMapper = namePathMapper;
+ @Nonnull SecurityProvider securityProvider) {
+ super(root, namePathMapper, securityProvider);
- privilegeManager = getConfig(securityProvider, PrivilegeConfiguration.class).getPrivilegeManager(root, namePathMapper);
bitsProvider = new PrivilegeBitsProvider(root);
- principalManager = getConfig(securityProvider, PrincipalConfiguration.class).getPrincipalManager(root, namePathMapper);
-
- acConfig = getConfig(securityProvider, AuthorizationConfiguration.class);
- restrictionProvider = acConfig.getRestrictionProvider();
ntMgr = ReadOnlyNodeTypeManager.getInstance(root, namePathMapper);
- readPaths = acConfig.getParameters().getConfigValue(PermissionConstants.PARAM_READ_PATHS, PermissionConstants.DEFAULT_READ_PATHS);
- }
+ principalManager = securityProvider.getConfiguration(PrincipalConfiguration.class).getPrincipalManager(root, namePathMapper);
+ restrictionProvider = getConfig().getRestrictionProvider();
- private static <T> T getConfig(SecurityProvider sp, Class<T> clss) {
- return sp.getConfiguration(clss);
+ readPaths = getConfig().getParameters().getConfigValue(PermissionConstants.PARAM_READ_PATHS, PermissionConstants.DEFAULT_READ_PATHS);
}
//-----------------------------------------------< AccessControlManager >---
@Nonnull
@Override
- public Privilege[] getSupportedPrivileges(@Nullable String absPath) throws RepositoryException {
- getTree(getOakPath(absPath), Permissions.NO_PERMISSION, false);
- return privilegeManager.getRegisteredPrivileges();
- }
-
- @Nonnull
- @Override
- public Privilege privilegeFromName(@Nonnull String privilegeName) throws RepositoryException {
- return privilegeManager.getPrivilege(privilegeName);
- }
-
- @Override
- public boolean hasPrivileges(@Nullable String absPath, @Nullable Privilege[] privileges) throws RepositoryException {
- return hasPrivileges(absPath, privileges, getPermissionProvider(), Permissions.NO_PERMISSION, false);
- }
-
- @Nonnull
- @Override
- public Privilege[] getPrivileges(@Nullable String absPath) throws RepositoryException {
- return getPrivileges(absPath, getPermissionProvider(), Permissions.NO_PERMISSION);
- }
-
- @Nonnull
- @Override
public AccessControlPolicy[] getPolicies(@Nullable String absPath) throws RepositoryException {
String oakPath = getOakPath(absPath);
Tree tree = getTree(oakPath, Permissions.READ_ACCESS_CONTROL, true);
@@ -181,7 +139,7 @@ public class AccessControlManagerImpl im
String oakPath = getOakPath(absPath);
Tree tree = getTree(oakPath, Permissions.READ_ACCESS_CONTROL, true);
- Root r = root.getContentSession().getLatestRoot();
+ Root r = getRoot().getContentSession().getLatestRoot();
tree = r.getTree(tree.getPath());
List<AccessControlPolicy> effective = new ArrayList<AccessControlPolicy>();
@@ -393,7 +351,7 @@ public class AccessControlManagerImpl im
@Override
public AccessControlPolicy[] getEffectivePolicies(@Nonnull Set<Principal> principals) throws RepositoryException {
Util.checkValidPrincipals(principals, principalManager);
- Root r = root.getContentSession().getLatestRoot();
+ Root r = getLatestRoot();
Result aceResult = searchAces(principals, r);
List<AccessControlPolicy> effective = new ArrayList<AccessControlPolicy>();
@@ -416,70 +374,8 @@ public class AccessControlManagerImpl im
return effective.toArray(new AccessControlPolicy[effective.size()]);
}
- @Override
- public boolean hasPrivileges(@Nullable String absPath, @Nonnull Set<Principal> principals, @Nullable Privilege[] privileges) throws RepositoryException {
- if (getPrincipals().equals(principals)) {
- return hasPrivileges(absPath, privileges);
- } else {
- PermissionProvider provider = acConfig.getPermissionProvider(root, principals);
- return hasPrivileges(absPath, privileges, provider, Permissions.READ_ACCESS_CONTROL, false);
- }
- }
-
- @Override
- public Privilege[] getPrivileges(@Nullable String absPath, @Nonnull Set<Principal> principals) throws RepositoryException {
- if (getPrincipals().equals(principals)) {
- return getPrivileges(absPath);
- } else {
- PermissionProvider provider = acConfig.getPermissionProvider(root, principals);
- return getPrivileges(absPath, provider, Permissions.READ_ACCESS_CONTROL);
- }
- }
-
//------------------------------------------------------------< private >---
@CheckForNull
- private String getOakPath(@Nullable String jcrPath) throws RepositoryException {
- if (jcrPath == null) {
- return null;
- } else {
- String oakPath = namePathMapper.getOakPathKeepIndex(jcrPath);
- if (oakPath == null || !PathUtils.isAbsolute(oakPath)) {
- throw new RepositoryException("Failed to resolve JCR path " + jcrPath);
- }
- return oakPath;
- }
- }
-
- @Nonnull
- private Tree getTree(@Nullable String oakPath, long permissions, boolean checkAcContent) throws RepositoryException {
- Tree tree = (oakPath == null) ? root.getTree("/") : root.getTree(oakPath);
- if (!tree.exists()) {
- throw new PathNotFoundException("No tree at " + oakPath);
- }
- if (permissions != Permissions.NO_PERMISSION) {
- // check permissions
- checkPermissions((oakPath == null) ? null : tree, permissions);
- }
- // check if the tree defines access controlled content
- if (checkAcContent && acConfig.getContext().definesTree(tree)) {
- throw new AccessControlException("Tree " + tree.getPath() + " defines access control content.");
- }
- return tree;
- }
-
- private void checkPermissions(@Nullable Tree tree, long permissions) throws AccessDeniedException {
- boolean isGranted;
- if (tree == null) {
- isGranted = getPermissionProvider().getRepositoryPermission().isGranted(permissions);
- } else {
- isGranted = getPermissionProvider().isGranted(tree, null, permissions);
- }
- if (!isGranted) {
- throw new AccessDeniedException("Access denied.");
- }
- }
-
- @CheckForNull
private Tree getAclTree(@Nullable String oakPath, @Nonnull Tree accessControlledTree) {
if (Util.isAccessControlled(oakPath, accessControlledTree, ntMgr)) {
String aclName = Util.getAclName(oakPath);
@@ -530,7 +426,7 @@ public class AccessControlManagerImpl im
}
}
if (isEffectivePolicy) {
- acl = new ImmutableACL(oakPath, entries, restrictionProvider, namePathMapper);
+ acl = new ImmutableACL(oakPath, entries, restrictionProvider, getNamePathMapper());
} else {
acl = new NodeACL(oakPath, entries);
}
@@ -542,6 +438,7 @@ public class AccessControlManagerImpl im
@Nullable
private JackrabbitAccessControlList createPrincipalACL(@Nullable String oakPath,
@Nonnull Principal principal) throws RepositoryException {
+ Root root = getRoot();
Result aceResult = searchAces(Collections.<Principal>singleton(principal), root);
RestrictionProvider restrProvider = new PrincipalRestrictionProvider(restrictionProvider);
List<ACE> entries = new ArrayList<ACE>();
@@ -573,7 +470,7 @@ public class AccessControlManagerImpl im
boolean isAllow = NT_REP_GRANT_ACE.equals(TreeUtil.getPrimaryTypeName(aceTree));
Set<Restriction> restrictions = restrictionProvider.readRestrictions(oakPath, aceTree);
Iterable<String> privNames = checkNotNull(TreeUtil.getStrings(aceTree, REP_PRIVILEGES));
- return new Entry(getPrincipal(aceTree), bitsProvider.getBits(privNames), isAllow, restrictions, namePathMapper);
+ return new Entry(getPrincipal(aceTree), bitsProvider.getBits(privNames), isAllow, restrictions, getNamePathMapper());
}
@Nonnull
@@ -618,70 +515,6 @@ public class AccessControlManagerImpl im
return principal;
}
- @Nonnull
- private Set<Principal> getPrincipals() {
- return root.getContentSession().getAuthInfo().getPrincipals();
- }
-
- @Nonnull
- private PermissionProvider getPermissionProvider() {
- if (permissionProvider == null) {
- permissionProvider = acConfig.getPermissionProvider(root, getPrincipals());
- } else {
- permissionProvider.refresh();
- }
- return permissionProvider;
- }
-
- @Nonnull
- private Privilege[] getPrivileges(@Nullable String absPath, @Nonnull PermissionProvider provider,
- long permissions) throws RepositoryException {
- Tree tree;
- if (absPath == null) {
- tree = null;
- if (permissions != Permissions.NO_PERMISSION) {
- checkPermissions(null, permissions);
- }
- } else {
- tree = getTree(getOakPath(absPath), permissions, false);
- }
- Set<String> pNames = provider.getPrivileges(tree);
- if (pNames.isEmpty()) {
- return new Privilege[0];
- } else {
- Set<Privilege> privileges = new HashSet<Privilege>(pNames.size());
- for (String name : pNames) {
- privileges.add(privilegeManager.getPrivilege(namePathMapper.getJcrName(name)));
- }
- return privileges.toArray(new Privilege[privileges.size()]);
- }
- }
-
- private boolean hasPrivileges(@Nullable String absPath, @Nullable Privilege[] privileges,
- @Nonnull PermissionProvider provider, long permissions,
- boolean checkAcContent) throws RepositoryException {
- Tree tree;
- if (absPath == null) {
- tree = null;
- if (permissions != Permissions.NO_PERMISSION) {
- checkPermissions(null, permissions);
- }
- } else {
- tree = getTree(getOakPath(absPath), permissions, checkAcContent);
- }
- if (privileges == null || privileges.length == 0) {
- // null or empty privilege array -> return true
- log.debug("No privileges passed -> allowed.");
- return true;
- } else {
- Set<String> privilegeNames = new HashSet<String>(privileges.length);
- for (Privilege privilege : privileges) {
- privilegeNames.add(namePathMapper.getOakName(privilege.getName()));
- }
- return provider.hasPrivileges(tree, privilegeNames.toArray(new String[privilegeNames.size()]));
- }
- }
-
private String getNodePath(ACE principalBasedAce) throws RepositoryException {
Value v = principalBasedAce.getRestriction(REP_NODE_PATH);
if (v == null) {
@@ -699,7 +532,7 @@ public class AccessControlManagerImpl im
}
NodeACL(@Nullable String oakPath, @Nullable List<ACE> entries) {
- super(oakPath, entries, namePathMapper, principalManager, privilegeManager, bitsProvider);
+ super(oakPath, entries, AccessControlManagerImpl.this.getNamePathMapper(), principalManager, getPrivilegeManager(), bitsProvider);
}
@Nonnull
@@ -744,7 +577,7 @@ public class AccessControlManagerImpl im
private PrincipalACL(@Nullable String oakPath, @Nonnull Principal principal,
@Nullable List<ACE> entries,
@Nonnull RestrictionProvider restrictionProvider) {
- super(oakPath, entries, namePathMapper, principalManager, privilegeManager, bitsProvider);
+ super(oakPath, entries, AccessControlManagerImpl.this.getNamePathMapper(), principalManager, getPrivilegeManager(), bitsProvider);
this.principal = principal;
rProvider = restrictionProvider;
}
@@ -795,7 +628,7 @@ public class AccessControlManagerImpl im
Set<Privilege> privileges = new HashSet<Privilege>();
for (String name : bitsProvider.getPrivilegeNames(getPrivilegeBits())) {
try {
- privileges.add(privilegeManager.getPrivilege(name));
+ privileges.add(getPrivilegeManager().getPrivilege(name));
} catch (RepositoryException e) {
log.warn("Unable to get privilege with name : " + name, e);
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java?rev=1549803&r1=1549802&r2=1549803&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java Tue Dec 10 10:27:55 2013
@@ -47,15 +47,17 @@ public abstract class CompositeConfigura
private final List<T> configurations = new ArrayList<T>();
private final String name;
+ private final SecurityProvider securityProvider;
- public CompositeConfiguration(String name) {
+ public CompositeConfiguration(@Nonnull String name, @Nonnull SecurityProvider securityProvider) {
this.name = name;
+ this.securityProvider = securityProvider;
}
- public void addConfiguration(@Nonnull T configuration, @Nonnull SecurityProvider sp) {
+ public void addConfiguration(@Nonnull T configuration) {
configurations.add(configuration);
if (configuration instanceof ConfigurationBase) {
- ((ConfigurationBase) configuration).setSecurityProvider(sp);
+ ((ConfigurationBase) configuration).setSecurityProvider(securityProvider);
}
}
@@ -63,10 +65,14 @@ public abstract class CompositeConfigura
configurations.remove(configuration);
}
- public List<T> getConfigurations() {
+ protected List<T> getConfigurations() {
return ImmutableList.copyOf(configurations);
}
+ protected SecurityProvider getSecurityProvider() {
+ return securityProvider;
+ }
+
//----------------------------------------------< SecurityConfiguration >---
@Nonnull
@Override
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenConfiguration.java?rev=1549803&r1=1549802&r2=1549803&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenConfiguration.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenConfiguration.java Tue Dec 10 10:27:55 2013
@@ -23,14 +23,15 @@ import com.google.common.base.Function;
import com.google.common.collect.Lists;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.spi.security.CompositeConfiguration;
+import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
/**
* {@link TokenConfiguration} that combines different token provider implementations.
*/
public final class CompositeTokenConfiguration extends CompositeConfiguration<TokenConfiguration> implements TokenConfiguration {
- public CompositeTokenConfiguration() {
- super(TokenConfiguration.NAME);
+ public CompositeTokenConfiguration(@Nonnull SecurityProvider securityProvider) {
+ super(TokenConfiguration.NAME, securityProvider);
}
@Nonnull
Added: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/CompositeAuthorizationConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/CompositeAuthorizationConfiguration.java?rev=1549803&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/CompositeAuthorizationConfiguration.java (added)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/CompositeAuthorizationConfiguration.java Tue Dec 10 10:27:55 2013
@@ -0,0 +1,192 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.oak.spi.security.authorization;
+
+import java.security.Principal;
+import java.util.List;
+import java.util.Set;
+import javax.annotation.Nonnull;
+import javax.jcr.RepositoryException;
+import javax.jcr.security.AccessControlManager;
+import javax.jcr.security.AccessControlPolicy;
+import javax.jcr.security.AccessControlPolicyIterator;
+import javax.jcr.security.Privilege;
+
+import com.google.common.base.Function;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Lists;
+import org.apache.jackrabbit.api.security.JackrabbitAccessControlManager;
+import org.apache.jackrabbit.api.security.JackrabbitAccessControlPolicy;
+import org.apache.jackrabbit.commons.iterator.AccessControlPolicyIteratorAdapter;
+import org.apache.jackrabbit.oak.api.Root;
+import org.apache.jackrabbit.oak.namepath.NamePathMapper;
+import org.apache.jackrabbit.oak.spi.security.CompositeConfiguration;
+import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
+import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AbstractAccessControlManager;
+import org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionProvider;
+import org.apache.jackrabbit.oak.spi.security.authorization.restriction.CompositeRestrictionProvider;
+import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionProvider;
+
+/**
+ * {@link CompositeAuthorizationConfiguration} that combines different
+ * authorization models.
+ */
+public class CompositeAuthorizationConfiguration extends CompositeConfiguration<AuthorizationConfiguration> implements AuthorizationConfiguration {
+
+ public CompositeAuthorizationConfiguration(@Nonnull SecurityProvider securityProvider) {
+ super(AuthorizationConfiguration.NAME, securityProvider);
+ }
+
+ @Nonnull
+ @Override
+ public AccessControlManager getAccessControlManager(final @Nonnull Root root,
+ final @Nonnull NamePathMapper namePathMapper) {
+ List<AccessControlManager> mgrs = Lists.transform(getConfigurations(), new Function<AuthorizationConfiguration, AccessControlManager>() {
+ @Override
+ public AccessControlManager apply(AuthorizationConfiguration authorizationConfiguration) {
+ return authorizationConfiguration.getAccessControlManager(root, namePathMapper);
+ }
+ });
+ return new CompositeAcMgr(root, namePathMapper, getSecurityProvider(), mgrs);
+ }
+
+ @Nonnull
+ @Override
+ public RestrictionProvider getRestrictionProvider() {
+ return CompositeRestrictionProvider.newInstance(
+ Lists.transform(getConfigurations(),
+ new Function<AuthorizationConfiguration, RestrictionProvider>() {
+ @Override
+ public RestrictionProvider apply(AuthorizationConfiguration authorizationConfiguration) {
+ return authorizationConfiguration.getRestrictionProvider();
+ }
+ }));
+ }
+
+ @Nonnull
+ @Override
+ public PermissionProvider getPermissionProvider(@Nonnull Root root, @Nonnull Set<Principal> principals) {
+ // TODO
+ throw new UnsupportedOperationException("not yet implemented.");
+ }
+
+ /**
+ *
+ */
+ private static class CompositeAcMgr extends AbstractAccessControlManager {
+
+ private final List<AccessControlManager> acMgrs;
+
+ private CompositeAcMgr(@Nonnull Root root,
+ @Nonnull NamePathMapper namePathMapper,
+ @Nonnull SecurityProvider securityProvider,
+ @Nonnull List<AccessControlManager> acMgrs) {
+ super(root, namePathMapper, securityProvider);
+ this.acMgrs = acMgrs;
+ }
+
+ //-------------------------------------------< AccessControlManager >---
+ @Override
+ public Privilege[] getSupportedPrivileges(String absPath) throws RepositoryException {
+ ImmutableList.Builder<Privilege> privs = ImmutableList.builder();
+ for (AccessControlManager acMgr : acMgrs) {
+ privs.add(acMgr.getSupportedPrivileges(absPath));
+ }
+ List<Privilege> l = privs.build();
+ return l.toArray(new Privilege[l.size()]);
+ }
+
+ @Override
+ public AccessControlPolicy[] getPolicies(String absPath) throws RepositoryException {
+ ImmutableList.Builder<AccessControlPolicy> privs = ImmutableList.builder();
+ for (AccessControlManager acMgr : acMgrs) {
+ privs.add(acMgr.getPolicies(absPath));
+ }
+ List<AccessControlPolicy> l = privs.build();
+ return l.toArray(new AccessControlPolicy[l.size()]);
+ }
+
+ @Override
+ public AccessControlPolicy[] getEffectivePolicies(String absPath) throws RepositoryException {
+ ImmutableList.Builder<AccessControlPolicy> privs = ImmutableList.builder();
+ for (AccessControlManager acMgr : acMgrs) {
+ privs.add(acMgr.getEffectivePolicies(absPath));
+ }
+ List<AccessControlPolicy> l = privs.build();
+ return l.toArray(new AccessControlPolicy[l.size()]);
+ }
+
+ @Override
+ public AccessControlPolicyIterator getApplicablePolicies(String absPath) throws RepositoryException {
+ List<AccessControlPolicyIterator> l = Lists.newArrayList();
+ for (AccessControlManager acMgr : acMgrs) {
+ l.add(acMgr.getApplicablePolicies(absPath));
+ }
+ return new AccessControlPolicyIteratorAdapter(Iterators.concat(l.toArray(new AccessControlPolicyIterator[l.size()])));
+ }
+
+ @Override
+ public void setPolicy(String absPath, AccessControlPolicy policy) throws RepositoryException {
+ // TODO
+ throw new UnsupportedOperationException("not yet implemented.");
+ }
+
+ @Override
+ public void removePolicy(String absPath, AccessControlPolicy policy) throws RepositoryException {
+ // TODO
+ throw new UnsupportedOperationException("not yet implemented.");
+ }
+
+ //---------------------------------< JackrabbitAccessControlManager >---
+ @Override
+ public JackrabbitAccessControlPolicy[] getApplicablePolicies(Principal principal) throws RepositoryException {
+ ImmutableList.Builder<JackrabbitAccessControlPolicy> policies = ImmutableList.builder();
+ for (AccessControlManager acMgr : acMgrs) {
+ if (acMgr instanceof JackrabbitAccessControlManager) {
+ policies.add(((JackrabbitAccessControlManager) acMgr).getApplicablePolicies(principal));
+ }
+ }
+ List<JackrabbitAccessControlPolicy> l = policies.build();
+ return l.toArray(new JackrabbitAccessControlPolicy[l.size()]);
+ }
+
+ @Override
+ public JackrabbitAccessControlPolicy[] getPolicies(Principal principal) throws RepositoryException {
+ ImmutableList.Builder<JackrabbitAccessControlPolicy> privs = ImmutableList.builder();
+ for (AccessControlManager acMgr : acMgrs) {
+ if (acMgr instanceof JackrabbitAccessControlManager) {
+ privs.add(((JackrabbitAccessControlManager) acMgr).getPolicies(principal));
+ }
+ }
+ List<JackrabbitAccessControlPolicy> l = privs.build();
+ return l.toArray(new JackrabbitAccessControlPolicy[l.size()]);
+ }
+
+ @Override
+ public AccessControlPolicy[] getEffectivePolicies(Set<Principal> principals) throws RepositoryException {
+ ImmutableList.Builder<AccessControlPolicy> privs = ImmutableList.builder();
+ for (AccessControlManager acMgr : acMgrs) {
+ if (acMgr instanceof JackrabbitAccessControlManager) {
+ privs.add(((JackrabbitAccessControlManager) acMgr).getEffectivePolicies(principals));
+ }
+ }
+ List<AccessControlPolicy> l = privs.build();
+ return l.toArray(new AccessControlPolicy[l.size()]);
+ }
+ }
+}
\ No newline at end of file
Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManager.java (from r1547471, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManager.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManager.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java&r1=1547471&r2=1549803&rev=1549803&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManager.java Tue Dec 10 10:27:55 2013
@@ -14,17 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.security.authorization.accesscontrol;
+package org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol;
import java.security.Principal;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
import java.util.Set;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
@@ -32,105 +25,47 @@ import javax.annotation.Nullable;
import javax.jcr.AccessDeniedException;
import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
-import javax.jcr.UnsupportedRepositoryOperationException;
-import javax.jcr.Value;
-import javax.jcr.query.Query;
-import javax.jcr.security.AccessControlEntry;
import javax.jcr.security.AccessControlException;
-import javax.jcr.security.AccessControlPolicy;
-import javax.jcr.security.AccessControlPolicyIterator;
-import javax.jcr.security.NamedAccessControlPolicy;
import javax.jcr.security.Privilege;
-import com.google.common.base.Objects;
-import com.google.common.collect.Lists;
-import org.apache.jackrabbit.JcrConstants;
-import org.apache.jackrabbit.api.security.JackrabbitAccessControlList;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlManager;
-import org.apache.jackrabbit.api.security.JackrabbitAccessControlPolicy;
import org.apache.jackrabbit.api.security.authorization.PrivilegeManager;
-import org.apache.jackrabbit.api.security.principal.ItemBasedPrincipal;
-import org.apache.jackrabbit.api.security.principal.PrincipalManager;
-import org.apache.jackrabbit.commons.iterator.AccessControlPolicyIteratorAdapter;
-import org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils;
-import org.apache.jackrabbit.oak.api.PropertyState;
-import org.apache.jackrabbit.oak.api.PropertyValue;
-import org.apache.jackrabbit.oak.api.QueryEngine;
-import org.apache.jackrabbit.oak.api.Result;
-import org.apache.jackrabbit.oak.api.ResultRow;
import org.apache.jackrabbit.oak.api.Root;
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.namepath.NamePathMapper;
-import org.apache.jackrabbit.oak.plugins.nodetype.ReadOnlyNodeTypeManager;
-import org.apache.jackrabbit.oak.security.authorization.restriction.PrincipalRestrictionProvider;
import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
import org.apache.jackrabbit.oak.spi.security.authorization.AuthorizationConfiguration;
-import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.ACE;
-import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AccessControlConstants;
-import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.ImmutableACL;
-import org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionConstants;
import org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionProvider;
import org.apache.jackrabbit.oak.spi.security.authorization.permission.Permissions;
-import org.apache.jackrabbit.oak.spi.security.authorization.restriction.Restriction;
-import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionProvider;
-import org.apache.jackrabbit.oak.spi.security.principal.PrincipalConfiguration;
-import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl;
-import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBits;
-import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBitsProvider;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConfiguration;
-import org.apache.jackrabbit.oak.util.NodeUtil;
-import org.apache.jackrabbit.oak.util.PropertyBuilder;
-import org.apache.jackrabbit.oak.util.TreeUtil;
-import org.apache.jackrabbit.util.ISO9075;
-import org.apache.jackrabbit.util.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static com.google.common.base.Preconditions.checkNotNull;
-
/**
* Default implementation of the {@code JackrabbitAccessControlManager} interface.
* This implementation covers both editing access control content by path and
* by {@code Principal} resulting both in the same content structure.
*/
-public class AccessControlManagerImpl implements JackrabbitAccessControlManager, AccessControlConstants {
+public abstract class AbstractAccessControlManager implements JackrabbitAccessControlManager, AccessControlConstants {
- private static final Logger log = LoggerFactory.getLogger(AccessControlManagerImpl.class);
+ private static final Logger log = LoggerFactory.getLogger(AbstractAccessControlManager.class);
private final Root root;
private final NamePathMapper namePathMapper;
- private final AuthorizationConfiguration acConfig;
-
+ private final AuthorizationConfiguration config;
private final PrivilegeManager privilegeManager;
- private final PrivilegeBitsProvider bitsProvider;
- private final PrincipalManager principalManager;
- private final RestrictionProvider restrictionProvider;
- private final ReadOnlyNodeTypeManager ntMgr;
-
- private final Set<String> readPaths;
private PermissionProvider permissionProvider;
- public AccessControlManagerImpl(@Nonnull Root root, @Nonnull NamePathMapper namePathMapper,
- @Nonnull SecurityProvider securityProvider) {
+ protected AbstractAccessControlManager(@Nonnull Root root,
+ @Nonnull NamePathMapper namePathMapper,
+ @Nonnull SecurityProvider securityProvider) {
this.root = root;
this.namePathMapper = namePathMapper;
- privilegeManager = getConfig(securityProvider, PrivilegeConfiguration.class).getPrivilegeManager(root, namePathMapper);
- bitsProvider = new PrivilegeBitsProvider(root);
- principalManager = getConfig(securityProvider, PrincipalConfiguration.class).getPrincipalManager(root, namePathMapper);
-
- acConfig = getConfig(securityProvider, AuthorizationConfiguration.class);
- restrictionProvider = acConfig.getRestrictionProvider();
- ntMgr = ReadOnlyNodeTypeManager.getInstance(root, namePathMapper);
-
- readPaths = acConfig.getParameters().getConfigValue(PermissionConstants.PARAM_READ_PATHS, PermissionConstants.DEFAULT_READ_PATHS);
- }
-
- private static <T> T getConfig(SecurityProvider sp, Class<T> clss) {
- return sp.getConfiguration(clss);
+ privilegeManager = securityProvider.getConfiguration(PrivilegeConfiguration.class).getPrivilegeManager(root, namePathMapper);
+ config = securityProvider.getConfiguration(AuthorizationConfiguration.class);
}
//-----------------------------------------------< AccessControlManager >---
@@ -158,287 +93,55 @@ public class AccessControlManagerImpl im
return getPrivileges(absPath, getPermissionProvider(), Permissions.NO_PERMISSION);
}
- @Nonnull
- @Override
- public AccessControlPolicy[] getPolicies(@Nullable String absPath) throws RepositoryException {
- String oakPath = getOakPath(absPath);
- Tree tree = getTree(oakPath, Permissions.READ_ACCESS_CONTROL, true);
- AccessControlPolicy policy = createACL(oakPath, tree, false);
-
- List<AccessControlPolicy> policies = new ArrayList<AccessControlPolicy>(2);
- if (policy != null) {
- policies.add(policy);
- }
- if (readPaths.contains(oakPath)) {
- policies.add(ReadPolicy.INSTANCE);
- }
- return policies.toArray(new AccessControlPolicy[policies.size()]);
- }
-
- @Nonnull
- @Override
- public AccessControlPolicy[] getEffectivePolicies(@Nullable String absPath) throws RepositoryException {
- String oakPath = getOakPath(absPath);
- Tree tree = getTree(oakPath, Permissions.READ_ACCESS_CONTROL, true);
-
- Root r = root.getContentSession().getLatestRoot();
- tree = r.getTree(tree.getPath());
-
- List<AccessControlPolicy> effective = new ArrayList<AccessControlPolicy>();
- AccessControlPolicy policy = createACL(oakPath, tree, true);
- if (policy != null) {
- effective.add(policy);
- }
- if (oakPath != null) {
- String parentPath = Text.getRelativeParent(oakPath, 1);
- while (!parentPath.isEmpty()) {
- Tree t = r.getTree(parentPath);
- AccessControlPolicy plc = createACL(parentPath, t, true);
- if (plc != null) {
- effective.add(plc);
- }
- parentPath = (PathUtils.denotesRoot(parentPath)) ? "" : Text.getRelativeParent(parentPath, 1);
- }
- }
- if (readPaths.contains(oakPath)) {
- effective.add(ReadPolicy.INSTANCE);
- }
- return effective.toArray(new AccessControlPolicy[effective.size()]);
- }
-
- @Nonnull
- @Override
- public AccessControlPolicyIterator getApplicablePolicies(@Nullable String absPath) throws RepositoryException {
- String oakPath = getOakPath(absPath);
- Tree tree = getTree(oakPath, Permissions.READ_ACCESS_CONTROL, true);
-
- AccessControlPolicy policy = null;
- Tree aclTree = getAclTree(oakPath, tree);
- if (aclTree == null) {
- if (tree.hasChild(Util.getAclName(oakPath))) {
- // policy child node without tree being access controlled
- log.warn("Colliding policy child without node being access controllable ({}).", absPath);
- } else {
- // create an empty acl unless the node is protected or cannot have
- // mixin set (e.g. due to a lock)
- String mixinName = Util.getMixinName(oakPath);
- if (ntMgr.isNodeType(tree, mixinName) || ntMgr.getEffectiveNodeType(tree).supportsMixin(mixinName)) {
- policy = new NodeACL(oakPath);
- } else {
- log.warn("Node {} cannot be made access controllable.", absPath);
- }
- }
- } // else: acl already present -> getPolicies must be used.
-
- if (policy == null) {
- return AccessControlPolicyIteratorAdapter.EMPTY;
- } else {
- return new AccessControlPolicyIteratorAdapter(Collections.singleton(policy));
- }
- }
-
+ //-------------------------------------< JackrabbitAccessControlManager >---
@Override
- public void setPolicy(@Nullable String absPath, @Nonnull AccessControlPolicy policy) throws RepositoryException {
- String oakPath = getOakPath(absPath);
- Util.checkValidPolicy(oakPath, policy);
-
- if (policy instanceof PrincipalACL) {
- setPrincipalBasedAcl((PrincipalACL) policy);
- } else {
- Tree tree = getTree(oakPath, Permissions.MODIFY_ACCESS_CONTROL, true);
- setNodeBasedAcl(oakPath, tree, (ACL) policy);
- }
- }
-
- private void setPrincipalBasedAcl(PrincipalACL principalAcl) throws RepositoryException {
- AccessControlPolicy[] plcs = getPolicies(principalAcl.principal);
- PrincipalACL existing = (plcs.length == 0) ? null : (PrincipalACL) plcs[0];
-
- List<ACE> toAdd = Lists.newArrayList(principalAcl.getEntries());
- List<ACE> toRemove = Collections.emptyList();
- if (existing != null) {
- toAdd.removeAll(existing.getEntries());
- toRemove = existing.getEntries();
- toRemove.removeAll(principalAcl.getEntries());
- }
-
- // add new entries
- for (ACE ace : toAdd) {
- String path = getNodePath(ace);
- Tree tree = getTree(path, Permissions.MODIFY_ACCESS_CONTROL, true);
-
- ACL acl = (ACL) createACL(path, tree, false);
- if (acl == null) {
- acl = new NodeACL(path);
- }
-
- Map<String, Value> restrictions = new HashMap<String, Value>();
- for (String name : ace.getRestrictionNames()) {
- if (!REP_NODE_PATH.equals(name)) {
- restrictions.put(name, ace.getRestriction(name));
- }
- }
- acl.addEntry(ace.getPrincipal(), ace.getPrivileges(), ace.isAllow(), restrictions);
- setNodeBasedAcl(path, tree, acl);
- }
-
- // remove entries that are not longer present in the acl to write
- for (ACE ace : toRemove) {
- String path = getNodePath(ace);
- Tree tree = getTree(path, Permissions.MODIFY_ACCESS_CONTROL, true);
-
- ACL acl = (ACL) createACL(path, tree, false);
- if (acl != null) {
- acl.removeAccessControlEntry(ace);
- setNodeBasedAcl(path, tree, acl);
- } else {
- log.debug("Missing ACL at {}; cannot remove entry {}", path, ace);
- }
- }
- }
-
- private void setNodeBasedAcl(@Nullable String oakPath, @Nonnull Tree tree,
- @Nonnull ACL acl) throws RepositoryException {
- Tree aclTree = getAclTree(oakPath, tree);
- if (aclTree != null) {
- // remove all existing aces
- for (Tree aceTree : aclTree.getChildren()) {
- aceTree.remove();
- }
+ public boolean hasPrivileges(@Nullable String absPath, @Nonnull Set<Principal> principals, @Nullable Privilege[] privileges) throws RepositoryException {
+ if (getPrincipals().equals(principals)) {
+ return hasPrivileges(absPath, privileges);
} else {
- aclTree = createAclTree(oakPath, tree);
- }
- aclTree.setOrderableChildren(true);
- for (ACE ace : acl.getEntries()) {
- boolean isAllow = ace.isAllow();
- String nodeName = Util.generateAceName(aclTree, isAllow);
- String ntName = (isAllow) ? NT_REP_GRANT_ACE : NT_REP_DENY_ACE;
-
- NodeUtil aceNode = new NodeUtil(aclTree).addChild(nodeName, ntName);
- aceNode.setString(REP_PRINCIPAL_NAME, ace.getPrincipal().getName());
- aceNode.setNames(REP_PRIVILEGES, AccessControlUtils.namesFromPrivileges(ace.getPrivileges()));
- Set<Restriction> restrictions = ace.getRestrictions();
- restrictionProvider.writeRestrictions(oakPath, aceNode.getTree(), restrictions);
+ PermissionProvider provider = config.getPermissionProvider(root, principals);
+ return hasPrivileges(absPath, privileges, provider, Permissions.READ_ACCESS_CONTROL, false);
}
}
@Override
- public void removePolicy(@Nullable String absPath, @Nonnull AccessControlPolicy policy) throws RepositoryException {
- String oakPath = getOakPath(absPath);
- Util.checkValidPolicy(oakPath, policy);
-
- if (policy instanceof PrincipalACL) {
- PrincipalACL principalAcl = (PrincipalACL) policy;
- for (ACE ace : principalAcl.getEntries()) {
- String path = getNodePath(ace);
- Tree tree = getTree(path, Permissions.MODIFY_ACCESS_CONTROL, true);
- Tree aclTree = getAclTree(path, tree);
- if (aclTree == null) {
- throw new AccessControlException("Unable to retrieve policy node at " + path);
- }
- Iterator<Tree> children = aclTree.getChildren().iterator();
- while (children.hasNext()) {
- Tree child = children.next();
- if (ace.equals(createACE(path, child, principalAcl.rProvider))) {
- child.remove();
- }
- }
- if (!aclTree.getChildren().iterator().hasNext()) {
- aclTree.remove();
- }
- }
+ public Privilege[] getPrivileges(@Nullable String absPath, @Nonnull Set<Principal> principals) throws RepositoryException {
+ if (getPrincipals().equals(principals)) {
+ return getPrivileges(absPath);
} else {
- Tree tree = getTree(oakPath, Permissions.MODIFY_ACCESS_CONTROL, true);
- Tree aclTree = getAclTree(oakPath, tree);
- if (aclTree != null) {
- aclTree.remove();
- } else {
- throw new AccessControlException("No policy to remove at " + absPath);
- }
+ PermissionProvider provider = config.getPermissionProvider(root, principals);
+ return getPrivileges(absPath, provider, Permissions.READ_ACCESS_CONTROL);
}
}
- //-------------------------------------< JackrabbitAccessControlManager >---
+ //----------------------------------------------------------< protected >---
@Nonnull
- @Override
- public JackrabbitAccessControlPolicy[] getApplicablePolicies(@Nonnull Principal principal) throws RepositoryException {
- Util.checkValidPrincipal(principal, principalManager);
-
- String oakPath = (principal instanceof ItemBasedPrincipal) ? ((ItemBasedPrincipal) principal).getPath() : null;
- JackrabbitAccessControlPolicy policy = createPrincipalACL(oakPath, principal);
-
- if (policy != null) {
- return new JackrabbitAccessControlPolicy[0];
- } else {
- return new JackrabbitAccessControlPolicy[]{new PrincipalACL(oakPath, principal)};
- }
+ protected AuthorizationConfiguration getConfig() {
+ return config;
}
@Nonnull
- @Override
- public JackrabbitAccessControlPolicy[] getPolicies(@Nonnull Principal principal) throws RepositoryException {
- Util.checkValidPrincipal(principal, principalManager);
-
- String oakPath = (principal instanceof ItemBasedPrincipal) ? ((ItemBasedPrincipal) principal).getPath() : null;
- JackrabbitAccessControlPolicy policy = createPrincipalACL(oakPath, principal);
-
- if (policy != null) {
- return new JackrabbitAccessControlPolicy[]{policy};
- } else {
- return new JackrabbitAccessControlPolicy[0];
- }
+ protected Root getRoot() {
+ return root;
}
@Nonnull
- @Override
- public AccessControlPolicy[] getEffectivePolicies(@Nonnull Set<Principal> principals) throws RepositoryException {
- Util.checkValidPrincipals(principals, principalManager);
- Root r = root.getContentSession().getLatestRoot();
-
- Result aceResult = searchAces(principals, r);
- List<AccessControlPolicy> effective = new ArrayList<AccessControlPolicy>();
- for (ResultRow row : aceResult.getRows()) {
- String acePath = row.getPath();
- String aclName = Text.getName(Text.getRelativeParent(acePath, 1));
-
- Tree accessControlledTree = r.getTree(Text.getRelativeParent(acePath, 2));
- if (aclName.isEmpty() || !accessControlledTree.exists()) {
- log.debug("Isolated access control entry -> ignore query result at " + acePath);
- continue;
- }
-
- String path = (REP_REPO_POLICY.equals(aclName)) ? null : accessControlledTree.getPath();
- AccessControlPolicy policy = createACL(path, accessControlledTree, true);
- if (policy != null) {
- effective.add(policy);
- }
- }
- return effective.toArray(new AccessControlPolicy[effective.size()]);
+ protected Root getLatestRoot() {
+ return root.getContentSession().getLatestRoot();
}
- @Override
- public boolean hasPrivileges(@Nullable String absPath, @Nonnull Set<Principal> principals, @Nullable Privilege[] privileges) throws RepositoryException {
- if (getPrincipals().equals(principals)) {
- return hasPrivileges(absPath, privileges);
- } else {
- PermissionProvider provider = acConfig.getPermissionProvider(root, principals);
- return hasPrivileges(absPath, privileges, provider, Permissions.READ_ACCESS_CONTROL, false);
- }
+ @Nonnull
+ protected NamePathMapper getNamePathMapper() {
+ return namePathMapper;
}
- @Override
- public Privilege[] getPrivileges(@Nullable String absPath, @Nonnull Set<Principal> principals) throws RepositoryException {
- if (getPrincipals().equals(principals)) {
- return getPrivileges(absPath);
- } else {
- PermissionProvider provider = acConfig.getPermissionProvider(root, principals);
- return getPrivileges(absPath, provider, Permissions.READ_ACCESS_CONTROL);
- }
+ @Nonnull
+ protected PrivilegeManager getPrivilegeManager() {
+ return privilegeManager;
}
- //------------------------------------------------------------< private >---
@CheckForNull
- private String getOakPath(@Nullable String jcrPath) throws RepositoryException {
+ protected String getOakPath(@Nullable String jcrPath) throws RepositoryException {
if (jcrPath == null) {
return null;
} else {
@@ -451,7 +154,7 @@ public class AccessControlManagerImpl im
}
@Nonnull
- private Tree getTree(@Nullable String oakPath, long permissions, boolean checkAcContent) throws RepositoryException {
+ protected Tree getTree(@Nullable String oakPath, long permissions, boolean checkAcContent) throws RepositoryException {
Tree tree = (oakPath == null) ? root.getTree("/") : root.getTree(oakPath);
if (!tree.exists()) {
throw new PathNotFoundException("No tree at " + oakPath);
@@ -461,181 +164,44 @@ public class AccessControlManagerImpl im
checkPermissions((oakPath == null) ? null : tree, permissions);
}
// check if the tree defines access controlled content
- if (checkAcContent && acConfig.getContext().definesTree(tree)) {
+ if (checkAcContent && config.getContext().definesTree(tree)) {
throw new AccessControlException("Tree " + tree.getPath() + " defines access control content.");
}
return tree;
}
- private void checkPermissions(@Nullable Tree tree, long permissions) throws AccessDeniedException {
- boolean isGranted;
- if (tree == null) {
- isGranted = getPermissionProvider().getRepositoryPermission().isGranted(permissions);
- } else {
- isGranted = getPermissionProvider().isGranted(tree, null, permissions);
- }
- if (!isGranted) {
- throw new AccessDeniedException("Access denied.");
- }
- }
-
- @CheckForNull
- private Tree getAclTree(@Nullable String oakPath, @Nonnull Tree accessControlledTree) {
- if (Util.isAccessControlled(oakPath, accessControlledTree, ntMgr)) {
- String aclName = Util.getAclName(oakPath);
- Tree policyTree = accessControlledTree.getChild(aclName);
- if (policyTree.exists()) {
- return policyTree;
- }
- }
- return null;
- }
-
- /**
- * @param oakPath the Oak path as specified with the ac mgr call.
- * @param tree the access controlled node.
- * @return the new acl tree.
- * @throws AccessDeniedException In case the new acl tree is not accessible.
- */
- @Nonnull
- private Tree createAclTree(@Nullable String oakPath, @Nonnull Tree tree) throws AccessDeniedException {
- if (!Util.isAccessControlled(oakPath, tree, ntMgr)) {
- PropertyState mixins = tree.getProperty(JcrConstants.JCR_MIXINTYPES);
- String mixinName = Util.getMixinName(oakPath);
- if (mixins == null) {
- tree.setProperty(JcrConstants.JCR_MIXINTYPES, Collections.singleton(mixinName), Type.NAMES);
- } else {
- PropertyBuilder pb = PropertyBuilder.copy(Type.NAME, mixins);
- pb.addValue(mixinName);
- tree.setProperty(pb.getPropertyState());
- }
- }
- String aclName = Util.getAclName(oakPath);
- return new NodeUtil(tree).addChild(aclName, NT_REP_ACL).getTree();
- }
-
- @CheckForNull
- private JackrabbitAccessControlList createACL(@Nullable String oakPath,
- @Nonnull Tree accessControlledTree,
- boolean isEffectivePolicy) throws RepositoryException {
- JackrabbitAccessControlList acl = null;
- String aclName = Util.getAclName(oakPath);
- if (accessControlledTree.exists() && Util.isAccessControlled(oakPath, accessControlledTree, ntMgr)) {
- Tree aclTree = accessControlledTree.getChild(aclName);
- if (aclTree.exists()) {
- List<ACE> entries = new ArrayList<ACE>();
- for (Tree child : aclTree.getChildren()) {
- if (Util.isACE(child, ntMgr)) {
- entries.add(createACE(oakPath, child, restrictionProvider));
- }
- }
- if (isEffectivePolicy) {
- acl = new ImmutableACL(oakPath, entries, restrictionProvider, namePathMapper);
- } else {
- acl = new NodeACL(oakPath, entries);
- }
- }
- }
- return acl;
- }
-
- @Nullable
- private JackrabbitAccessControlList createPrincipalACL(@Nullable String oakPath,
- @Nonnull Principal principal) throws RepositoryException {
- Result aceResult = searchAces(Collections.<Principal>singleton(principal), root);
- RestrictionProvider restrProvider = new PrincipalRestrictionProvider(restrictionProvider);
- List<ACE> entries = new ArrayList<ACE>();
- for (ResultRow row : aceResult.getRows()) {
- Tree aceTree = root.getTree(row.getPath());
- if (Util.isACE(aceTree, ntMgr)) {
- String aclPath = Text.getRelativeParent(aceTree.getPath(), 1);
- String path;
- if (aclPath.endsWith(REP_REPO_POLICY)) {
- path = null;
- } else {
- path = Text.getRelativeParent(aclPath, 1);
- }
- entries.add(createACE(path, aceTree, restrProvider));
- }
- }
- if (entries.isEmpty()) {
- // nothing found
- return null;
- } else {
- return new PrincipalACL(oakPath, principal, entries, restrProvider);
- }
- }
-
- @Nonnull
- private ACE createACE(@Nullable String oakPath,
- @Nonnull Tree aceTree,
- @Nonnull RestrictionProvider restrictionProvider) throws RepositoryException {
- boolean isAllow = NT_REP_GRANT_ACE.equals(TreeUtil.getPrimaryTypeName(aceTree));
- Set<Restriction> restrictions = restrictionProvider.readRestrictions(oakPath, aceTree);
- Iterable<String> privNames = checkNotNull(TreeUtil.getStrings(aceTree, REP_PRIVILEGES));
- return new Entry(getPrincipal(aceTree), bitsProvider.getBits(privNames), isAllow, restrictions, namePathMapper);
- }
-
@Nonnull
- private static Result searchAces(@Nonnull Set<Principal> principals, @Nonnull Root root) throws RepositoryException {
- StringBuilder stmt = new StringBuilder("/jcr:root");
- stmt.append("//element(*,");
- stmt.append(NT_REP_ACE);
- stmt.append(")[");
- int i = 0;
- for (Principal principal : principals) {
- if (i > 0) {
- stmt.append(" or ");
- }
- stmt.append('@');
- stmt.append(ISO9075.encode(REP_PRINCIPAL_NAME));
- stmt.append("='");
- stmt.append(principal.getName().replaceAll("'", "''"));
- stmt.append('\'');
- i++;
- }
- stmt.append(']');
- stmt.append(" order by jcr:path");
-
- try {
- QueryEngine queryEngine = root.getQueryEngine();
- return queryEngine.executeQuery(stmt.toString(), Query.XPATH, Long.MAX_VALUE, 0, Collections.<String, PropertyValue>emptyMap(), NamePathMapper.DEFAULT);
- } catch (ParseException e) {
- String msg = "Error while collecting effective policies.";
- log.error(msg, e.getMessage());
- throw new RepositoryException(msg, e);
- }
- }
-
- @Nonnull
- private Principal getPrincipal(@Nonnull Tree aceTree) {
- String principalName = checkNotNull(TreeUtil.getString(aceTree, REP_PRINCIPAL_NAME));
- Principal principal = principalManager.getPrincipal(principalName);
- if (principal == null) {
- log.debug("Unknown principal " + principalName);
- principal = new PrincipalImpl(principalName);
+ protected PermissionProvider getPermissionProvider() {
+ if (permissionProvider == null) {
+ permissionProvider = config.getPermissionProvider(root, getPrincipals());
+ } else {
+ permissionProvider.refresh();
}
- return principal;
+ return permissionProvider;
}
+ //------------------------------------------------------------< private >---
@Nonnull
private Set<Principal> getPrincipals() {
return root.getContentSession().getAuthInfo().getPrincipals();
}
- @Nonnull
- private PermissionProvider getPermissionProvider() {
- if (permissionProvider == null) {
- permissionProvider = acConfig.getPermissionProvider(root, getPrincipals());
+ private void checkPermissions(@Nullable Tree tree, long permissions) throws AccessDeniedException {
+ boolean isGranted;
+ if (tree == null) {
+ isGranted = getPermissionProvider().getRepositoryPermission().isGranted(permissions);
} else {
- permissionProvider.refresh();
+ isGranted = getPermissionProvider().isGranted(tree, null, permissions);
+ }
+ if (!isGranted) {
+ throw new AccessDeniedException("Access denied.");
}
- return permissionProvider;
}
@Nonnull
- private Privilege[] getPrivileges(@Nullable String absPath, @Nonnull PermissionProvider provider,
- long permissions) throws RepositoryException {
+ private Privilege[] getPrivileges(@Nullable String absPath,
+ @Nonnull PermissionProvider provider,
+ long permissions) throws RepositoryException {
Tree tree;
if (absPath == null) {
tree = null;
@@ -658,8 +224,8 @@ public class AccessControlManagerImpl im
}
private boolean hasPrivileges(@Nullable String absPath, @Nullable Privilege[] privileges,
- @Nonnull PermissionProvider provider, long permissions,
- boolean checkAcContent) throws RepositoryException {
+ @Nonnull PermissionProvider provider, long permissions,
+ boolean checkAcContent) throws RepositoryException {
Tree tree;
if (absPath == null) {
tree = null;
@@ -681,139 +247,4 @@ public class AccessControlManagerImpl im
return provider.hasPrivileges(tree, privilegeNames.toArray(new String[privilegeNames.size()]));
}
}
-
- private String getNodePath(ACE principalBasedAce) throws RepositoryException {
- Value v = principalBasedAce.getRestriction(REP_NODE_PATH);
- if (v == null) {
- throw new AccessControlException("Missing mandatory restriction rep:nodePath");
- } else {
- return getOakPath(v.getString());
- }
- }
-
- //--------------------------------------------------------------------------
- private class NodeACL extends ACL {
-
- NodeACL(@Nullable String oakPath) {
- this(oakPath, null);
- }
-
- NodeACL(@Nullable String oakPath, @Nullable List<ACE> entries) {
- super(oakPath, entries, namePathMapper, principalManager, privilegeManager, bitsProvider);
- }
-
- @Nonnull
- @Override
- public RestrictionProvider getRestrictionProvider() {
- return restrictionProvider;
- }
-
- @Override
- ACE createACE(Principal principal, PrivilegeBits privilegeBits, boolean isAllow, Set<Restriction> restrictions) throws RepositoryException {
- return new Entry(principal, privilegeBits, isAllow, restrictions, getNamePathMapper());
- }
-
- @Override
- public boolean equals(Object obj) {
- if (obj == this) {
- return true;
- }
- if (obj instanceof NodeACL) {
- NodeACL other = (NodeACL) obj;
- return Objects.equal(getOakPath(), other.getOakPath())
- && getEntries().equals(other.getEntries());
- }
- return false;
- }
-
- @Override
- public int hashCode() {
- return 0;
- }
- }
-
- private final class PrincipalACL extends ACL {
-
- private final Principal principal;
- private final RestrictionProvider rProvider;
-
- private PrincipalACL(@Nullable String oakPath, @Nonnull Principal principal) {
- this(oakPath, principal, null, new PrincipalRestrictionProvider(restrictionProvider));
- }
-
- private PrincipalACL(@Nullable String oakPath, @Nonnull Principal principal,
- @Nullable List<ACE> entries,
- @Nonnull RestrictionProvider restrictionProvider) {
- super(oakPath, entries, namePathMapper, principalManager, privilegeManager, bitsProvider);
- this.principal = principal;
- rProvider = restrictionProvider;
- }
-
- @Nonnull
- @Override
- public RestrictionProvider getRestrictionProvider() {
- return rProvider;
- }
-
- @Override
- ACE createACE(Principal principal, PrivilegeBits privilegeBits, boolean isAllow, Set<Restriction> restrictions) throws RepositoryException {
- return new Entry(principal, privilegeBits, isAllow, restrictions, getNamePathMapper());
- }
-
- @Override
- public void orderBefore(AccessControlEntry srcEntry, AccessControlEntry destEntry) throws RepositoryException {
- throw new UnsupportedRepositoryOperationException("reordering is not supported");
- }
-
- @Override
- public boolean equals(Object obj) {
- if (obj == this) {
- return true;
- }
- if (obj instanceof PrincipalACL) {
- PrincipalACL other = (PrincipalACL) obj;
- return Objects.equal(getOakPath(), other.getOakPath())
- && getEntries().equals(other.getEntries());
- }
- return false;
- }
-
- @Override
- public int hashCode() {
- return 0;
- }
- }
-
- private final class Entry extends ACE {
-
- private Entry(Principal principal, PrivilegeBits privilegeBits, boolean isAllow, Set<Restriction> restrictions, NamePathMapper namePathMapper) throws AccessControlException {
- super(principal, privilegeBits, isAllow, restrictions, namePathMapper);
- }
-
- @Override
- public Privilege[] getPrivileges() {
- Set<Privilege> privileges = new HashSet<Privilege>();
- for (String name : bitsProvider.getPrivilegeNames(getPrivilegeBits())) {
- try {
- privileges.add(privilegeManager.getPrivilege(name));
- } catch (RepositoryException e) {
- log.warn("Unable to get privilege with name : " + name, e);
- }
- }
- return privileges.toArray(new Privilege[privileges.size()]);
- }
- }
-
- private static final class ReadPolicy implements NamedAccessControlPolicy {
-
- private static final NamedAccessControlPolicy INSTANCE = new ReadPolicy();
-
- private ReadPolicy() {
- }
-
- @Override
- public String getName() {
- return "Grants read access on configured trees.";
- }
- }
}
Propchange: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfiguration.java?rev=1549803&r1=1549802&r2=1549803&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfiguration.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfiguration.java Tue Dec 10 10:27:55 2013
@@ -24,6 +24,7 @@ import org.apache.jackrabbit.api.securit
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
import org.apache.jackrabbit.oak.spi.security.CompositeConfiguration;
+import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
/**
* {@link PrincipalConfiguration} that combines different principal provider
@@ -31,8 +32,8 @@ import org.apache.jackrabbit.oak.spi.sec
*/
public final class CompositePrincipalConfiguration extends CompositeConfiguration<PrincipalConfiguration> implements PrincipalConfiguration {
- public CompositePrincipalConfiguration() {
- super(PrincipalConfiguration.NAME);
+ public CompositePrincipalConfiguration(@Nonnull SecurityProvider securityProvider) {
+ super(PrincipalConfiguration.NAME, securityProvider);
}
@Nonnull