X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeSecurity.java;h=83216d0484a96a896d6c4f95e1473bcce3ce1efe;hb=08fac35eeedb151c2fd1cc85ed4a36adf66e02fc;hp=7c176ea89552fe1bd8a414be6c87d81a7c03a707;hpb=63446804f4954bfedd50d8c692bde0fab13aa1ec;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeSecurity.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeSecurity.java
index 7c176ea89..83216d048 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeSecurity.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeSecurity.java
@@ -1,17 +1,29 @@
 package org.argeo.cms.internal.kernel;
 
+import java.io.File;
+import java.io.IOException;
+
 import javax.jcr.RepositoryException;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
+import org.argeo.cms.KernelHeader;
+import org.argeo.cms.internal.useradmin.SimpleJcrSecurityModel;
+import org.argeo.cms.internal.useradmin.jackrabbit.JackrabbitUserAdminService;
+import org.argeo.osgi.useradmin.AbstractLdapUserAdmin;
+import org.argeo.osgi.useradmin.LdapUserAdmin;
+import org.argeo.osgi.useradmin.LdifUserAdmin;
+import org.argeo.security.OsAuthenticationToken;
 import org.argeo.security.UserAdminService;
 import org.argeo.security.core.InternalAuthentication;
 import org.argeo.security.core.InternalAuthenticationProvider;
-import org.argeo.security.jcr.SimpleJcrSecurityModel;
-import org.argeo.security.jcr.jackrabbit.JackrabbitUserAdminService;
+import org.argeo.security.core.OsAuthenticationProvider;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.useradmin.Role;
+import org.osgi.service.useradmin.UserAdmin;
 import org.springframework.security.authentication.AnonymousAuthenticationProvider;
 import org.springframework.security.authentication.AnonymousAuthenticationToken;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -26,52 +38,94 @@ class NodeSecurity implements AuthenticationManager {
 
 	private final BundleContext bundleContext;
 
+	private final OsAuthenticationProvider osAuth;
 	private final InternalAuthenticationProvider internalAuth;
 	private final AnonymousAuthenticationProvider anonymousAuth;
-	private final JackrabbitUserAdminService jackrabbitUserAdmin;
+	private final JackrabbitUserAdminService userAdminService;
+	private final NodeUserAdmin userAdmin;
 
 	private ServiceRegistration<AuthenticationManager> authenticationManagerReg;
-	private ServiceRegistration<UserAdminService> userAdminReg;
+	private ServiceRegistration<UserAdminService> userAdminServiceReg;
 	private ServiceRegistration<UserDetailsManager> userDetailsManagerReg;
 
+	private ServiceRegistration<UserAdmin> userAdminReg;
+
 	public NodeSecurity(BundleContext bundleContext, JackrabbitNode node)
 			throws RepositoryException {
 		this.bundleContext = bundleContext;
 
+		osAuth = new OsAuthenticationProvider();
 		internalAuth = new InternalAuthenticationProvider(
-				KernelConstants.DEFAULT_SECURITY_KEY);
+				Activator.getSystemKey());
 		anonymousAuth = new AnonymousAuthenticationProvider(
-				KernelConstants.DEFAULT_SECURITY_KEY);
+				Activator.getSystemKey());
 
 		// user admin
-		jackrabbitUserAdmin = new JackrabbitUserAdminService();
-		jackrabbitUserAdmin.setRepository(node);
-		jackrabbitUserAdmin.setSecurityModel(new SimpleJcrSecurityModel());
-		jackrabbitUserAdmin.init();
+		userAdminService = new JackrabbitUserAdminService();
+		userAdminService.setRepository(node);
+		userAdminService.setSecurityModel(new SimpleJcrSecurityModel());
+		userAdminService.init();
+
+		userAdmin = new NodeUserAdmin();
+
+		String baseDn = "dc=example,dc=com";
+		String userAdminUri = KernelUtils
+				.getFrameworkProp(KernelConstants.USERADMIN_URI);
+		if (userAdminUri == null)
+			userAdminUri = getClass().getResource(baseDn + ".ldif").toString();
+
+		AbstractLdapUserAdmin businessRoles;
+		if (userAdminUri.startsWith("ldap"))
+			businessRoles = new LdapUserAdmin(userAdminUri);
+		else {
+			businessRoles = new LdifUserAdmin(userAdminUri);
+		}
+		businessRoles.init();
+		userAdmin.addUserAdmin(baseDn, businessRoles);
+
+		File osgiInstanceDir = KernelUtils.getOsgiInstanceDir();
+		File homeDir = new File(osgiInstanceDir, "node");
+
+		String baseNodeRoleDn = KernelConstants.ROLES_BASEDN;
+		File nodeRolesFile = new File(homeDir, baseNodeRoleDn + ".ldif");
+		try {
+			FileUtils.copyInputStreamToFile(
+					getClass().getResourceAsStream("demo.ldif"), nodeRolesFile);
+		} catch (IOException e) {
+			throw new CmsException("Cannot copy demo resource", e);
+		}
+		LdifUserAdmin nodeRoles = new LdifUserAdmin(nodeRolesFile.toURI()
+				.toString());
+		nodeRoles.setExternalRoles(userAdmin);
+		nodeRoles.init();
+		// nodeRoles.createRole(KernelHeader.ROLE_ADMIN, Role.GROUP);
+		userAdmin.addUserAdmin(baseNodeRoleDn, nodeRoles);
 
 	}
 
 	public void publish() {
 		authenticationManagerReg = bundleContext.registerService(
 				AuthenticationManager.class, this, null);
-		userAdminReg = bundleContext.registerService(UserAdminService.class,
-				jackrabbitUserAdmin, null);
+		userAdminServiceReg = bundleContext.registerService(
+				UserAdminService.class, userAdminService, null);
 		userDetailsManagerReg = bundleContext.registerService(
-				UserDetailsManager.class, jackrabbitUserAdmin, null);
-		// userAdminReg =
-		// bundleContext.registerService(UserDetailsService.class,
-		// jackrabbitUserAdmin, null);
+				UserDetailsManager.class, userAdminService, null);
+		userAdminReg = bundleContext.registerService(UserAdmin.class,
+				userAdmin, null);
 	}
 
 	void destroy() {
 		try {
-			jackrabbitUserAdmin.destroy();
+			userAdminService.destroy();
 		} catch (RepositoryException e) {
 			log.error("Error while destroying Jackrabbit useradmin");
 		}
 		userDetailsManagerReg.unregister();
-		userAdminReg.unregister();
+		userAdminServiceReg.unregister();
 		authenticationManagerReg.unregister();
+
+		// userAdmin.destroy();
+		userAdminReg.unregister();
 	}
 
 	@Override
@@ -83,7 +137,9 @@ class NodeSecurity implements AuthenticationManager {
 		else if (authentication instanceof AnonymousAuthenticationToken)
 			auth = anonymousAuth.authenticate(authentication);
 		else if (authentication instanceof UsernamePasswordAuthenticationToken)
-			auth = jackrabbitUserAdmin.authenticate(authentication);
+			auth = userAdminService.authenticate(authentication);
+		else if (authentication instanceof OsAuthenticationToken)
+			auth = osAuth.authenticate(authentication);
 		if (auth == null)
 			throw new CmsException("Could not authenticate " + authentication);
 		return auth;