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=4185ff8826f893a4a1f054f61a11b89333c3e85d;hp=917b15a9a94c9baef9290d8d7b11c153eb08b003;hpb=ef73bd445ed1fc2a24dd0afc4d022c48b0501e8e;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 917b15a9a..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,66 +1,38 @@ package org.argeo.cms.internal.kernel; -import static org.argeo.node.DataModelNamespace.CMS_DATA_MODEL_NAMESPACE; - -import java.io.File; -import java.io.InputStreamReader; -import java.io.Reader; +import java.io.IOException; import java.lang.management.ManagementFactory; import java.net.URL; -import java.util.HashSet; -import java.util.Hashtable; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.jcr.Repository; -import javax.jcr.Session; -import javax.security.auth.callback.CallbackHandler; +import java.util.Dictionary; 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.JcrUtils; -import org.argeo.node.DataModelNamespace; -import org.argeo.node.NodeConstants; -import org.argeo.node.NodeDeployment; -import org.argeo.node.NodeState; -import org.argeo.node.security.CryptoKeyring; +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.argeo.util.LangUtils; -import org.osgi.framework.Bundle; +import org.eclipse.equinox.http.jetty.JettyConfigurator; import org.osgi.framework.BundleContext; -import org.osgi.framework.Constants; 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.ManagedService; +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; +/** Implementation of a CMS deployment. */ public class CmsDeployment implements NodeDeployment { - // private final static String LEGACY_JCR_REPOSITORY_ALIAS = - // "argeo.jcr.repository.alias"; - private final Log log = LogFactory.getLog(getClass()); private final BundleContext bc = FrameworkUtil.getBundle(getClass()).getBundleContext(); - private DataModels dataModels; private DeployConfig deployConfig; - private HomeRepository homeRepository; private Long availableSince; - private final boolean cleanState; - - private NodeHttp nodeHttp; - // Readiness private boolean nodeAvailable = false; private boolean userAdminAvailable = false; @@ -68,41 +40,41 @@ public class CmsDeployment implements NodeDeployment { private boolean httpAvailable = false; public CmsDeployment() { - ServiceReference nodeStateSr = bc.getServiceReference(NodeState.class); - if (nodeStateSr == null) - throw new CmsException("No node state available"); +// ServiceReference nodeStateSr = bc.getServiceReference(NodeState.class); +// if (nodeStateSr == null) +// throw new CmsException("No node state available"); - NodeState nodeState = bc.getService(nodeStateSr); - cleanState = nodeState.isClean(); +// NodeState nodeState = bc.getService(nodeStateSr); +// cleanState = nodeState.isClean(); - nodeHttp = new NodeHttp(cleanState); - dataModels = new DataModels(bc); +// nodeHttp = new NodeHttp(); initTrackers(); } private void initTrackers() { - ServiceTracker httpSt = new ServiceTracker(bc, NodeHttp.class, null) { + ServiceTracker httpSt = new ServiceTracker(bc, HttpService.class, null) { @Override - public NodeHttp addingService(ServiceReference reference) { + 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(reference); + return super.addingService(sr); } }; // httpSt.open(); KernelUtils.asyncOpen(httpSt); - ServiceTracker repoContextSt = new RepositoryContextStc(); - // repoContextSt.open(); - KernelUtils.asyncOpen(repoContextSt); - 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 super.addingService(reference); + return userAdmin; } }; // userAdminSt.open(); @@ -113,17 +85,19 @@ public class CmsDeployment implements NodeDeployment { @Override public ConfigurationAdmin addingService(ServiceReference reference) { ConfigurationAdmin configurationAdmin = bc.getService(reference); - deployConfig = new DeployConfig(configurationAdmin, dataModels, cleanState); + 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_REPOS_FACTORY_PID + ")"); - // for (Configuration config : configs) { - // Object cn = config.getProperties().get(NodeConstants.CN); - // if (log.isDebugEnabled()) - // log.debug("Standalone repo cn: " + cn); - // } Configuration[] configs = configurationAdmin .listConfigurations("(service.factoryPid=" + NodeConstants.NODE_USER_ADMIN_PID + ")"); @@ -139,7 +113,7 @@ public class CmsDeployment implements NodeDeployment { loadIpaJaasConfiguration(); } } catch (Exception e) { - throw new CmsException("Cannot initialize config", e); + throw new IllegalStateException("Cannot initialize config", e); } return super.addingService(reference); } @@ -148,6 +122,48 @@ public class CmsDeployment implements NodeDeployment { KernelUtils.asyncOpen(confAdminSt); } + public void addFactoryDeployConfig(String factoryPid, Dictionary props) { + deployConfig.putFactoryDeployConfig(factoryPid, props); + deployConfig.save(); + try { + deployConfig.loadConfigs(); + } catch (IOException e) { + throw new IllegalStateException(e); + } + } + + public Dictionary getProps(String factoryPid, String cn) { + return deployConfig.getProps(factoryPid, cn); + } + + private String httpPortsMsg(Object httpPort, Object httpsPort) { + return (httpPort != null ? "HTTP " + httpPort + " " : " ") + (httpsPort != null ? "HTTPS " + httpsPort : ""); + } + + 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 { + 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 void loadIpaJaasConfiguration() { if (System.getProperty(KernelConstants.JAAS_CONFIG_PROP) == null) { String jaasConfig = KernelConstants.JAAS_CONFIG_IPA; @@ -158,13 +174,27 @@ public class CmsDeployment implements NodeDeployment { } public void shutdown() { - if (nodeHttp != null) - nodeHttp.destroy(); - if (deployConfig != null) - deployConfig.save(); +// if (nodeHttp != null) +// nodeHttp.destroy(); + + try { + JettyConfigurator.stopServer(KernelConstants.DEFAULT_JETTY_SERVER); + } catch (Exception e) { + log.error("Cannot stop default Jetty server.", e); + } + + if (deployConfig != null) { + new Thread(() -> deployConfig.save(), "Save Argeo Deploy Config").start(); + } } - private void checkReadiness() { + /** + * 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); @@ -202,167 +232,13 @@ public class CmsDeployment implements NodeDeployment { } } - private void prepareNodeRepository(Repository deployedNodeRepository) { - if (availableSince != null) { - throw new CmsException("Deployment is already available"); - } - - // home - prepareDataModel(NodeConstants.NODE, KernelUtils.openAdminSession(deployedNodeRepository)); - } - - private void prepareHomeRepository(Repository deployedRepository) { - Hashtable regProps = new Hashtable(); - regProps.put(NodeConstants.CN, NodeConstants.HOME); - // regProps.put(LEGACY_JCR_REPOSITORY_ALIAS, NodeConstants.HOME); - homeRepository = new HomeRepository(deployedRepository); - // register - bc.registerService(Repository.class, homeRepository, regProps); - - new ServiceTracker(bc, CallbackHandler.class, null) { - - @Override - public CallbackHandler addingService(ServiceReference reference) { - NodeKeyRing nodeKeyring = new NodeKeyRing(homeRepository); - CallbackHandler callbackHandler = bc.getService(reference); - nodeKeyring.setDefaultCallbackHandler(callbackHandler); - bc.registerService(LangUtils.names(CryptoKeyring.class, ManagedService.class), nodeKeyring, - LangUtils.dico(Constants.SERVICE_PID, NodeConstants.NODE_KEYRING_PID)); - return callbackHandler; - } - - }.open(); - } - - /** Session is logged out. */ - private void prepareDataModel(String cn, Session adminSession) { - try { - Set processed = new HashSet(); - bundles: for (Bundle bundle : bc.getBundles()) { - BundleWiring wiring = bundle.adapt(BundleWiring.class); - if (wiring == null) - continue bundles; - if (NodeConstants.NODE.equals(cn))// process all data models - processWiring(cn, adminSession, wiring, processed); - else { - List capabilities = wiring.getCapabilities(CMS_DATA_MODEL_NAMESPACE); - for (BundleCapability capability : capabilities) { - String dataModelName = (String) capability.getAttributes().get(DataModelNamespace.NAME); - if (dataModelName.equals(cn))// process only own data model - processWiring(cn, adminSession, wiring, processed); - } - } - } - } finally { - JcrUtils.logoutQuietly(adminSession); - } - } - - private void processWiring(String cn, Session adminSession, BundleWiring wiring, Set processed) { - // recursively process requirements first - List requiredWires = wiring.getRequiredWires(CMS_DATA_MODEL_NAMESPACE); - for (BundleWire wire : requiredWires) { - processWiring(cn, adminSession, wire.getProviderWiring(), processed); - } - List capabilities = wiring.getCapabilities(CMS_DATA_MODEL_NAMESPACE); - for (BundleCapability capability : capabilities) { - registerDataModelCapability(cn, adminSession, capability, processed); - } - } - - private void registerDataModelCapability(String cn, Session adminSession, BundleCapability capability, - Set processed) { - Map attrs = capability.getAttributes(); - String name = (String) attrs.get(DataModelNamespace.NAME); - if (processed.contains(name)) { - if (log.isTraceEnabled()) - log.trace("Data model " + name + " has already been processed"); - return; - } - - // CND - String path = (String) attrs.get(DataModelNamespace.CND); - if (path != null) { - File dataModel = bc.getBundle().getDataFile("dataModels/" + path); - if (!dataModel.exists()) { - URL url = capability.getRevision().getBundle().getResource(path); - if (url == null) - throw new CmsException("No data model '" + name + "' found under path " + path); - try (Reader reader = new InputStreamReader(url.openStream())) { - CndImporter.registerNodeTypes(reader, adminSession, true); - processed.add(name); - dataModel.getParentFile().mkdirs(); - dataModel.createNewFile(); - if (log.isDebugEnabled()) - log.debug("Registered CND " + url); - } catch (Exception e) { - throw new CmsException("Cannot import CND " + url, e); - } - } - } - - if (KernelUtils.asBoolean((String) attrs.get(DataModelNamespace.ABSTRACT))) - return; - // Non abstract - boolean isStandalone = deployConfig.isStandalone(name); - boolean publishLocalRepo; - if (isStandalone && name.equals(cn))// includes the node itself - publishLocalRepo = true; - else if (!isStandalone && cn.equals(NodeConstants.NODE)) - publishLocalRepo = true; - else - publishLocalRepo = false; - - if (publishLocalRepo) { - Hashtable properties = new Hashtable<>(); - // properties.put(LEGACY_JCR_REPOSITORY_ALIAS, name); - properties.put(NodeConstants.CN, name); - if (name.equals(NodeConstants.NODE)) - properties.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE); - LocalRepository localRepository = new LocalRepository(adminSession.getRepository(), capability); - bc.registerService(Repository.class, localRepository, properties); - if (log.isDebugEnabled()) - log.debug("Published data model " + name); - } - } - @Override - public Long getAvailableSince() { + public synchronized Long getAvailableSince() { return availableSince; } - private class RepositoryContextStc extends ServiceTracker { - - public RepositoryContextStc() { - super(bc, RepositoryContext.class, null); - } - - @Override - public RepositoryContext addingService(ServiceReference reference) { - RepositoryContext repoContext = bc.getService(reference); - String cn = (String) reference.getProperty(NodeConstants.CN); - if (cn != null) { - if (cn.equals(NodeConstants.NODE)) { - prepareNodeRepository(repoContext.getRepository()); - // TODO separate home repository - prepareHomeRepository(repoContext.getRepository()); - nodeAvailable = true; - checkReadiness(); - } else { - prepareDataModel(cn, KernelUtils.openAdminSession(repoContext.getRepository())); - } - } - return repoContext; - } - - @Override - public void modifiedService(ServiceReference reference, RepositoryContext service) { - } - - @Override - public void removedService(ServiceReference reference, RepositoryContext service) { - } - + public synchronized boolean isAvailable() { + return availableSince != null; } }