X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FCmsUserAdmin.java;h=e6f903d393179003f2862331a9ab131f0133de11;hb=feddb4be70a8304dd4a533efee6e14c22691b500;hp=4f0ba10aad03d6432d94603353f26e343adc5a76;hpb=81d9084e2c9fd9d33ca1d864171d28f9564647d8;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsUserAdmin.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsUserAdmin.java
index 4f0ba10aa..e6f903d39 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsUserAdmin.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsUserAdmin.java
@@ -1,6 +1,5 @@
 package org.argeo.cms.internal.runtime;
 
-import java.io.File;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.URI;
@@ -8,6 +7,7 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
 import java.util.Dictionary;
@@ -25,19 +25,18 @@ import javax.security.auth.kerberos.KerberosPrincipal;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
 
-import org.apache.commons.io.FileUtils;
 import org.argeo.api.cms.CmsAuth;
 import org.argeo.api.cms.CmsConstants;
 import org.argeo.api.cms.CmsLog;
 import org.argeo.api.cms.CmsState;
+import org.argeo.api.cms.directory.UserDirectory;
+import org.argeo.api.cms.transaction.WorkControl;
+import org.argeo.api.cms.transaction.WorkTransaction;
 import org.argeo.cms.CmsDeployProperty;
-import org.argeo.osgi.useradmin.AggregatingUserAdmin;
-import org.argeo.osgi.useradmin.DirectoryUserAdmin;
-import org.argeo.osgi.useradmin.UserDirectory;
-import org.argeo.util.directory.DirectoryConf;
-import org.argeo.util.naming.dns.DnsBrowser;
-import org.argeo.util.transaction.WorkControl;
-import org.argeo.util.transaction.WorkTransaction;
+import org.argeo.cms.dns.DnsBrowser;
+import org.argeo.cms.osgi.useradmin.AggregatingUserAdmin;
+import org.argeo.cms.osgi.useradmin.DirectoryUserAdmin;
+import org.argeo.cms.runtime.DirectoryConf;
 import org.ietf.jgss.GSSCredential;
 import org.ietf.jgss.GSSException;
 import org.ietf.jgss.GSSManager;
@@ -66,7 +65,7 @@ public class CmsUserAdmin extends AggregatingUserAdmin {
 	private CmsState cmsState;
 
 	public CmsUserAdmin() {
-		super(CmsConstants.ROLES_BASEDN, CmsConstants.TOKENS_BASEDN);
+		super(CmsConstants.SYSTEM_ROLES_BASEDN, CmsConstants.TOKENS_BASEDN);
 	}
 
 	public void start() {
@@ -89,42 +88,42 @@ public class CmsUserAdmin extends AggregatingUserAdmin {
 
 	protected List<Dictionary<String, Object>> getUserDirectoryConfigs() {
 		List<Dictionary<String, Object>> res = new ArrayList<>();
-		File nodeBaseDir = cmsState.getDataPath(KernelConstants.DIR_NODE).toFile();
+		Path nodeBase = cmsState.getDataPath(KernelConstants.DIR_PRIVATE);
 		List<String> uris = new ArrayList<>();
 
 		// node roles
 		String nodeRolesUri = null;// getFrameworkProp(CmsConstants.ROLES_URI);
-		String baseNodeRoleDn = CmsConstants.ROLES_BASEDN;
-		if (nodeRolesUri == null) {
+		String baseNodeRoleDn = CmsConstants.SYSTEM_ROLES_BASEDN;
+		if (nodeRolesUri == null && nodeBase != null) {
 			nodeRolesUri = baseNodeRoleDn + ".ldif";
-			File nodeRolesFile = new File(nodeBaseDir, nodeRolesUri);
-			if (!nodeRolesFile.exists())
+			Path nodeRolesFile = nodeBase.resolve(nodeRolesUri);
+			if (!Files.exists(nodeRolesFile))
 				try {
-					FileUtils.copyInputStreamToFile(CmsUserAdmin.class.getResourceAsStream(baseNodeRoleDn + ".ldif"),
-							nodeRolesFile);
+					Files.copy(CmsUserAdmin.class.getResourceAsStream(baseNodeRoleDn + ".ldif"), nodeRolesFile);
 				} catch (IOException e) {
 					throw new RuntimeException("Cannot copy demo resource", e);
 				}
 			// nodeRolesUri = nodeRolesFile.toURI().toString();
 		}
-		uris.add(nodeRolesUri);
+		if (nodeRolesUri != null)
+			uris.add(nodeRolesUri);
 
 		// node tokens
 		String nodeTokensUri = null;// getFrameworkProp(CmsConstants.TOKENS_URI);
 		String baseNodeTokensDn = CmsConstants.TOKENS_BASEDN;
-		if (nodeTokensUri == null) {
+		if (nodeTokensUri == null && nodeBase != null) {
 			nodeTokensUri = baseNodeTokensDn + ".ldif";
-			File nodeTokensFile = new File(nodeBaseDir, nodeTokensUri);
-			if (!nodeTokensFile.exists())
+			Path nodeTokensFile = nodeBase.resolve(nodeTokensUri);
+			if (!Files.exists(nodeTokensFile))
 				try {
-					FileUtils.copyInputStreamToFile(CmsUserAdmin.class.getResourceAsStream(baseNodeTokensDn + ".ldif"),
-							nodeTokensFile);
+					Files.copy(CmsUserAdmin.class.getResourceAsStream(baseNodeTokensDn + ".ldif"), nodeTokensFile);
 				} catch (IOException e) {
 					throw new RuntimeException("Cannot copy demo resource", e);
 				}
 			// nodeRolesUri = nodeRolesFile.toURI().toString();
 		}
-		uris.add(nodeTokensUri);
+		if (nodeTokensUri != null)
+			uris.add(nodeTokensUri);
 
 		// Business roles
 //		String userAdminUris = getFrameworkProp(CmsConstants.USERADMIN_URIS);
@@ -136,19 +135,17 @@ public class CmsUserAdmin extends AggregatingUserAdmin {
 			uris.add(userAdminUri);
 		}
 
-		if (uris.size() == 0) {
+		if (uris.size() == 0 && nodeBase != null) {
 			// TODO put this somewhere else
 			String demoBaseDn = "dc=example,dc=com";
 			String userAdminUri = demoBaseDn + ".ldif";
-			File businessRolesFile = new File(nodeBaseDir, userAdminUri);
-			File systemRolesFile = new File(nodeBaseDir, "ou=roles,ou=node.ldif");
-			if (!businessRolesFile.exists())
+			Path businessRolesFile = nodeBase.resolve(userAdminUri);
+			Path systemRolesFile = nodeBase.resolve("ou=roles,ou=node.ldif");
+			if (!Files.exists(businessRolesFile))
 				try {
-					FileUtils.copyInputStreamToFile(CmsUserAdmin.class.getResourceAsStream(demoBaseDn + ".ldif"),
-							businessRolesFile);
-					if (!systemRolesFile.exists())
-						FileUtils.copyInputStreamToFile(
-								CmsUserAdmin.class.getResourceAsStream("example-ou=roles,ou=node.ldif"),
+					Files.copy(CmsUserAdmin.class.getResourceAsStream(demoBaseDn + ".ldif"), businessRolesFile);
+					if (!Files.exists(systemRolesFile))
+						Files.copy(CmsUserAdmin.class.getResourceAsStream("example-ou=roles,ou=node.ldif"),
 								systemRolesFile);
 				} catch (IOException e) {
 					throw new RuntimeException("Cannot copy demo resources", e);
@@ -168,20 +165,25 @@ public class CmsUserAdmin extends AggregatingUserAdmin {
 							"URI " + uri + " must have a path in order to determine base DN");
 				if (u.getScheme() == null) {
 					if (uri.startsWith("/") || uri.startsWith("./") || uri.startsWith("../"))
-						u = new File(uri).getCanonicalFile().toURI();
+						u = Paths.get(uri).toRealPath().toUri();
 					else if (!uri.contains("/")) {
 						// u = KernelUtils.getOsgiInstanceUri(KernelConstants.DIR_NODE + '/' + uri);
 						u = new URI(uri);
 					} else
 						throw new IllegalArgumentException("Cannot interpret " + uri + " as an uri");
 				} else if (u.getScheme().equals(DirectoryConf.SCHEME_FILE)) {
-					u = new File(u).getCanonicalFile().toURI();
+					u = Paths.get(u).toRealPath().toUri();
 				}
 			} catch (Exception e) {
 				throw new RuntimeException("Cannot interpret " + uri + " as an uri", e);
 			}
-			Dictionary<String, Object> properties = DirectoryConf.uriAsProperties(u.toString());
-			res.add(properties);
+
+			try {
+				Dictionary<String, Object> properties = DirectoryConf.uriAsProperties(u.toString());
+				res.add(properties);
+			} catch (Exception e) {
+				log.error("Cannot load user directory " + u, e);
+			}
 		}
 
 		return res;
@@ -194,7 +196,7 @@ public class CmsUserAdmin extends AggregatingUserAdmin {
 		try {
 			if (uri == null) {
 				String baseDn = (String) properties.get(DirectoryConf.baseDn.name());
-				u = KernelUtils.getOsgiInstanceUri(KernelConstants.DIR_NODE + '/' + baseDn + ".ldif");
+				u = KernelUtils.getOsgiInstanceUri(KernelConstants.DIR_PRIVATE + '/' + baseDn + ".ldif");
 			} else if (realm != null) {
 				u = null;
 			} else {
@@ -217,14 +219,14 @@ public class CmsUserAdmin extends AggregatingUserAdmin {
 //		} else {
 //			throw new IllegalArgumentException("Unsupported scheme " + u.getScheme());
 //		}
-		String basePath = userDirectory.getContext();
+		String basePath = userDirectory.getBase();
 
 		addUserDirectory(userDirectory);
 		if (isSystemRolesBaseDn(basePath)) {
 			addStandardSystemRoles();
 		}
 		if (log.isDebugEnabled()) {
-			log.debug("User directory " + userDirectory.getContext() + (u != null ? " [" + u.getScheme() + "]" : "")
+			log.debug("User directory " + userDirectory.getBase() + (u != null ? " [" + u.getScheme() + "]" : "")
 					+ " enabled." + (realm != null ? " " + realm + " realm." : ""));
 		}
 		return userDirectory;