X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeSecurity.java;h=eeb2b18b468c37a6fc61ce900aded1eab349c4cb;hb=0dfcfef53a629cf38bade4f8605c5b7e507c7436;hp=b436ac8d11e1e07262736f72d6ef0c78a0b02764;hpb=9dba7b01008499bdaf15c754190906d3200713fe;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeSecurity.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeSecurity.java index b436ac8d1..eeb2b18b4 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeSecurity.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeSecurity.java @@ -1,5 +1,7 @@ package org.argeo.cms.internal.kernel; +import static org.argeo.cms.internal.kernel.KernelUtils.getOsgiInstanceDir; + import java.io.File; import java.io.IOException; import java.net.URL; @@ -22,29 +24,20 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.cms.CmsException; import org.argeo.cms.auth.AuthConstants; -import org.argeo.security.crypto.PkiUtils; import org.bouncycastle.jce.provider.BouncyCastleProvider; -/** Authentication and user management. */ -class NodeSecurity { - final static String SECURITY_PROVIDER = "BC";// Bouncy Castle +/** Low-level kernel security */ +class NodeSecurity implements KernelConstants { + public final static int HARDENED = 3; + public final static int STAGING = 2; + public final static int DEV = 1; - private final static Log log; - static { - log = LogFactory.getLog(NodeSecurity.class); - // Make Bouncy Castle the default provider - Provider provider = new BouncyCastleProvider(); - int position = Security.insertProviderAt(provider, 1); - if (position == -1) - log.error("Provider " + provider.getName() - + " already installed and could not be set as default"); - Provider defaultProvider = Security.getProviders()[0]; - if (!defaultProvider.getName().equals(SECURITY_PROVIDER)) - log.error("Provider name is " + defaultProvider.getName() - + " but it should be " + SECURITY_PROVIDER); - } + private final boolean firstInit; private final Subject kernelSubject; + private int securityLevel = STAGING; + + private final File keyStoreFile; public NodeSecurity() { // Configure JAAS first @@ -52,11 +45,19 @@ class NodeSecurity { KernelConstants.JAAS_CONFIG); System.setProperty("java.security.auth.login.config", url.toExternalForm()); + // log.debug("JASS config: " + url.toExternalForm()); + // disable Jetty autostart + // System.setProperty("org.eclipse.equinox.http.jetty.autostart", + // "false"); + + firstInit = !new File(getOsgiInstanceDir(), DIR_NODE).exists(); - this.kernelSubject = logKernel(); + this.keyStoreFile = new File(KernelUtils.getOsgiInstanceDir(), + "node.p12"); + this.kernelSubject = logInKernel(); } - private Subject logKernel() { + private Subject logInKernel() { final Subject kernelSubject = new Subject(); createKeyStoreIfNeeded(); @@ -66,7 +67,8 @@ class NodeSecurity { public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException { // alias - ((NameCallback) callbacks[1]).setName(AuthConstants.ROLE_KERNEL); + ((NameCallback) callbacks[1]) + .setName(AuthConstants.ROLE_KERNEL); // store pwd ((PasswordCallback) callbacks[2]).setPassword("changeit" .toCharArray()); @@ -93,7 +95,7 @@ class NodeSecurity { KernelConstants.LOGIN_CONTEXT_KERNEL, kernelSubject); kernelLc.logout(); } catch (LoginException e) { - throw new CmsException("Cannot log in kernel", e); + throw new CmsException("Cannot log out kernel", e); } Security.removeProvider(SECURITY_PROVIDER); @@ -103,11 +105,28 @@ class NodeSecurity { return kernelSubject; } + public synchronized int getSecurityLevel() { + return securityLevel; + } + + public boolean isFirstInit() { + return firstInit; + } + + public void setSecurityLevel(int newValue) { + if (newValue != STAGING || newValue != DEV) + throw new CmsException("Invalid value for security level " + + newValue); + if (newValue >= securityLevel) + throw new CmsException( + "Impossible to increase security level (from " + + securityLevel + " to " + newValue + ")"); + securityLevel = newValue; + } + private void createKeyStoreIfNeeded() { char[] ksPwd = "changeit".toCharArray(); char[] keyPwd = Arrays.copyOf(ksPwd, ksPwd.length); - File keyStoreFile = new File(KernelUtils.getOsgiInstanceDir(), - "node.p12"); if (!keyStoreFile.exists()) { try { keyStoreFile.getParentFile().mkdirs(); @@ -121,4 +140,24 @@ class NodeSecurity { } } } + + File getHttpServerKeyStore() { + return keyStoreFile; + } + + private final static String SECURITY_PROVIDER = "BC";// Bouncy Castle + private final static Log log; + static { + log = LogFactory.getLog(NodeSecurity.class); + // Make Bouncy Castle the default provider + Provider provider = new BouncyCastleProvider(); + int position = Security.insertProviderAt(provider, 1); + if (position == -1) + log.error("Provider " + provider.getName() + + " already installed and could not be set as default"); + Provider defaultProvider = Security.getProviders()[0]; + if (!defaultProvider.getName().equals(SECURITY_PROVIDER)) + log.error("Provider name is " + defaultProvider.getName() + + " but it should be " + SECURITY_PROVIDER); + } }