X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FActivator.java;h=2e524b9d503935fc3a1ca45b2fd055b4286a0b65;hb=8a582781fa376ebcf66096dd6fb90232648b4682;hp=44922aced77eccb4a26f4d84623c3a23d07c2c98;hpb=e682de721bf27b2e92904c9dc789a3de2046aad1;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 44922aced..2e524b9d5 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
@@ -1,5 +1,6 @@
 package org.argeo.cms.internal.kernel;
 
+import java.awt.image.Kernel;
 import java.io.IOException;
 import java.net.URL;
 import java.nio.file.Files;
@@ -10,6 +11,8 @@ import java.util.Locale;
 
 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.node.ArgeoLogger;
 import org.argeo.node.NodeConstants;
@@ -17,20 +20,25 @@ import org.argeo.node.NodeDeployment;
 import org.argeo.node.NodeInstance;
 import org.argeo.node.NodeState;
 import org.argeo.util.LangUtils;
+import org.ietf.jgss.GSSCredential;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.log.LogReaderService;
+import org.osgi.service.useradmin.UserAdmin;
 
 /**
  * Activates the {@link Kernel} from the provided {@link BundleContext}. Gives
  * access to kernel information for the rest of the bundle (and only it)
  */
 public class Activator implements BundleActivator {
+	private final static Log log = LogFactory.getLog(Activator.class);
+
 	private static Activator instance;
 
 	private BundleContext bc;
+	// private CmsSecurity nodeSecurity;
 	private LogReaderService logReaderService;
 	// private ConfigurationAdmin configurationAdmin;
 
@@ -47,22 +55,25 @@ public class Activator implements BundleActivator {
 		// this.configurationAdmin = getService(ConfigurationAdmin.class);
 
 		try {
-			initSecurity();// must be first
+			// nodeSecurity = new CmsSecurity();
+			initSecurity();
 			initArgeoLogger();
 			initNode();
 		} catch (Exception e) {
-			e.printStackTrace();
-			throw new CmsException("Cannot initialize node", e);
+			log.error("## FATAL: CMS activator failed", e);
+			// throw new CmsException("Cannot initialize node", e);
 		}
 	}
 
 	private void initSecurity() {
 		if (System.getProperty(KernelConstants.JAAS_CONFIG_PROP) == null) {
-			URL url = getClass().getClassLoader().getResource(KernelConstants.JAAS_CONFIG);
-			// URL url =
-			// getClass().getClassLoader().getResource(KernelConstants.JAAS_CONFIG_IPA);
-			System.setProperty(KernelConstants.JAAS_CONFIG_PROP, url.toExternalForm());
+			String jaasConfig = KernelConstants.JAAS_CONFIG;
+			URL url = getClass().getClassLoader().getResource(jaasConfig);
+			// System.setProperty(KernelConstants.JAAS_CONFIG_PROP,
+			// url.toExternalForm());
+			KernelUtils.setJaasConfiguration(url);
 		}
+		// explicitly load JAAS configuration
 		Configuration.getConfiguration();
 	}
 
@@ -118,6 +129,16 @@ public class Activator implements BundleActivator {
 		return instance.nodeState;
 	}
 
+	public static GSSCredential getAcceptorCredentials() {
+		ServiceReference<UserAdmin> sr = instance.bc.getServiceReference(UserAdmin.class);
+		NodeUserAdmin userAdmin = (NodeUserAdmin) instance.bc.getService(sr);
+		return userAdmin.getAcceptorCredentials();
+	}
+
+	// static CmsSecurity getCmsSecurity() {
+	// return instance.nodeSecurity;
+	// }
+
 	public String[] getLocales() {
 		// TODO optimize?
 		List<Locale> locales = getNodeState().getLocales();