X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeUserAdmin.java;h=436d30058839cb330d6471e67f277180cbbb8b19;hb=54e74b900b1c0f7b1de0def771de35e50a8d4071;hp=caadadefa8785054696476473892a90419b5262d;hpb=6decc943ce5bca1b57ef407b7e9c6bb6ad6f3c97;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java
index caadadefa..436d30058 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java
@@ -44,6 +44,7 @@ import org.argeo.osgi.useradmin.AbstractUserDirectory;
 import org.argeo.osgi.useradmin.AggregatingUserAdmin;
 import org.argeo.osgi.useradmin.LdapUserAdmin;
 import org.argeo.osgi.useradmin.LdifUserAdmin;
+import org.argeo.osgi.useradmin.OsUserDirectory;
 import org.argeo.osgi.useradmin.UserAdminConf;
 import org.argeo.osgi.useradmin.UserDirectory;
 import org.ietf.jgss.GSSCredential;
@@ -84,6 +85,8 @@ class NodeUserAdmin extends AggregatingUserAdmin implements ManagedServiceFactor
 	private Path nodeKeyTab = KernelUtils.getOsgiInstancePath(KernelConstants.NODE_KEY_TAB_PATH);
 	private GSSCredential acceptorCredentials;
 
+	private boolean singleUser = false;
+
 	public NodeUserAdmin(String systemRolesBaseDn) {
 		super(systemRolesBaseDn);
 		tmTracker = new ServiceTracker<>(bc, TransactionManager.class, null);
@@ -95,14 +98,27 @@ class NodeUserAdmin extends AggregatingUserAdmin implements ManagedServiceFactor
 		String uri = (String) properties.get(UserAdminConf.uri.name());
 		URI u;
 		try {
-			u = new URI(uri);
+			if (uri == null) {
+				String baseDn = (String) properties.get(UserAdminConf.baseDn.name());
+				u = KernelUtils.getOsgiInstanceUri(KernelConstants.DIR_NODE + '/' + baseDn + ".ldif");
+			} else
+				u = new URI(uri);
 		} catch (URISyntaxException e) {
 			throw new CmsException("Badly formatted URI " + uri, e);
 		}
 
 		// Create
-		AbstractUserDirectory userDirectory = u.getScheme().equals("ldap") ? new LdapUserAdmin(properties)
-				: new LdifUserAdmin(properties);
+		AbstractUserDirectory userDirectory;
+		if (UserAdminConf.SCHEME_LDAP.equals(u.getScheme())) {
+			userDirectory = new LdapUserAdmin(properties);
+		} else if (UserAdminConf.SCHEME_FILE.equals(u.getScheme())) {
+			userDirectory = new LdifUserAdmin(u, properties);
+		} else if (UserAdminConf.SCHEME_OS.equals(u.getScheme())) {
+			userDirectory = new OsUserDirectory(u, properties);
+			singleUser = true;
+		} else {
+			throw new CmsException("Unsupported scheme " + u.getScheme());
+		}
 		Object realm = userDirectory.getProperties().get(UserAdminConf.realm.name());
 		addUserDirectory(userDirectory);
 
@@ -268,6 +284,10 @@ class NodeUserAdmin extends AggregatingUserAdmin implements ManagedServiceFactor
 		return acceptorCredentials;
 	}
 
+	public boolean isSingleUser() {
+		return singleUser;
+	}
+
 	public final static Oid KERBEROS_OID;
 	static {
 		try {