X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FActivator.java;h=bba8f2bbb519e08fc3843a3620f5e0c1fe32c80e;hb=0d46a59c2e2a704b617c1a665fa5155bd4e40682;hp=25746a48116b29f84930e93ea7a18272d1199412;hpb=54e74b900b1c0f7b1de0def771de35e50a8d4071;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java
index 25746a481..bba8f2bbb 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java
@@ -13,6 +13,7 @@ import javax.security.auth.login.Configuration;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
+import org.argeo.ident.IdentClient;
 import org.argeo.node.ArgeoLogger;
 import org.argeo.node.NodeConstants;
 import org.argeo.node.NodeDeployment;
@@ -26,6 +27,7 @@ import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.log.LogReaderService;
 import org.osgi.service.useradmin.UserAdmin;
+import org.osgi.util.tracker.ServiceTracker;
 
 /**
  * Activates the kernel. Gives access to kernel information for the rest of the
@@ -37,29 +39,33 @@ public class Activator implements BundleActivator {
 	private static Activator instance;
 
 	private BundleContext bc;
-	// private CmsSecurity nodeSecurity;
+
 	private LogReaderService logReaderService;
-	// private ConfigurationAdmin configurationAdmin;
 
 	private NodeLogger logger;
 	private CmsState nodeState;
 	private CmsDeployment nodeDeployment;
 	private CmsInstance nodeInstance;
 
+	private ServiceTracker<UserAdmin, NodeUserAdmin> userAdminSt;
+
 	@Override
 	public void start(BundleContext bundleContext) throws Exception {
 		Runtime.getRuntime().addShutdownHook(new CmsShutdown());
 		instance = this;
 		this.bc = bundleContext;
 		this.logReaderService = getService(LogReaderService.class);
-		// this.configurationAdmin = getService(ConfigurationAdmin.class);
 
 		try {
-			// nodeSecurity = new CmsSecurity();
 			initSecurity();
 			initArgeoLogger();
 			initNode();
-		} catch (Exception e) {
+
+			userAdminSt = new ServiceTracker<>(instance.bc, UserAdmin.class, null);
+			userAdminSt.open();
+			if (log.isTraceEnabled())
+				log.trace("Kernel bundle started");
+		} catch (Throwable e) {
 			log.error("## FATAL: CMS activator failed", e);
 		}
 	}
@@ -92,16 +98,6 @@ public class Activator implements BundleActivator {
 	}
 
 	private void initArgeoLogger() {
-		// Jetty
-		// disable integration of Jetty logging with SLF4J
-		// in order to avoid chicken and egg problems
-		// org.eclipse.jetty.util.log.Log.setLog(new StdErrLog());
-		// org.eclipse.jetty.util.log.Logger jettyLog =
-		// org.eclipse.jetty.util.log.Log.getLog();
-		// if (jettyLog != null) {
-		// jettyLog.warn("TEST JETTY LOG", new Object[0]);
-		// }
-
 		logger = new NodeLogger(logReaderService);
 		bc.registerService(ArgeoLogger.class, logger, null);
 	}
@@ -140,6 +136,9 @@ public class Activator implements BundleActivator {
 			if (nodeState != null)
 				nodeState.shutdown();
 
+			if (userAdminSt != null)
+				userAdminSt.close();
+
 			instance = null;
 			this.bc = null;
 			this.logReaderService = null;
@@ -168,10 +167,36 @@ public class Activator implements BundleActivator {
 		return getNodeUserAdmin().isSingleUser();
 	}
 
+	public static UserAdmin getUserAdmin() {
+		return (UserAdmin) getNodeUserAdmin();
+	}
+
+	public static String getHttpProxySslHeader() {
+		return KernelUtils.getFrameworkProp(NodeConstants.HTTP_PROXY_SSL_DN);
+	}
+
+	public static IdentClient getIdentClient(String remoteAddr) {
+		if (!IdentClient.isDefaultAuthdPassphraseFileAvailable())
+			return null;
+		// TODO make passphrase more configurable
+		return new IdentClient(remoteAddr);
+	}
+
 	private static NodeUserAdmin getNodeUserAdmin() {
-		ServiceReference<UserAdmin> sr = instance.bc.getServiceReference(UserAdmin.class);
-		NodeUserAdmin userAdmin = (NodeUserAdmin) instance.bc.getService(sr);
-		return userAdmin;
+		NodeUserAdmin res;
+		try {
+			res = instance.userAdminSt.waitForService(60000);
+		} catch (InterruptedException e) {
+			throw new CmsException("Cannot retrieve Node user admin", e);
+		}
+		if (res == null)
+			throw new CmsException("No Node user admin found");
+
+		return res;
+		// ServiceReference<UserAdmin> sr =
+		// instance.bc.getServiceReference(UserAdmin.class);
+		// NodeUserAdmin userAdmin = (NodeUserAdmin) instance.bc.getService(sr);
+		// return userAdmin;
 
 	}