X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jackrabbit%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjackrabbit%2FJackrabbitAuthorizations.java;h=d33f886a89ffd7bb3636c20b0817727e032d138d;hb=1d5afdce3e91054f07ddd3c98309c363b4cf1d46;hp=8c1204c0e09b57b2296015cadd00520bf0ea7be2;hpb=e890c9d9d57069b464b406405797f38e7263f3b1;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitAuthorizations.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitAuthorizations.java
index 8c1204c0e..d33f886a8 100644
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitAuthorizations.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitAuthorizations.java
@@ -1,127 +1,63 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * Licensed 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.argeo.jackrabbit;
 
+import java.security.Principal;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Executor;
 
-import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
-import javax.jcr.security.AccessControlList;
-import javax.jcr.security.AccessControlPolicy;
-import javax.jcr.security.AccessControlPolicyIterator;
-import javax.jcr.security.Privilege;
+import javax.jcr.Session;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.api.JackrabbitSession;
-import org.apache.jackrabbit.api.security.JackrabbitAccessControlManager;
-import org.apache.jackrabbit.api.security.user.Group;
+import org.apache.jackrabbit.api.security.user.Authorizable;
 import org.apache.jackrabbit.api.security.user.UserManager;
 import org.argeo.ArgeoException;
-import org.argeo.jcr.JcrUtils;
+import org.argeo.jcr.security.JcrAuthorizations;
 
 /** Apply authorizations to a Jackrabbit repository. */
-public class JackrabbitAuthorizations {
+public class JackrabbitAuthorizations extends JcrAuthorizations {
 	private final static Log log = LogFactory
 			.getLog(JackrabbitAuthorizations.class);
 
-	private Repository repository;
-	private Executor systemExecutor;
-
-	/**
-	 * key := privilege1,privilege2/path/to/node<br/>
-	 * value := group1,group2
-	 */
-	private Map<String, String> groupPrivileges = new HashMap<String, String>();
-
-	public void init() {
-		Runnable action = new Runnable() {
-			public void run() {
-				JackrabbitSession session = null;
-				try {
-					session = (JackrabbitSession) repository.login();
-					initAuthorizations(session);
-				} catch (Exception e) {
-					JcrUtils.discardQuietly(session);
-				} finally {
-					JcrUtils.logoutQuietly(session);
-				}
-			}
-		};
-
-		if (systemExecutor != null)
-			systemExecutor.execute(action);
-		else
-			action.run();
-	}
-
-	protected void initAuthorizations(JackrabbitSession session)
-			throws RepositoryException {
-		JackrabbitAccessControlManager acm = (JackrabbitAccessControlManager) session
-				.getAccessControlManager();
-		UserManager um = session.getUserManager();
-
-		for (String privileges : groupPrivileges.keySet()) {
-			String path = null;
-			int slashIndex = privileges.indexOf('/');
-			if (slashIndex == 0) {
-				throw new ArgeoException("Privilege " + privileges
-						+ " badly formatted it starts with /");
-			} else if (slashIndex > 0) {
-				path = privileges.substring(slashIndex);
-				privileges = privileges.substring(0, slashIndex);
-			}
-
-			if (path == null)
-				path = "/";
-
-			List<Privilege> privs = new ArrayList<Privilege>();
-			for (String priv : privileges.split(",")) {
-				privs.add(acm.privilegeFromName(priv));
-			}
-
-			String groupNames = groupPrivileges.get(privileges);
-			for (String groupName : groupNames.split(",")) {
-				Group group = (Group) um.getAuthorizable(groupName);
-				if (group == null)
-					group = um.createGroup(groupName);
-
-				AccessControlPolicy policy = null;
-				AccessControlPolicyIterator policyIterator = acm
-						.getApplicablePolicies(path);
-				if (policyIterator.hasNext()) {
-					policy = policyIterator.nextAccessControlPolicy();
-				} else {
-					AccessControlPolicy[] existingPolicies = acm
-							.getPolicies(path);
-					policy = existingPolicies[0];
-				}
-				if (policy instanceof AccessControlList) {
-					((AccessControlList) policy).addAccessControlEntry(
-							group.getPrincipal(),
-							privs.toArray(new Privilege[privs.size()]));
-					acm.setPolicy(path, policy);
+	private List<String> groupPrefixes = new ArrayList<String>();
+
+	@Override
+	protected Principal getOrCreatePrincipal(Session session,
+			String principalName) throws RepositoryException {
+		UserManager um = ((JackrabbitSession) session).getUserManager();
+		Authorizable authorizable = um.getAuthorizable(principalName);
+		if (authorizable == null) {
+			groupPrefixes: for (String groupPrefix : groupPrefixes) {
+				if (principalName.startsWith(groupPrefix)) {
+					authorizable = um.createGroup(principalName);
+					log.info("Created group " + principalName);
+					break groupPrefixes;
 				}
-				if (log.isDebugEnabled())
-					log.debug("Added privileges " + privileges + " to "
-							+ groupName + " on " + path);
 			}
+			if (authorizable == null)
+				throw new ArgeoException("Authorizable " + principalName
+						+ " not found");
 		}
-		session.save();
+		return authorizable.getPrincipal();
 	}
 
-	public void setGroupPrivileges(Map<String, String> groupPrivileges) {
-		this.groupPrivileges = groupPrivileges;
+	public void setGroupPrefixes(List<String> groupsToCreate) {
+		this.groupPrefixes = groupsToCreate;
 	}
-
-	public void setRepository(Repository repository) {
-		this.repository = repository;
-	}
-
-	public void setSystemExecutor(Executor systemExecutor) {
-		this.systemExecutor = systemExecutor;
-	}
-
 }