X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FCmsStateImpl.java;h=7928857562e5a54ebc6c1388216afb82ca457ec3;hb=dca2b13e0e3ca3e7a9469e089b980c48c880ad1a;hp=7b47b520d580fa602dda48c663f94ec493a9bb1c;hpb=f4da6777015da3fc392138f0c01cea2f2add9ed3;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java index 7b47b520d..792885756 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java @@ -1,79 +1,118 @@ package org.argeo.cms.internal.runtime; +import java.io.File; +import java.io.FileFilter; +import java.io.IOException; +import java.io.Reader; import java.net.InetAddress; import java.net.URL; import java.net.UnknownHostException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.security.KeyStore; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; +import java.util.StringJoiner; +import java.util.UUID; import javax.security.auth.login.Configuration; +import org.apache.commons.io.FileUtils; +import org.argeo.api.cms.CmsConstants; import org.argeo.api.cms.CmsLog; import org.argeo.api.cms.CmsState; +import org.argeo.api.uuid.UuidFactory; +import org.argeo.cms.CmsDeployProperty; import org.argeo.cms.auth.ident.IdentClient; -import org.argeo.cms.internal.osgi.CmsShutdown; -import org.osgi.framework.Constants; /** * Implementation of a {@link CmsState}, initialising the required services. */ public class CmsStateImpl implements CmsState { private final static CmsLog log = CmsLog.getLog(CmsStateImpl.class); -// private final BundleContext bc = FrameworkUtil.getBundle(CmsState.class).getBundleContext(); - -// private static CmsStateImpl instance; - -// private ExecutorService internalExecutorService; // REFERENCES private Long availableSince; - -// private ThreadGroup threadGroup = new ThreadGroup("CMS"); - private List stopHooks = new ArrayList<>(); - - private String stateUuid; + private UUID uuid; // private final boolean cleanState; private String hostname; - public void init() { -// instance = this; + private UuidFactory uuidFactory; - Runtime.getRuntime().addShutdownHook(new CmsShutdown()); -// this.internalExecutorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()); + private final Map deployPropertyDefaults; + + public CmsStateImpl() { + Map deployPropertyDefaults = new HashMap<>(); + deployPropertyDefaults.put(CmsDeployProperty.SSL_KEYSTORETYPE, PkiUtils.PKCS12); + deployPropertyDefaults.put(CmsDeployProperty.NODE_INIT, "../../init"); + deployPropertyDefaults.put(CmsDeployProperty.LOCALE, Locale.getDefault().toString()); + this.deployPropertyDefaults = Collections.unmodifiableMap(deployPropertyDefaults); + } + + public void start() { +// Runtime.getRuntime().addShutdownHook(new CmsShutdown()); try { initSecurity(); // initArgeoLogger(); -// initNode(); if (log.isTraceEnabled()) log.trace("CMS State started"); - } catch (Throwable e) { - log.error("## FATAL: CMS activator failed", e); - } - this.stateUuid = KernelUtils.getFrameworkProp(Constants.FRAMEWORK_UUID); +// String stateUuidStr = KernelUtils.getFrameworkProp(Constants.FRAMEWORK_UUID); +// this.uuid = UUID.fromString(stateUuidStr); + this.uuid = uuidFactory.timeUUID(); // this.cleanState = stateUuid.equals(frameworkUuid); - try { - this.hostname = InetAddress.getLocalHost().getHostName(); - } catch (UnknownHostException e) { - log.error("Cannot set hostname: " + e); - } + try { + this.hostname = InetAddress.getLocalHost().getHostName(); + } catch (UnknownHostException e) { + log.error("Cannot set hostname: " + e); + } - availableSince = System.currentTimeMillis(); - if (log.isDebugEnabled()) - // log.debug("## CMS starting... stateUuid=" + this.stateUuid + (cleanState ? " - // (clean state) " : " ")); - log.debug("## CMS starting... (" + stateUuid + ")"); + availableSince = System.currentTimeMillis(); + if (log.isDebugEnabled()) { + // log.debug("## CMS starting... stateUuid=" + this.stateUuid + (cleanState ? " + // (clean state) " : " ")); + StringJoiner sb = new StringJoiner("\n"); + CmsDeployProperty[] deployProperties = CmsDeployProperty.values(); + Arrays.sort(deployProperties, (o1, o2) -> o1.name().compareTo(o2.name())); + for (CmsDeployProperty deployProperty : deployProperties) { + List values = getDeployProperties(deployProperty); + for (int i = 0; i < values.size(); i++) { + String value = values.get(i); + if (value != null) { + boolean isDefault = deployPropertyDefaults.containsKey(deployProperty) + && value.equals(deployPropertyDefaults.get(deployProperty)); + String line = deployProperty.getProperty() + (i == 0 ? "" : "." + i) + "=" + value + + (isDefault ? " (default)" : ""); + sb.add(line); + } + } + } + log.debug("## CMS starting... (" + uuid + ")\n" + sb + "\n"); + } // initI18n(); // initServices(); + if (!Files.exists(getDataPath(CmsConstants.NODE))) {// first init + firstInit(); + } + } catch (RuntimeException | IOException e) { + log.error("## FATAL: CMS activator failed", e); + } } private void initSecurity() { - if (System.getProperty(KernelConstants.JAAS_CONFIG_PROP) == null) { + if (getDeployProperty(CmsDeployProperty.JAVA_LOGIN_CONFIG) == null) { String jaasConfig = KernelConstants.JAAS_CONFIG; URL url = getClass().getResource(jaasConfig); // System.setProperty(KernelConstants.JAAS_CONFIG_PROP, @@ -82,140 +121,178 @@ public class CmsStateImpl implements CmsState { } // explicitly load JAAS configuration Configuration.getConfiguration(); - } -// private void initI18n() { -// Object defaultLocaleValue = KernelUtils.getFrameworkProp(CmsConstants.I18N_DEFAULT_LOCALE); -// defaultLocale = defaultLocaleValue != null ? new Locale(defaultLocaleValue.toString()) -// : new Locale(ENGLISH.getLanguage()); -// locales = LocaleUtils.asLocaleList(KernelUtils.getFrameworkProp(CmsConstants.I18N_LOCALES)); -// } - - private void initServices() { - // JTA -// String tmType = KernelUtils.getFrameworkProp(CmsConstants.TRANSACTION_MANAGER, -// CmsConstants.TRANSACTION_MANAGER_SIMPLE); -// if (CmsConstants.TRANSACTION_MANAGER_SIMPLE.equals(tmType)) { -// initSimpleTransactionManager(); -// } else if (CmsConstants.TRANSACTION_MANAGER_BITRONIX.equals(tmType)) { -//// initBitronixTransactionManager(); -// throw new UnsupportedOperationException( -// "Bitronix is not supported anymore, but could be again if there is enough interest."); -// } else { -// throw new IllegalArgumentException("Usupported transaction manager type " + tmType); -// } - - // POI -// POIXMLTypeLoader.setClassLoader(CTConnection.class.getClassLoader()); - - // Tika -// OpenDocumentParser odfParser = new OpenDocumentParser(); -// bc.registerService(Parser.class, odfParser, new Hashtable()); -// PDFParser pdfParser = new PDFParser(); -// bc.registerService(Parser.class, pdfParser, new Hashtable()); -// OOXMLParser ooxmlParser = new OOXMLParser(); -// bc.registerService(Parser.class, ooxmlParser, new Hashtable()); -// TesseractOCRParser ocrParser = new TesseractOCRParser(); -// ocrParser.setLanguage("ara"); -// bc.registerService(Parser.class, ocrParser, new Hashtable()); - -// // JCR -// RepositoryServiceFactory repositoryServiceFactory = new RepositoryServiceFactory(); -// stopHooks.add(() -> repositoryServiceFactory.shutdown()); -// Activator.registerService(ManagedServiceFactory.class, repositoryServiceFactory, -// LangUtils.dict(Constants.SERVICE_PID, NodeConstants.NODE_REPOS_FACTORY_PID)); -// -// NodeRepositoryFactory repositoryFactory = new NodeRepositoryFactory(); -// Activator.registerService(RepositoryFactory.class, repositoryFactory, null); - - // Security -// NodeUserAdmin userAdmin = new NodeUserAdmin(CmsConstants.ROLES_BASEDN, CmsConstants.TOKENS_BASEDN); -// stopHooks.add(() -> userAdmin.destroy()); -// Activator.registerService(ManagedServiceFactory.class, userAdmin, -// LangUtils.dict(Constants.SERVICE_PID, CmsConstants.NODE_USER_ADMIN_PID)); - - } - -// private void initSimpleTransactionManager() { -// SimpleTransactionManager transactionManager = new SimpleTransactionManager(); -// Activator.registerService(WorkControl.class, transactionManager, null); -// Activator.registerService(WorkTransaction.class, transactionManager, null); -//// Activator.registerService(TransactionManager.class, transactionManager, null); -//// Activator.registerService(UserTransaction.class, transactionManager, null); -// // TODO TransactionSynchronizationRegistry -// } - -// private void initBitronixTransactionManager() { -// // TODO manage it in a managed service, as startup could be long -// ServiceReference existingTm = bc.getServiceReference(TransactionManager.class); -// if (existingTm != null) { -// if (log.isDebugEnabled()) -// log.debug("Using provided transaction manager " + existingTm); -// return; -// } -// -// if (!TransactionManagerServices.isTransactionManagerRunning()) { -// bitronix.tm.Configuration tmConf = TransactionManagerServices.getConfiguration(); -// tmConf.setServerId(UUID.randomUUID().toString()); -// -// Bundle bitronixBundle = FrameworkUtil.getBundle(bitronix.tm.Configuration.class); -// File tmBaseDir = bitronixBundle.getDataFile(KernelConstants.DIR_TRANSACTIONS); -// File tmDir1 = new File(tmBaseDir, "btm1"); -// tmDir1.mkdirs(); -// tmConf.setLogPart1Filename(new File(tmDir1, tmDir1.getName() + ".tlog").getAbsolutePath()); -// File tmDir2 = new File(tmBaseDir, "btm2"); -// tmDir2.mkdirs(); -// tmConf.setLogPart2Filename(new File(tmDir2, tmDir2.getName() + ".tlog").getAbsolutePath()); -// } -// BitronixTransactionManager transactionManager = getTransactionManager(); -// stopHooks.add(() -> transactionManager.shutdown()); -// BitronixTransactionSynchronizationRegistry transactionSynchronizationRegistry = getTransactionSynchronizationRegistry(); -// // register -// bc.registerService(TransactionManager.class, transactionManager, null); -// bc.registerService(UserTransaction.class, transactionManager, null); -// bc.registerService(TransactionSynchronizationRegistry.class, transactionSynchronizationRegistry, null); -// if (log.isDebugEnabled()) -// log.debug("Initialised default Bitronix transaction manager"); -// } - - public void destroy() { - if (log.isDebugEnabled()) - log.debug("CMS stopping... (" + this.stateUuid + ")"); + boolean initSsl = getDeployProperty(CmsDeployProperty.HTTPS_PORT) != null; + if (initSsl) { + initCertificates(); + } + } - // In a different thread in order to avoid interruptions - Thread stopHookThread = new Thread(() -> applyStopHooks(), "Apply Argeo Stop Hooks"); - stopHookThread.start(); - try { - stopHookThread.join(10 * 60 * 1000); - } catch (InterruptedException e) { - // silent + private void initCertificates() { + // server certificate + Path keyStorePath = getDataPath(PkiUtils.DEFAULT_KEYSTORE_PATH); + Path pemKeyPath = getDataPath(PkiUtils.DEFAULT_PEM_KEY_PATH); + Path pemCertPath = getDataPath(PkiUtils.DEFAULT_PEM_CERT_PATH); + String keyStorePasswordStr = doGetDeployProperty(CmsDeployProperty.SSL_PASSWORD.getProperty()); + char[] keyStorePassword; + if (keyStorePasswordStr == null) + keyStorePassword = "changeit".toCharArray(); + else + keyStorePassword = keyStorePasswordStr.toCharArray(); + + // if PEM files both exists, update the PKCS12 file + if (Files.exists(pemCertPath) && Files.exists(pemKeyPath)) { + // TODO check certificate update time? monitor changes? + KeyStore keyStore = PkiUtils.getKeyStore(keyStorePath, keyStorePassword, PkiUtils.PKCS12); + try (Reader key = Files.newBufferedReader(pemKeyPath, StandardCharsets.US_ASCII); + Reader cert = Files.newBufferedReader(pemCertPath, StandardCharsets.US_ASCII);) { + PkiUtils.loadPem(keyStore, key, keyStorePassword, cert); + PkiUtils.saveKeyStore(keyStorePath, keyStorePassword, keyStore); + if (log.isDebugEnabled()) + log.debug("PEM certificate stored in " + keyStorePath); + } catch (IOException e) { + log.error("Cannot read PEM files " + pemKeyPath + " and " + pemCertPath, e); + } } -// internalExecutorService.shutdown(); + if (!Files.exists(keyStorePath)) + PkiUtils.createSelfSignedKeyStore(keyStorePath, keyStorePassword, PkiUtils.PKCS12); +// props.put(JettyHttpConstants.SSL_KEYSTORETYPE, PkiUtils.PKCS12); +// props.put(JettyHttpConstants.SSL_KEYSTORE, keyStorePath.toString()); +// props.put(JettyHttpConstants.SSL_PASSWORD, new String(keyStorePassword)); + +// props.put(InternalHttpConstants.SSL_KEYSTORETYPE, "PKCS11"); +// props.put(InternalHttpConstants.SSL_KEYSTORE, "../../nssdb"); +// props.put(InternalHttpConstants.SSL_PASSWORD, keyStorePassword); + + } + + public void stop() { + if (log.isDebugEnabled()) + log.debug("CMS stopping... (" + this.uuid + ")"); long duration = ((System.currentTimeMillis() - availableSince) / 1000) / 60; log.info("## ARGEO CMS STOPPED after " + (duration / 60) + "h " + (duration % 60) + "min uptime ##"); } - /** Apply shutdown hoos in reverse order. */ - private void applyStopHooks() { - for (int i = stopHooks.size() - 1; i >= 0; i--) { - try { - stopHooks.get(i).run(); - } catch (Exception e) { - log.error("Could not run shutdown hook #" + i); + private void firstInit() throws IOException { + log.info("## FIRST INIT ##"); + List nodeInits = getDeployProperties(CmsDeployProperty.NODE_INIT); +// if (nodeInits == null) +// nodeInits = "../../init"; + CmsStateImpl.prepareFirstInitInstanceArea(nodeInits); + } + + @Override + public String getDeployProperty(String property) { + CmsDeployProperty deployProperty = CmsDeployProperty.find(property); + if (deployProperty == null) { + // legacy + if (property.startsWith("argeo.node.")) { + return doGetDeployProperty(property); + } + if (property.equals("argeo.i18n.locales")) { + String value = doGetDeployProperty(property); + if (value != null) { + log.warn("Property " + property + " was ignored (value=" + value + ")"); + + } + return null; } + throw new IllegalArgumentException("Unsupported deploy property " + property); } - // Clean hanging Gogo shell thread - new GogoShellKiller().start(); + int index = CmsDeployProperty.getPropertyIndex(property); + return getDeployProperty(deployProperty, index); + } + + @Override + public List getDeployProperties(String property) { + CmsDeployProperty deployProperty = CmsDeployProperty.find(property); + if (deployProperty == null) + return new ArrayList<>(); + return getDeployProperties(deployProperty); + } + + public static List getDeployProperties(CmsState cmsState, CmsDeployProperty deployProperty) { + return ((CmsStateImpl) cmsState).getDeployProperties(deployProperty); + } + + public List getDeployProperties(CmsDeployProperty deployProperty) { + List res = new ArrayList<>(deployProperty.getMaxCount()); + for (int i = 0; i < deployProperty.getMaxCount(); i++) { + // String propertyName = i == 0 ? deployProperty.getProperty() : + // deployProperty.getProperty() + "." + i; + String value = getDeployProperty(deployProperty, i); + res.add(i, value); + } + return res; + } + + public static String getDeployProperty(CmsState cmsState, CmsDeployProperty deployProperty) { + return ((CmsStateImpl) cmsState).getDeployProperty(deployProperty); + } + + public String getDeployProperty(CmsDeployProperty deployProperty) { + String value = getDeployProperty(deployProperty, 0); + return value; + } + + public String getDeployProperty(CmsDeployProperty deployProperty, int index) { + String propertyName = deployProperty.getProperty() + (index == 0 ? "" : "." + index); + String value = doGetDeployProperty(propertyName); + if (value == null && index == 0) { + // try defaults + if (deployPropertyDefaults.containsKey(deployProperty)) { + value = deployPropertyDefaults.get(deployProperty); + } + // try legacy properties + String legacyProperty = switch (deployProperty) { + case DIRECTORY -> "argeo.node.useradmin.uris"; + case DB_URL -> "argeo.node.dburl"; + case DB_USER -> "argeo.node.dbuser"; + case DB_PASSWORD -> "argeo.node.dbpassword"; + case HTTP_PORT -> "org.osgi.service.http.port"; + case HTTPS_PORT -> "org.osgi.service.http.port.secure"; + case HOST -> "org.eclipse.equinox.http.jetty.http.host"; + case LOCALE -> "argeo.i18n.defaultLocale"; + + default -> null; + }; + if (legacyProperty != null) { + value = doGetDeployProperty(legacyProperty); + if (value != null) { + log.warn("Retrieved deploy property " + deployProperty.getProperty() + + " through deprecated property " + legacyProperty); + } + } + } + if (index == 0 && deployProperty.isSystemPropertyOnly()) { + String systemPropertyValue = System.getProperty(deployProperty.getProperty()); + if (!Objects.equals(value, systemPropertyValue)) + throw new IllegalStateException( + "Property " + deployProperty + " must be a ssystem property, but its value is " + value + + ", while the system property value is " + systemPropertyValue); + } + return value != null ? value.toString() : null; + } -// instance = null; + protected String getLegacyProperty(String legacyProperty, CmsDeployProperty deployProperty) { + String value = doGetDeployProperty(legacyProperty); + if (value != null) { + log.warn("Retrieved deploy property " + deployProperty.getProperty() + " through deprecated property " + + legacyProperty + "."); + } + return value; } -// @Override -// public boolean isClean() { -// return cleanState; -// } + protected String doGetDeployProperty(String property) { + return KernelUtils.getFrameworkProp(property); + } + + @Override + public Path getDataPath(String relativePath) { + return KernelUtils.getOsgiInstancePath(relativePath); + } @Override public Long getAvailableSince() { @@ -229,6 +306,56 @@ public class CmsStateImpl implements CmsState { return hostname; } + @Override + public UUID getUuid() { + return uuid; + } + + public void setUuidFactory(UuidFactory uuidFactory) { + this.uuidFactory = uuidFactory; + } + + /** + * Called before node initialisation, in order populate OSGi instance are with + * some files (typically LDIF, etc). + */ + public static void prepareFirstInitInstanceArea(List nodeInits) { + + for (String nodeInit : nodeInits) { + + if (nodeInit.startsWith("http")) { + // TODO reconnect it + // registerRemoteInit(nodeInit); + } else { + + // TODO use java.nio.file + File initDir; + if (nodeInit.startsWith(".")) + initDir = KernelUtils.getExecutionDir(nodeInit); + else + initDir = new File(nodeInit); + // TODO also uncompress archives + if (initDir.exists()) + try { + // TODO use NIO utilities + FileUtils.copyDirectory(initDir, KernelUtils.getOsgiInstancePath("").toFile(), + new FileFilter() { + + @Override + public boolean accept(File pathname) { + if (pathname.getName().equals(".svn") || pathname.getName().equals(".git")) + return false; + return true; + } + }); + log.info("CMS initialized from " + initDir.getCanonicalPath()); + } catch (IOException e) { + throw new RuntimeException("Cannot initialize from " + initDir, e); + } + } + } + } + /* * STATIC */