X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FActivator.java;h=1efc9dc66474953221194974c0044558e163514b;hb=5b5c2b97eee9edd037e198acadf8b416a973863f;hp=3546647dda2f79355dec99deb42095c4caa60dd9;hpb=b4c772a263e0f19f6c283dbbb87d04794072b284;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 3546647dd..1efc9dc66 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,140 +1,153 @@ package org.argeo.cms.internal.kernel; +import java.awt.image.Kernel; import java.io.IOException; import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.Dictionary; -import java.util.Hashtable; import java.util.List; 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.ArgeoLogger; import org.argeo.cms.CmsException; +import org.argeo.node.ArgeoLogger; import org.argeo.node.NodeConstants; +import org.argeo.node.NodeDeployment; +import org.argeo.node.NodeInstance; import org.argeo.node.NodeState; -import org.argeo.node.RepoConf; 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.cm.Configuration; -import org.osgi.service.cm.ConfigurationAdmin; -import org.osgi.service.cm.ManagedService; -import org.osgi.service.condpermadmin.ConditionalPermissionAdmin; 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 { - // public final static String SYSTEM_KEY_PROPERTY = - // "argeo.security.systemKey"; - private final Log log = LogFactory.getLog(Activator.class); - - // private final static String systemKey; - // static { - // System.setProperty(SYSTEM_KEY_PROPERTY, systemKey); - // } + private final static Log log = LogFactory.getLog(Activator.class); - // private static Kernel kernel; private static Activator instance; private BundleContext bc; - private ConditionalPermissionAdmin permissionAdmin; + // private CmsSecurity nodeSecurity; private LogReaderService logReaderService; - private ConfigurationAdmin configurationAdmin; + // private ConfigurationAdmin configurationAdmin; private NodeLogger logger; private CmsState nodeState; + private CmsDeployment nodeDeployment; + private CmsInstance nodeInstance; @Override public void start(BundleContext bundleContext) throws Exception { - // try { - // kernel = new Kernel(); - // kernel.init(); - // } catch (Exception e) { - // log.error("Cannot boot kernel", e); - // } - + Runtime.getRuntime().addShutdownHook(new CmsShutdown()); instance = this; this.bc = bundleContext; - this.permissionAdmin = getService(ConditionalPermissionAdmin.class); this.logReaderService = getService(LogReaderService.class); - this.configurationAdmin = getService(ConfigurationAdmin.class); - - initSecurity();// must be first - initArgeoLogger(); - initNodeState(); + // this.configurationAdmin = getService(ConfigurationAdmin.class); + + try { + // nodeSecurity = new CmsSecurity(); + initSecurity(); + initArgeoLogger(); + initNode(); + } catch (Exception e) { + log.error("## FATAL: CMS activator failed", e); + } } private void initSecurity() { - URL url = getClass().getClassLoader().getResource(KernelConstants.JAAS_CONFIG); - System.setProperty("java.security.auth.login.config", url.toExternalForm()); + if (System.getProperty(KernelConstants.JAAS_CONFIG_PROP) == null) { + 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(); + + // ConditionalPermissionAdmin permissionAdmin = bc + // .getService(bc.getServiceReference(ConditionalPermissionAdmin.class)); + // ConditionalPermissionUpdate update = + // permissionAdmin.newConditionalPermissionUpdate(); + // // Self + // update.getConditionalPermissionInfos() + // .add(permissionAdmin.newConditionalPermissionInfo(null, + // new ConditionInfo[] { + // new ConditionInfo(BundleLocationCondition.class.getName(), new + // String[] { "*" }) }, + // new PermissionInfo[] { new + // PermissionInfo(AllPermission.class.getName(), null, null) }, + // ConditionalPermissionInfo.ALLOW)); + // } private void initArgeoLogger() { - logger = new NodeLogger(logReaderService); + // 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]); + // } - // register + logger = new NodeLogger(logReaderService); bc.registerService(ArgeoLogger.class, logger, null); } - private void initNodeState() throws IOException { - nodeState = new CmsState(); - - Object cn; - Configuration nodeConf = configurationAdmin.getConfiguration(NodeConstants.NODE_STATE_PID); - Dictionary props = nodeConf.getProperties(); - if (props == null) { - if (log.isDebugEnabled()) - log.debug("Clean node state"); - Dictionary envProps = getStatePropertiesFromEnvironment(); - // Use the UUID of the first framework run as state UUID - cn = KernelUtils.getFrameworkProp(Constants.FRAMEWORK_UUID); - envProps.put(NodeConstants.CN, cn); - nodeConf.update(envProps); + private void initNode() throws IOException { + // Node state + Path stateUuidPath = bc.getDataFile("stateUuid").toPath(); + String stateUuid; + if (Files.exists(stateUuidPath)) { + stateUuid = Files.readAllLines(stateUuidPath).get(0); } else { - // Check if state is in line with environment - Dictionary envProps = getStatePropertiesFromEnvironment(); - for (String key : LangUtils.keys(envProps)) { - Object envValue = envProps.get(key); - Object storedValue = props.get(key); - if (storedValue == null) - throw new CmsException("No state value for env " + key + "=" + envValue - + ", please clean the OSGi configuration."); - if (!storedValue.equals(envValue)) - throw new CmsException("State value for " + key + "=" + storedValue - + " is different from env value =" + envValue + ", please clean the OSGi configuration."); - } - cn = props.get(NodeConstants.CN); - if (cn == null) - throw new CmsException("No state UUID available"); + stateUuid = bc.getProperty(Constants.FRAMEWORK_UUID); + Files.write(stateUuidPath, stateUuid.getBytes()); } - - Dictionary regProps = LangUtils.init(Constants.SERVICE_PID, NodeConstants.NODE_STATE_PID); - regProps.put(NodeConstants.CN, cn); - bc.registerService(LangUtils.names(NodeState.class, ManagedService.class), nodeState, regProps); - + nodeState = new CmsState(stateUuid); + Dictionary regProps = LangUtils.dico(Constants.SERVICE_PID, NodeConstants.NODE_STATE_PID); + regProps.put(NodeConstants.CN, stateUuid); + bc.registerService(NodeState.class, nodeState, regProps); + + // Node deployment + nodeDeployment = new CmsDeployment(); + bc.registerService(NodeDeployment.class, nodeDeployment, null); + + // Node instance + nodeInstance = new CmsInstance(); + bc.registerService(NodeInstance.class, nodeInstance, null); } @Override public void stop(BundleContext bundleContext) throws Exception { - nodeState.shutdown(); - - instance = null; - this.bc = null; - this.permissionAdmin = null; - this.logReaderService = null; - this.configurationAdmin = null; - - // if (kernel != null) { - // kernel.destroy(); - // kernel = null; - // } - + try { + if (nodeInstance != null) + nodeInstance.shutdown(); + if (nodeDeployment != null) + nodeDeployment.shutdown(); + if (nodeState != null) + nodeState.shutdown(); + + instance = null; + this.bc = null; + this.logReaderService = null; + // this.configurationAdmin = null; + } catch (Exception e) { + log.error("CMS activator shutdown failed", e); + } } private T getService(Class clazz) { @@ -144,30 +157,19 @@ public class Activator implements BundleActivator { return bc.getService(sr); } - protected Dictionary getStatePropertiesFromEnvironment() { - Hashtable props = new Hashtable<>(); - // i18n - copyFrameworkProp(NodeConstants.I18N_DEFAULT_LOCALE, props); - copyFrameworkProp(NodeConstants.I18N_LOCALES, props); - // user admin - copyFrameworkProp(NodeConstants.ROLES_URI, props); - copyFrameworkProp(NodeConstants.USERADMIN_URIS, props); - // data - for (RepoConf repoConf : RepoConf.values()) - copyFrameworkProp(NodeConstants.NODE_REPO_PROP_PREFIX + repoConf.name(), props); - // TODO add other environment sources - return props; + public static NodeState getNodeState() { + return instance.nodeState; } - private void copyFrameworkProp(String key, Dictionary props) { - String value = bc.getProperty(key); - if (value != null) - props.put(key, value); + public static GSSCredential getAcceptorCredentials() { + ServiceReference sr = instance.bc.getServiceReference(UserAdmin.class); + NodeUserAdmin userAdmin = (NodeUserAdmin) instance.bc.getService(sr); + return userAdmin.getAcceptorCredentials(); } - public static NodeState getNodeState() { - return instance.nodeState; - } + // static CmsSecurity getCmsSecurity() { + // return instance.nodeSecurity; + // } public String[] getLocales() { // TODO optimize?