X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeUserAdmin.java;h=f00c3c769f5ef00c6a4b37f0518bacb6f9d3b6bb;hb=1b09095425a7c067c097eb91bed5b4a4a33f0dc8;hp=077a1f8a7286bf76568fb3547ab53e791e75d258;hpb=35507e18257f2e9f59842ba5120fcd3f19c4cf4d;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 077a1f8a7..f00c3c769 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
@@ -29,14 +29,12 @@ import javax.transaction.TransactionManager;
 
 import org.apache.commons.httpclient.auth.AuthPolicy;
 import org.apache.commons.httpclient.auth.CredentialsProvider;
-import org.apache.commons.httpclient.cookie.CookiePolicy;
 import org.apache.commons.httpclient.params.DefaultHttpParams;
 import org.apache.commons.httpclient.params.HttpMethodParams;
 import org.apache.commons.httpclient.params.HttpParams;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
-import org.argeo.cms.internal.http.NodeHttp;
 import org.argeo.cms.internal.http.client.HttpCredentialProvider;
 import org.argeo.cms.internal.http.client.SpnegoAuthScheme;
 import org.argeo.naming.DnsBrowser;
@@ -63,9 +61,6 @@ import org.osgi.service.useradmin.Authorization;
 import org.osgi.service.useradmin.UserAdmin;
 import org.osgi.util.tracker.ServiceTracker;
 
-import bitronix.tm.BitronixTransactionManager;
-import bitronix.tm.resource.ehcache.EhCacheXAResourceProducer;
-
 /**
  * Aggregates multiple {@link UserDirectory} and integrates them with system
  * roles.
@@ -81,13 +76,14 @@ class NodeUserAdmin extends AggregatingUserAdmin implements ManagedServiceFactor
 
 	// JTA
 	private final ServiceTracker<TransactionManager, TransactionManager> tmTracker;
-	private final String cacheName = UserDirectory.class.getName();
+	// private final String cacheName = UserDirectory.class.getName();
 
 	// GSS API
 	private Path nodeKeyTab = KernelUtils.getOsgiInstancePath(KernelConstants.NODE_KEY_TAB_PATH);
 	private GSSCredential acceptorCredentials;
 
 	private boolean singleUser = false;
+	private boolean systemRolesAvailable = false;
 
 	public NodeUserAdmin(String systemRolesBaseDn) {
 		super(systemRolesBaseDn);
@@ -139,7 +135,13 @@ class NodeUserAdmin extends AggregatingUserAdmin implements ManagedServiceFactor
 			log.debug("User directory " + userDirectory.getBaseDn() + " [" + u.getScheme() + "] enabled."
 					+ (realm != null ? " " + realm + " realm." : ""));
 
-		if (!isSystemRolesBaseDn(baseDn)) {
+		if (isSystemRolesBaseDn(baseDn))
+			systemRolesAvailable = true;
+
+		// start publishing only when system roles are available
+		if (systemRolesAvailable) {
+			// The list of baseDns is published as properties
+			// TODO clients should rather reference USerDirectory services
 			if (userAdminReg != null)
 				userAdminReg.unregister();
 			// register self as main user admin
@@ -163,14 +165,12 @@ class NodeUserAdmin extends AggregatingUserAdmin implements ManagedServiceFactor
 	public String getName() {
 		return "Node User Admin";
 	}
-	
-	
 
 	@Override
 	protected void addAbstractSystemRoles(Authorization rawAuthorization, Set<String> sysRoles) {
-		if(rawAuthorization.getName()==null) {
+		if (rawAuthorization.getName() == null) {
 			sysRoles.add(NodeConstants.ROLE_ANONYMOUS);
-		}else {
+		} else {
 			sysRoles.add(NodeConstants.ROLE_USER);
 		}
 	}
@@ -181,8 +181,8 @@ class NodeUserAdmin extends AggregatingUserAdmin implements ManagedServiceFactor
 		if (tm == null)
 			throw new CmsException("A JTA transaction manager must be available.");
 		userDirectory.setTransactionManager(tm);
-		if (tmTracker.getService() instanceof BitronixTransactionManager)
-			EhCacheXAResourceProducer.registerXAResource(cacheName, userDirectory.getXaResource());
+//		if (tmTracker.getService() instanceof BitronixTransactionManager)
+//			EhCacheXAResourceProducer.registerXAResource(cacheName, userDirectory.getXaResource());
 
 		Object realm = userDirectory.getProperties().get(UserAdminConf.realm.name());
 		if (realm != null) {
@@ -216,14 +216,14 @@ class NodeUserAdmin extends AggregatingUserAdmin implements ManagedServiceFactor
 			// schemes.add(AuthPolicy.BASIC);// incompatible with Basic
 			params.setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, schemes);
 			params.setParameter(CredentialsProvider.PROVIDER, new HttpCredentialProvider());
-			params.setParameter(HttpMethodParams.COOKIE_POLICY, CookiePolicy.BROWSER_COMPATIBILITY);
+			params.setParameter(HttpMethodParams.COOKIE_POLICY, KernelConstants.COOKIE_POLICY_BROWSER_COMPATIBILITY);
 			// params.setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY);
 		}
 	}
 
 	protected void preDestroy(AbstractUserDirectory userDirectory) {
-		if (tmTracker.getService() instanceof BitronixTransactionManager)
-			EhCacheXAResourceProducer.unregisterXAResource(cacheName, userDirectory.getXaResource());
+//		if (tmTracker.getService() instanceof BitronixTransactionManager)
+//			EhCacheXAResourceProducer.unregisterXAResource(cacheName, userDirectory.getXaResource());
 
 		Object realm = userDirectory.getProperties().get(UserAdminConf.realm.name());
 		if (realm != null) {