X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FCmsDeployment.java;h=07c10f486045f64d0d7adf120367b2af08a93c13;hb=5b5c2b97eee9edd037e198acadf8b416a973863f;hp=45e218a15701e9e3b00c1ae8619350566389f68c;hpb=828c592e047d6dd0b88c1835093e07b1526036b0;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 45e218a15..07c10f486 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 @@ -14,38 +14,51 @@ import java.util.Set; import javax.jcr.Repository; import javax.jcr.Session; +import javax.security.auth.callback.CallbackHandler; 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.cms.internal.http.NodeHttp; 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.osgi.useradmin.UserAdminConf; +import org.argeo.util.LangUtils; import org.osgi.framework.Bundle; 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.http.HttpService; +import org.osgi.service.cm.Configuration; +import org.osgi.service.cm.ConfigurationAdmin; +import org.osgi.service.cm.ManagedService; import org.osgi.service.useradmin.UserAdmin; import org.osgi.util.tracker.ServiceTracker; 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 final DeployConfig deployConfig; + 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; @@ -58,14 +71,22 @@ public class CmsDeployment implements NodeDeployment { throw new CmsException("No node state available"); NodeState nodeState = bc.getService(nodeStateSr); - deployConfig = new DeployConfig(nodeState.isClean()); - httpExpected = deployConfig.getProps(KernelConstants.JETTY_FACTORY_PID, "default") != null; + cleanState = nodeState.isClean(); + nodeHttp = new NodeHttp(); initTrackers(); } private void initTrackers() { - new PrepareHttpStc().open(); + new ServiceTracker(bc, NodeHttp.class, null) { + + @Override + public NodeHttp addingService(ServiceReference reference) { + httpAvailable = true; + checkReadiness(); + return super.addingService(reference); + } + }.open(); new RepositoryContextStc().open(); new ServiceTracker(bc, UserAdmin.class, null) { @Override @@ -75,10 +96,56 @@ public class CmsDeployment implements NodeDeployment { return super.addingService(reference); } }.open(); + new ServiceTracker(bc, ConfigurationAdmin.class, null) { + @Override + public ConfigurationAdmin addingService(ServiceReference reference) { + ConfigurationAdmin configurationAdmin = bc.getService(reference); + deployConfig = new DeployConfig(configurationAdmin, cleanState); + 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); + log.debug("Standalone repo cn: " + cn); + } + 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("Realm: " + realm); + hasDomain = true; + } + } + if (!hasDomain) { + loadNoIpaJaasConfiguration(); + } + } catch (Exception e) { + throw new CmsException("Cannot initialize config", e); + } + return super.addingService(reference); + } + }.open(); + } + + private void loadNoIpaJaasConfiguration() { + if (System.getProperty(KernelConstants.JAAS_CONFIG_PROP) == null) { + String jaasConfig = KernelConstants.JAAS_CONFIG_NOIPA; + URL url = getClass().getClassLoader().getResource(jaasConfig); + KernelUtils.setJaasConfiguration(url); + if (log.isDebugEnabled()) + log.debug("Set no-IPA JAAS configuration."); + } } public void shutdown() { - deployConfig.save(); + if (nodeHttp != null) + nodeHttp.destroy(); + if (deployConfig != null) + deployConfig.save(); } private void checkReadiness() { @@ -90,25 +157,25 @@ public class CmsDeployment implements NodeDeployment { long initDuration = System.currentTimeMillis() - begin; if (log.isTraceEnabled()) log.trace("Kernel initialization took " + initDuration + "ms"); - directorsCut(initDuration); + tributeToFreeSoftware(initDuration); } } - final private void directorsCut(long initDuration) { - // final long ms = 128l + (long) (Math.random() * 128d); - long ms = initDuration / 100; - log.info("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 + 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)) + " %"); } - long durationNano = System.nanoTime() - beginNano; - final double M = 1000d * 1000d; - double sleepAccuracy = ((double) durationNano) / (ms * M); - if (log.isDebugEnabled()) - log.debug("Sleep accuracy: " + String.format("%.2f", 100 - (sleepAccuracy * 100 - 100)) + " %"); } private void prepareNodeRepository(Repository deployedNodeRepository) { @@ -116,12 +183,31 @@ public class CmsDeployment implements NodeDeployment { throw new CmsException("Deployment is already available"); } + // home prepareDataModel(KernelUtils.openAdminSession(deployedNodeRepository)); + } + + private void prepareHomeRepository(Repository deployedRepository) { Hashtable regProps = new Hashtable(); - regProps.put(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS, ArgeoJcrConstants.ALIAS_HOME); - homeRepository = new HomeRepository(deployedNodeRepository); + 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. */ @@ -130,11 +216,8 @@ public class CmsDeployment implements NodeDeployment { 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()); + if (wiring == null) continue bundles; - } processWiring(adminSession, wiring, processed); } } finally { @@ -157,13 +240,13 @@ public class CmsDeployment implements NodeDeployment { private void registerCnd(Session adminSession, BundleCapability capability, Set processed) { Map attrs = capability.getAttributes(); - String name = attrs.get(DataModelNamespace.CAPABILITY_NAME_ATTRIBUTE).toString(); + String name = (String) attrs.get(DataModelNamespace.CAPABILITY_NAME_ATTRIBUTE); 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(); + String path = (String) attrs.get(DataModelNamespace.CAPABILITY_CND_ATTRIBUTE); URL url = capability.getRevision().getBundle().getResource(path); try (Reader reader = new InputStreamReader(url.openStream())) { CndImporter.registerNodeTypes(reader, adminSession, true); @@ -174,12 +257,31 @@ public class CmsDeployment implements NodeDeployment { throw new CmsException("Cannot import CND " + url, e); } - Hashtable properties = new Hashtable<>(); - properties.put(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS, name); - properties.put(NodeConstants.CN, name); - bc.registerService(Repository.class, adminSession.getRepository(), properties); - if (log.isDebugEnabled()) - log.debug("Published data model " + name); + if (!asBoolean((String) attrs.get(DataModelNamespace.CAPABILITY_ABSTRACT_ATTRIBUTE))) { + 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); + } + } + + private boolean asBoolean(String value) { + if (value == null) + return false; + switch (value) { + case "true": + return true; + case "false": + return false; + default: + throw new CmsException("Unsupported value for attribute " + DataModelNamespace.CAPABILITY_ABSTRACT_ATTRIBUTE + + ": " + value); + } } @Override @@ -197,10 +299,15 @@ public class CmsDeployment implements NodeDeployment { 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()); - nodeAvailable = true; - checkReadiness(); + if (cn != null) { + if (cn.equals(NodeConstants.NODE)) { + prepareNodeRepository(nodeRepo.getRepository()); + prepareHomeRepository(nodeRepo.getRepository()); + nodeAvailable = true; + checkReadiness(); + } else { + // TODO standalone + } } return nodeRepo; } @@ -215,46 +322,4 @@ public class CmsDeployment implements NodeDeployment { } - private class PrepareHttpStc extends ServiceTracker { - private DataHttp dataHttp; - private NodeHttp nodeHttp; - - public PrepareHttpStc() { - super(bc, HttpService.class, null); - } - - @Override - public HttpService addingService(ServiceReference reference) { - HttpService httpService = addHttpService(reference); - return httpService; - } - - @Override - public void removedService(ServiceReference reference, HttpService service) { - if (dataHttp != null) - dataHttp.destroy(); - dataHttp = null; - if (nodeHttp != null) - nodeHttp.destroy(); - nodeHttp = null; - } - - private HttpService addHttpService(ServiceReference sr) { - HttpService httpService = bc.getService(sr); - // TODO find constants - Object httpPort = sr.getProperty("http.port"); - Object httpsPort = sr.getProperty("https.port"); - dataHttp = new DataHttp(httpService); - nodeHttp = new NodeHttp(httpService, bc); - log.info(httpPortsMsg(httpPort, httpsPort)); - httpAvailable = true; - checkReadiness(); - return httpService; - } - - private String httpPortsMsg(Object httpPort, Object httpsPort) { - return "HTTP " + httpPort + (httpsPort != null ? " - HTTPS " + httpsPort : ""); - } - } - }