jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r1478308 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action: AccessControlAction.java DefaultAuthorizableActionProvider.java
Date Thu, 02 May 2013 09:44:05 GMT
Author: angela
Date: Thu May  2 09:44:05 2013
New Revision: 1478308

URL: http://svn.apache.org/r1478308
Log:
OAK-50 : Implement User Management  (wip)

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AccessControlAction.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AccessControlAction.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AccessControlAction.java?rev=1478308&r1=1478307&r2=1478308&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AccessControlAction.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AccessControlAction.java
Thu May  2 09:44:05 2013
@@ -159,9 +159,14 @@ public class AccessControlAction extends
             throw new IllegalStateException("Not initialized");
         }
         if (isSystemUser(authorizable)) {
-            log.debug("System user: " + authorizable.getID() + "; omit ac setup");
+            log.debug("System user: " + authorizable.getID() + "; omit ac setup.");
             return;
         }
+        if (groupPrivilegeNames.length == 0 && userPrivilegeNames.length == 0) {
+            log.debug("No privileges configured for groups and users; omit ac setup.");
+            return;
+        }
+
         String path = authorizable.getPath();
         AccessControlManager acMgr = securityProvider.getAccessControlConfiguration().getAccessControlManager(root,
namePathMapper);
         JackrabbitAccessControlList acl = null;

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java?rev=1478308&r1=1478307&r2=1478308&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java
Thu May  2 09:44:05 2013
@@ -39,6 +39,8 @@ public class DefaultAuthorizableActionPr
     @Override
     public List<AuthorizableAction> getAuthorizableActions() {
         // TODO OAK-521: create and initialize actions from configuration
-        return Collections.emptyList();
+        AccessControlAction action = new AccessControlAction();
+        action.init(securityProvider, config);
+        return Collections.<AuthorizableAction>singletonList(action);
     }
 }
\ No newline at end of file



Mime
View raw message