Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 52104D280 for ; Wed, 24 Oct 2012 13:18:36 +0000 (UTC) Received: (qmail 70409 invoked by uid 500); 24 Oct 2012 13:18:36 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 70336 invoked by uid 500); 24 Oct 2012 13:18:34 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 70301 invoked by uid 99); 24 Oct 2012 13:18:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Oct 2012 13:18:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Oct 2012 13:18:32 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AE84623889C5; Wed, 24 Oct 2012 13:17:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1401667 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak: security/user/UserConfigurationImpl.java security/user/UserManagerImpl.java spi/security/user/UserConfiguration.java Date: Wed, 24 Oct 2012 13:17:48 -0000 To: oak-commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121024131748.AE84623889C5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: angela Date: Wed Oct 24 13:17:48 2012 New Revision: 1401667 URL: http://svn.apache.org/viewvc?rev=1401667&view=rev Log: OAK-50 : Implement User Management (WIP) Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserConfigurationImpl.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConfiguration.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserConfigurationImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserConfigurationImpl.java?rev=1401667&r1=1401666&r2=1401667&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserConfigurationImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserConfigurationImpl.java Wed Oct 24 13:17:48 2012 @@ -28,6 +28,7 @@ import org.apache.jackrabbit.oak.spi.com import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters; import org.apache.jackrabbit.oak.spi.security.SecurityProvider; import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration; +import org.apache.jackrabbit.oak.spi.security.user.action.AuthorizableAction; /** * UserConfigurationImpl... TODO @@ -37,7 +38,8 @@ public class UserConfigurationImpl imple private final ConfigurationParameters config; private final SecurityProvider securityProvider; - public UserConfigurationImpl(ConfigurationParameters config, SecurityProvider securityProvider) { + public UserConfigurationImpl(ConfigurationParameters config, + SecurityProvider securityProvider) { this.config = config; this.securityProvider = securityProvider; } @@ -54,6 +56,13 @@ public class UserConfigurationImpl imple return Collections.singletonList(vp); } + @Nonnull + @Override + public List getAuthorizableActions() { + // TODO: create authorizable actions from configuration + return Collections.emptyList(); + } + @Override public UserManager getUserManager(Root root, NamePathMapper namePathMapper, Session session) { return new UserManagerImpl(session, root, namePathMapper, securityProvider); Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java?rev=1401667&r1=1401666&r2=1401667&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java Wed Oct 24 13:17:48 2012 @@ -20,6 +20,7 @@ import java.io.UnsupportedEncodingExcept import java.security.NoSuchAlgorithmException; import java.security.Principal; import java.util.Iterator; +import java.util.List; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; import javax.jcr.Node; @@ -66,7 +67,7 @@ public class UserManagerImpl implements private final UserProvider userProvider; private final MembershipProvider membershipProvider; private final ConfigurationParameters config; - private final AuthorizableAction[] authorizableActions; + private final List authorizableActions; private UserQueryManager queryManager; @@ -81,7 +82,7 @@ public class UserManagerImpl implements this.config = uc.getConfigurationParameters(); this.userProvider = new UserProvider(root, config); this.membershipProvider = new MembershipProvider(root, config); - this.authorizableActions = config.getConfigValue(UserConstants.PARAM_AUTHORIZABLE_ACTIONS, new AuthorizableAction[0]); + this.authorizableActions = uc.getAuthorizableActions(); } //--------------------------------------------------------< UserManager >--- Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConfiguration.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConfiguration.java?rev=1401667&r1=1401666&r2=1401667&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConfiguration.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConfiguration.java Wed Oct 24 13:17:48 2012 @@ -23,8 +23,9 @@ import javax.jcr.Session; import org.apache.jackrabbit.api.security.user.UserManager; import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.namepath.NamePathMapper; -import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters; import org.apache.jackrabbit.oak.spi.commit.ValidatorProvider; +import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters; +import org.apache.jackrabbit.oak.spi.security.user.action.AuthorizableAction; /** * UserContext... TODO @@ -38,6 +39,9 @@ public interface UserConfiguration { List getValidatorProviders(); @Nonnull + List getAuthorizableActions(); + + @Nonnull UserManager getUserManager(Root root, NamePathMapper namePathMapper, Session session); @Nonnull