X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FCmsDeployment.java;h=b24fb0a123b40326974a34be0eac92a97bbf94a2;hb=d132025deea1a6f5f81f0fb64932ce404c426bb0;hp=2f1b16f3ce5686401f3846a8a017a8195994417b;hpb=2d6b7c0c3badea29451c4d8e41ebb5aca2258806;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java index 2f1b16f3c..b24fb0a12 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java @@ -1,355 +1,244 @@ package org.argeo.cms.internal.kernel; -import static org.argeo.node.DataModelNamespace.CMS_DATA_MODEL_NAMESPACE; - import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.io.Writer; +import java.lang.management.ManagementFactory; import java.net.URL; -import java.nio.file.Files; -import java.nio.file.Path; import java.util.Dictionary; -import java.util.HashSet; -import java.util.Hashtable; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.SortedMap; -import java.util.TreeMap; - -import javax.jcr.Repository; -import javax.jcr.Session; -import javax.naming.InvalidNameException; -import javax.naming.directory.Attributes; -import javax.naming.directory.BasicAttributes; -import javax.naming.ldap.LdapName; -import javax.naming.ldap.Rdn; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.jackrabbit.commons.cnd.CndImporter; -import org.apache.jackrabbit.core.RepositoryContext; -import org.argeo.cms.CmsException; -import org.argeo.jcr.ArgeoJcrConstants; -import org.argeo.jcr.JcrUtils; -import org.argeo.node.DataModelNamespace; -import org.argeo.node.NodeConstants; -import org.argeo.node.NodeDeployment; -import org.argeo.node.NodeState; -import org.argeo.util.naming.AttributesDictionary; -import org.argeo.util.naming.LdifParser; -import org.argeo.util.naming.LdifWriter; -import org.osgi.framework.Bundle; +import org.argeo.api.NodeConstants; +import org.argeo.api.NodeDeployment; +import org.argeo.api.NodeState; +import org.argeo.osgi.transaction.WorkTransaction; +import org.argeo.osgi.useradmin.UserAdminConf; +import org.eclipse.equinox.http.jetty.JettyConfigurator; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceReference; -import org.osgi.framework.wiring.BundleCapability; -import org.osgi.framework.wiring.BundleWire; -import org.osgi.framework.wiring.BundleWiring; import org.osgi.service.cm.Configuration; import org.osgi.service.cm.ConfigurationAdmin; -import org.osgi.service.cm.ConfigurationEvent; -import org.osgi.service.cm.SynchronousConfigurationListener; +import org.osgi.service.http.HttpService; +import org.osgi.service.useradmin.Group; +import org.osgi.service.useradmin.Role; +import org.osgi.service.useradmin.UserAdmin; import org.osgi.util.tracker.ServiceTracker; -import org.osgi.util.tracker.ServiceTrackerCustomizer; -public class CmsDeployment implements NodeDeployment, SynchronousConfigurationListener { +/** Implementation of a CMS deployment. */ +public class CmsDeployment implements NodeDeployment { private final Log log = LogFactory.getLog(getClass()); private final BundleContext bc = FrameworkUtil.getBundle(getClass()).getBundleContext(); - private Path deployPath = KernelUtils.getOsgiInstancePath(KernelConstants.DEPLOY_PATH); - private SortedMap deployConfigs = new TreeMap<>(); - - // private Repository deployedNodeRepository; - private HomeRepository homeRepository; + private DeployConfig deployConfig; private Long availableSince; - public CmsDeployment() { - ConfigurationAdmin configurationAdmin = bc.getService(bc.getServiceReference(ConfigurationAdmin.class)); - // FIXME no guarantee this is already available - NodeState nodeState = bc.getService(bc.getServiceReference(NodeState.class)); - try { - initDeployConfigs(configurationAdmin, nodeState); - } catch (IOException e) { - throw new CmsException("Could not init deploy configs", e); - } - bc.registerService(SynchronousConfigurationListener.class, this, null); - - new ServiceTracker<>(bc, RepositoryContext.class, new RepositoryContextStc()).open(); - } + // Readiness + private boolean nodeAvailable = false; + private boolean userAdminAvailable = false; + private boolean httpExpected = false; + private boolean httpAvailable = false; - private void initDeployConfigs(ConfigurationAdmin configurationAdmin, NodeState nodeState) throws IOException { - if (!Files.exists(deployPath)) {// first init - Files.createDirectories(deployPath.getParent()); - Files.createFile(deployPath); - FirstInitProperties firstInitProperties = new FirstInitProperties(); - - Dictionary nodeConfig = firstInitProperties.getNodeRepositoryConfig(); - // node repository is mandatory - putFactoryDeployConfig(NodeConstants.NODE_REPOS_FACTORY_PID, nodeConfig); - - Dictionary webServerConfig = firstInitProperties.getHttpServerConfig(); - if (!webServerConfig.isEmpty()) - putFactoryDeployConfig(KernelConstants.JETTY_FACTORY_PID, webServerConfig); + public CmsDeployment() { +// ServiceReference nodeStateSr = bc.getServiceReference(NodeState.class); +// if (nodeStateSr == null) +// throw new CmsException("No node state available"); - saveDeployedConfigs(); - } +// NodeState nodeState = bc.getService(nodeStateSr); +// cleanState = nodeState.isClean(); - try (InputStream in = Files.newInputStream(deployPath)) { - deployConfigs = new LdifParser().read(in); - } - if (nodeState.isClean()) { - for (LdapName dn : deployConfigs.keySet()) { - Rdn lastRdn = dn.getRdn(dn.size() - 1); - LdapName prefix = (LdapName) dn.getPrefix(dn.size() - 1); - if (prefix.toString().equals(NodeConstants.DEPLOY_BASEDN)) { - if (lastRdn.getType().equals(NodeConstants.CN)) { - // service - String pid = lastRdn.getValue().toString(); - Configuration conf = configurationAdmin.getConfiguration(pid); - AttributesDictionary dico = new AttributesDictionary(deployConfigs.get(dn)); - conf.update(dico); - } else { - // service factory definition - } - } else { - // service factory service - Rdn beforeLastRdn = dn.getRdn(dn.size() - 2); - assert beforeLastRdn.getType().equals(NodeConstants.OU); - String factoryPid = beforeLastRdn.getValue().toString(); - Configuration conf = configurationAdmin.createFactoryConfiguration(factoryPid.toString(), null); - AttributesDictionary dico = new AttributesDictionary(deployConfigs.get(dn)); - conf.update(dico); - } - } - } - // TODO check consistency if not clean +// nodeHttp = new NodeHttp(); + initTrackers(); } - @Override - public void configurationEvent(ConfigurationEvent event) { - try { - if (ConfigurationEvent.CM_UPDATED == event.getType()) { - ConfigurationAdmin configurationAdmin = bc.getService(event.getReference()); - Configuration conf = configurationAdmin.getConfiguration(event.getPid(), null); - LdapName serviceDn = null; - String factoryPid = conf.getFactoryPid(); - if (factoryPid != null) { - LdapName serviceFactoryDn = serviceFactoryDn(factoryPid); - if (deployConfigs.containsKey(serviceFactoryDn)) { - for (LdapName dn : deployConfigs.keySet()) { - if (dn.startsWith(serviceFactoryDn)) { - Rdn lastRdn = dn.getRdn(dn.size() - 1); - assert lastRdn.getType().equals(NodeConstants.CN); - Object value = conf.getProperties().get(lastRdn.getType()); - assert value != null; - if (value.equals(lastRdn.getValue())) { - serviceDn = dn; - break; - } - } - } - - Object cn = conf.getProperties().get(NodeConstants.CN); - if (cn == null) - throw new IllegalArgumentException("Properties must contain cn"); - if (serviceDn == null) { - putFactoryDeployConfig(factoryPid, conf.getProperties()); - } else { - Attributes attrs = deployConfigs.get(serviceDn); - assert attrs != null; - AttributesDictionary.copy(conf.getProperties(), attrs); + private void initTrackers() { + ServiceTracker httpSt = new ServiceTracker(bc, HttpService.class, null) { + + @Override + public HttpService addingService(ServiceReference sr) { + httpAvailable = true; + Object httpPort = sr.getProperty("http.port"); + Object httpsPort = sr.getProperty("https.port"); + log.info(httpPortsMsg(httpPort, httpsPort)); + checkReadiness(); + return super.addingService(sr); + } + }; + // httpSt.open(); + KernelUtils.asyncOpen(httpSt); + + ServiceTracker userAdminSt = new ServiceTracker(bc, UserAdmin.class, null) { + @Override + public UserAdmin addingService(ServiceReference reference) { + UserAdmin userAdmin = super.addingService(reference); + addStandardSystemRoles(userAdmin); + userAdminAvailable = true; + checkReadiness(); + return userAdmin; + } + }; + // userAdminSt.open(); + KernelUtils.asyncOpen(userAdminSt); + + ServiceTracker confAdminSt = new ServiceTracker(bc, + ConfigurationAdmin.class, null) { + @Override + public ConfigurationAdmin addingService(ServiceReference reference) { + ConfigurationAdmin configurationAdmin = bc.getService(reference); + boolean isClean; + try { + Configuration[] confs = configurationAdmin + .listConfigurations("(service.factoryPid=" + NodeConstants.NODE_USER_ADMIN_PID + ")"); + isClean = confs == null || confs.length == 0; + } catch (Exception e) { + throw new IllegalStateException("Cannot analyse clean state", e); + } + deployConfig = new DeployConfig(configurationAdmin, isClean); + Activator.registerService(NodeDeployment.class, CmsDeployment.this, null); +// JcrInitUtils.addToDeployment(CmsDeployment.this); + httpExpected = deployConfig.getProps(KernelConstants.JETTY_FACTORY_PID, "default") != null; + try { + Configuration[] configs = configurationAdmin + .listConfigurations("(service.factoryPid=" + NodeConstants.NODE_USER_ADMIN_PID + ")"); + + boolean hasDomain = false; + for (Configuration config : configs) { + Object realm = config.getProperties().get(UserAdminConf.realm.name()); + if (realm != null) { + log.debug("Found realm: " + realm); + hasDomain = true; } - saveDeployedConfigs(); - if (log.isDebugEnabled()) - log.debug("Updated deploy config " + serviceDn(factoryPid, cn.toString())); - } else { - // ignore non config-registered service factories } - } else { - serviceDn = serviceDn(event.getPid()); - if (deployConfigs.containsKey(serviceDn)) { - Attributes attrs = deployConfigs.get(serviceDn); - assert attrs != null; - AttributesDictionary.copy(conf.getProperties(), attrs); - saveDeployedConfigs(); - if (log.isDebugEnabled()) - log.debug("Updated deploy config " + serviceDn); - } else { - // ignore non config-registered services + if (hasDomain) { + loadIpaJaasConfiguration(); } + } catch (Exception e) { + throw new IllegalStateException("Cannot initialize config", e); } + return super.addingService(reference); } - } catch (Exception e) { - log.error("Could not handle configuration event", e); - } + }; + // confAdminSt.open(); + KernelUtils.asyncOpen(confAdminSt); } - private void putFactoryDeployConfig(String factoryPid, Dictionary props) { - Object cn = props.get(NodeConstants.CN); - if (cn == null) - throw new IllegalArgumentException("cn must be set in properties"); - LdapName serviceFactorydn = serviceFactoryDn(factoryPid); - if (!deployConfigs.containsKey(serviceFactorydn)) - deployConfigs.put(serviceFactorydn, new BasicAttributes(NodeConstants.OU, factoryPid)); - LdapName serviceDn = serviceDn(factoryPid, cn.toString()); - Attributes attrs = new BasicAttributes(); - AttributesDictionary.copy(props, attrs); - deployConfigs.put(serviceDn, attrs); + public void addFactoryDeployConfig(String factoryPid, Dictionary props) { + deployConfig.putFactoryDeployConfig(factoryPid, props); + deployConfig.save(); + try { + deployConfig.loadConfigs(); + } catch (IOException e) { + throw new IllegalStateException(e); + } } - private void putDeployConfig(String servicePid, Dictionary props) { - LdapName serviceDn = serviceDn(servicePid); - Attributes attrs = new BasicAttributes(NodeConstants.CN, servicePid); - AttributesDictionary.copy(props, attrs); - deployConfigs.put(serviceDn, attrs); + public Dictionary getProps(String factoryPid, String cn) { + return deployConfig.getProps(factoryPid, cn); } - void saveDeployedConfigs() throws IOException { - try (Writer writer = Files.newBufferedWriter(deployPath)) { - new LdifWriter(writer).write(deployConfigs); - } + private String httpPortsMsg(Object httpPort, Object httpsPort) { + return (httpPort != null ? "HTTP " + httpPort + " " : " ") + (httpsPort != null ? "HTTPS " + httpsPort : ""); } - private LdapName serviceFactoryDn(String factoryPid) { + private void addStandardSystemRoles(UserAdmin userAdmin) { + // we assume UserTransaction is already available (TODO make it more robust) + WorkTransaction userTransaction = bc.getService(bc.getServiceReference(WorkTransaction.class)); try { - return new LdapName(NodeConstants.OU + "=" + factoryPid + "," + NodeConstants.DEPLOY_BASEDN); - } catch (InvalidNameException e) { - throw new IllegalArgumentException("Cannot generate DN from " + factoryPid, e); + userTransaction.begin(); + Role adminRole = userAdmin.getRole(NodeConstants.ROLE_ADMIN); + if (adminRole == null) { + adminRole = userAdmin.createRole(NodeConstants.ROLE_ADMIN, Role.GROUP); + } + if (userAdmin.getRole(NodeConstants.ROLE_USER_ADMIN) == null) { + Group userAdminRole = (Group) userAdmin.createRole(NodeConstants.ROLE_USER_ADMIN, Role.GROUP); + userAdminRole.addMember(adminRole); + } + userTransaction.commit(); + } catch (Exception e) { + try { + userTransaction.rollback(); + } catch (Exception e1) { + // silent + } + throw new IllegalStateException("Cannot add standard system roles", e); } } - private LdapName serviceDn(String servicePid) { - try { - return new LdapName(NodeConstants.CN + "=" + servicePid + "," + NodeConstants.DEPLOY_BASEDN); - } catch (InvalidNameException e) { - throw new IllegalArgumentException("Cannot generate DN from " + servicePid, e); + private void loadIpaJaasConfiguration() { + if (System.getProperty(KernelConstants.JAAS_CONFIG_PROP) == null) { + String jaasConfig = KernelConstants.JAAS_CONFIG_IPA; + URL url = getClass().getClassLoader().getResource(jaasConfig); + KernelUtils.setJaasConfiguration(url); + log.debug("Set IPA JAAS configuration."); } } - private LdapName serviceDn(String factoryPid, String cn) { + public void shutdown() { +// if (nodeHttp != null) +// nodeHttp.destroy(); + try { - return (LdapName) serviceFactoryDn(factoryPid).add(new Rdn(NodeConstants.CN, cn)); - } catch (InvalidNameException e) { - throw new IllegalArgumentException("Cannot generate DN from " + factoryPid + " and " + cn, e); + JettyConfigurator.stopServer(KernelConstants.DEFAULT_JETTY_SERVER); + } catch (Exception e) { + log.error("Cannot stop default Jetty server.", e); } - } - private void prepareNodeRepository(Repository deployedNodeRepository) { - if (availableSince != null) { - throw new CmsException("Deployment is already available"); + if (deployConfig != null) { + new Thread(() -> deployConfig.save(), "Save Argeo Deploy Config").start(); } - - availableSince = System.currentTimeMillis(); - - prepareDataModel(KernelUtils.openAdminSession(deployedNodeRepository)); - Hashtable regProps = new Hashtable(); - regProps.put(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS, ArgeoJcrConstants.ALIAS_HOME); - homeRepository = new HomeRepository(deployedNodeRepository); - // register - bc.registerService(Repository.class, homeRepository, regProps); } - /** Session is logged out. */ - private void prepareDataModel(Session adminSession) { - try { - Set processed = new HashSet(); - bundles: for (Bundle bundle : bc.getBundles()) { - BundleWiring wiring = bundle.adapt(BundleWiring.class); - if (wiring == null) { - if (log.isTraceEnabled()) - log.error("No wiring for " + bundle.getSymbolicName()); - continue bundles; - } - processWiring(adminSession, wiring, processed); + /** + * Checks whether the deployment is available according to expectations, and + * mark it as available. + */ + private synchronized void checkReadiness() { + if (isAvailable()) + return; + if (nodeAvailable && userAdminAvailable && (httpExpected ? httpAvailable : true)) { + String data = KernelUtils.getFrameworkProp(KernelUtils.OSGI_INSTANCE_AREA); + String state = KernelUtils.getFrameworkProp(KernelUtils.OSGI_CONFIGURATION_AREA); + availableSince = System.currentTimeMillis(); + long jvmUptime = ManagementFactory.getRuntimeMXBean().getUptime(); + String jvmUptimeStr = " in " + (jvmUptime / 1000) + "." + (jvmUptime % 1000) + "s"; + log.info("## ARGEO NODE AVAILABLE" + (log.isDebugEnabled() ? jvmUptimeStr : "") + " ##"); + if (log.isDebugEnabled()) { + log.debug("## state: " + state); + if (data != null) + log.debug("## data: " + data); } - } finally { - JcrUtils.logoutQuietly(adminSession); - } - } - - private void processWiring(Session adminSession, BundleWiring wiring, Set processed) { - // recursively process requirements first - List requiredWires = wiring.getRequiredWires(CMS_DATA_MODEL_NAMESPACE); - for (BundleWire wire : requiredWires) { - processWiring(adminSession, wire.getProviderWiring(), processed); - // registerCnd(adminSession, wire.getCapability(), processed); - } - List capabilities = wiring.getCapabilities(CMS_DATA_MODEL_NAMESPACE); - for (BundleCapability capability : capabilities) { - registerCnd(adminSession, capability, processed); + long begin = bc.getService(bc.getServiceReference(NodeState.class)).getAvailableSince(); + long initDuration = System.currentTimeMillis() - begin; + if (log.isTraceEnabled()) + log.trace("Kernel initialization took " + initDuration + "ms"); + tributeToFreeSoftware(initDuration); } } - private void registerCnd(Session adminSession, BundleCapability capability, Set processed) { - Map attrs = capability.getAttributes(); - String name = attrs.get(DataModelNamespace.CAPABILITY_NAME_ATTRIBUTE).toString(); - if (processed.contains(name)) { - if (log.isTraceEnabled()) - log.trace("Data model " + name + " has already been processed"); - return; - } - String path = attrs.get(DataModelNamespace.CAPABILITY_CND_ATTRIBUTE).toString(); - URL url = capability.getRevision().getBundle().getResource(path); - try (Reader reader = new InputStreamReader(url.openStream())) { - CndImporter.registerNodeTypes(reader, adminSession, true); - processed.add(name); - if (log.isDebugEnabled()) - log.debug("Registered CND " + url); - } catch (Exception e) { - throw new CmsException("Cannot import CND " + url, e); + final private void tributeToFreeSoftware(long initDuration) { + if (log.isTraceEnabled()) { + long ms = initDuration / 100; + log.trace("Spend " + ms + "ms" + " reflecting on the progress brought to mankind" + " by Free Software..."); + long beginNano = System.nanoTime(); + try { + Thread.sleep(ms, 0); + } catch (InterruptedException e) { + // silent + } + long durationNano = System.nanoTime() - beginNano; + final double M = 1000d * 1000d; + double sleepAccuracy = ((double) durationNano) / (ms * M); + log.trace("Sleep accuracy: " + String.format("%.2f", 100 - (sleepAccuracy * 100 - 100)) + " %"); } - - Hashtable properties = new Hashtable<>(); - properties.put(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS, name); - bc.registerService(Repository.class, adminSession.getRepository(), properties); - if (log.isDebugEnabled()) - log.debug("Published data model " + name); } - // public void setDeployedNodeRepository(Repository deployedNodeRepository) - // { - // this.deployedNodeRepository = deployedNodeRepository; - // } - @Override - public long getAvailableSince() { + public synchronized Long getAvailableSince() { return availableSince; } - private class RepositoryContextStc implements ServiceTrackerCustomizer { - - @Override - public RepositoryContext addingService(ServiceReference reference) { - RepositoryContext nodeRepo = bc.getService(reference); - Object cn = reference.getProperty(NodeConstants.CN); - if (cn != null && cn.equals(ArgeoJcrConstants.ALIAS_NODE)) { - prepareNodeRepository(nodeRepo.getRepository()); - // nodeDeployment.setDeployedNodeRepository(nodeRepo.getRepository()); - // Dictionary props = - // LangUtils.init(Constants.SERVICE_PID, - // NodeConstants.NODE_DEPLOYMENT_PID); - // props.put(NodeConstants.CN, - // nodeRepo.getRootNodeId().toString()); - // register - // bc.registerService(LangUtils.names(NodeDeployment.class, - // ManagedService.class), nodeDeployment, props); - } - - return nodeRepo; - } - - @Override - public void modifiedService(ServiceReference reference, RepositoryContext service) { - } - - @Override - public void removedService(ServiceReference reference, RepositoryContext service) { - } - + public synchronized boolean isAvailable() { + return availableSince != null; } }