import org.apache.commons.httpclient.params.HttpParams;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.argeo.api.NodeConstants;
import org.argeo.cms.CmsException;
import org.argeo.cms.internal.http.client.HttpCredentialProvider;
import org.argeo.cms.internal.http.client.SpnegoAuthScheme;
import org.argeo.naming.DnsBrowser;
-import org.argeo.node.NodeConstants;
import org.argeo.osgi.useradmin.AbstractUserDirectory;
import org.argeo.osgi.useradmin.AggregatingUserAdmin;
import org.argeo.osgi.useradmin.LdapUserAdmin;
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.
// OSGi
private Map<String, LdapName> pidToBaseDn = new HashMap<>();
private Map<String, ServiceRegistration<UserDirectory>> pidToServiceRegs = new HashMap<>();
- private ServiceRegistration<UserAdmin> userAdminReg;
+// private ServiceRegistration<UserAdmin> userAdminReg;
// 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;
+// private boolean systemRolesAvailable = false;
- public NodeUserAdmin(String systemRolesBaseDn) {
- super(systemRolesBaseDn);
+ public NodeUserAdmin(String systemRolesBaseDn, String tokensBaseDn) {
+ super(systemRolesBaseDn, tokensBaseDn);
tmTracker = new ServiceTracker<>(bc, TransactionManager.class, null);
tmTracker.open();
}
log.debug("User directory " + userDirectory.getBaseDn() + " [" + u.getScheme() + "] enabled."
+ (realm != null ? " " + realm + " realm." : ""));
- 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
- Dictionary<String, Object> userAdminregProps = currentState();
+ if (isSystemRolesBaseDn(baseDn)) {
+ // publishes only when system roles are available
+ Dictionary<String, Object> userAdminregProps = new Hashtable<>();
userAdminregProps.put(NodeConstants.CN, NodeConstants.DEFAULT);
userAdminregProps.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE);
- userAdminReg = bc.registerService(UserAdmin.class, this, userAdminregProps);
+ bc.registerService(UserAdmin.class, this, userAdminregProps);
}
+
+// 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
+// Dictionary<String, Object> userAdminregProps = currentState();
+// userAdminregProps.put(NodeConstants.CN, NodeConstants.DEFAULT);
+// userAdminregProps.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE);
+// userAdminReg = bc.registerService(UserAdmin.class, this, userAdminregProps);
+// }
}
@Override
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) {
}
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) {
boolean consistentIp = localhost.getHostAddress().equals(ipfromDns);
String kerberosDomain = dnsBrowser.getRecord("_kerberos." + dnsZone, "TXT");
if (consistentIp && kerberosDomain != null && kerberosDomain.equals(realm) && Files.exists(nodeKeyTab)) {
- return NodeHttp.DEFAULT_SERVICE + "/" + hostname + "@" + kerberosDomain;
+ return KernelConstants.DEFAULT_KERBEROS_SERVICE + "/" + hostname + "@" + kerberosDomain;
} else
return null;
} catch (Exception e) {