X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeSecurity.java;h=6d216c651f8de9602e0a7239e6a5fea2fb8775d3;hb=18af628c072e386420f03261ab207a72341a0a1b;hp=b43a9fdf5c393b5aef084b8eb9e5b3df35e808ee;hpb=0a7d938324d33848ac7dc4ef4007c73a714171ee;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 b43a9fdf5..6d216c651 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,108 +1,101 @@ 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; import java.security.KeyStore; -import java.security.Provider; -import java.security.Security; import java.util.Arrays; import javax.security.auth.Subject; -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.CallbackHandler; -import javax.security.auth.callback.NameCallback; -import javax.security.auth.callback.PasswordCallback; -import javax.security.auth.callback.UnsupportedCallbackException; -import javax.security.auth.login.LoginContext; -import javax.security.auth.login.LoginException; -import javax.security.auth.x500.X500Principal; 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.bouncycastle.jce.provider.BouncyCastleProvider; /** Low-level kernel security */ -class NodeSecurity { +@Deprecated +class NodeSecurity implements KernelConstants { + private final static Log log = LogFactory.getLog(NodeSecurity.class); + public final static int HARDENED = 3; public final static int STAGING = 2; public final static int DEV = 1; - 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); - } + private final boolean firstInit; - private final Subject kernelSubject; + private Subject kernelSubject; private int securityLevel = STAGING; + private final File keyStoreFile; + public NodeSecurity() { // Configure JAAS first - URL url = getClass().getClassLoader().getResource( - KernelConstants.JAAS_CONFIG); - System.setProperty("java.security.auth.login.config", - url.toExternalForm()); + URL url = getClass().getClassLoader().getResource(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"); - this.kernelSubject = logInKernel(); - } + firstInit = !new File(getOsgiInstanceDir(), DIR_NODE).exists(); - private Subject logInKernel() { - final Subject kernelSubject = new Subject(); + this.keyStoreFile = new File(KernelUtils.getOsgiInstanceDir(), "node.p12"); createKeyStoreIfNeeded(); - - CallbackHandler cbHandler = new CallbackHandler() { - - @Override - public void handle(Callback[] callbacks) throws IOException, - UnsupportedCallbackException { - // alias - ((NameCallback) callbacks[1]) - .setName(AuthConstants.ROLE_KERNEL); - // store pwd - ((PasswordCallback) callbacks[2]).setPassword("changeit" - .toCharArray()); - // key pwd - ((PasswordCallback) callbacks[3]).setPassword("changeit" - .toCharArray()); - } - }; - try { - LoginContext kernelLc = new LoginContext( - KernelConstants.LOGIN_CONTEXT_KERNEL, kernelSubject, - cbHandler); - kernelLc.login(); - } catch (LoginException e) { - throw new CmsException("Cannot log in kernel", e); - } - return kernelSubject; +// if (keyStoreFile.exists()) +// this.kernelSubject = logInHardenedKernel(); +// else +// this.kernelSubject = logInKernel(); } - void destroy() { - // Logout kernel - try { - LoginContext kernelLc = new LoginContext( - KernelConstants.LOGIN_CONTEXT_KERNEL, kernelSubject); - kernelLc.logout(); - } catch (LoginException e) { - throw new CmsException("Cannot log out kernel", e); - } - - Security.removeProvider(SECURITY_PROVIDER); - } +// private Subject logInKernel() { +// final Subject kernelSubject = new Subject(); +// try { +// LoginContext kernelLc = new LoginContext(KernelConstants.LOGIN_CONTEXT_KERNEL, kernelSubject); +// kernelLc.login(); +// } catch (LoginException e) { +// throw new CmsException("Cannot log in kernel", e); +// } +// return kernelSubject; +// } +// +// private Subject logInHardenedKernel() { +// final Subject kernelSubject = new Subject(); +// createKeyStoreIfNeeded(); +// +// CallbackHandler cbHandler = new CallbackHandler() { +// +// @Override +// public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException { +// // alias +//// ((NameCallback) callbacks[1]).setName(AuthConstants.ROLE_KERNEL); +// // store pwd +// ((PasswordCallback) callbacks[2]).setPassword("changeit".toCharArray()); +// // key pwd +// ((PasswordCallback) callbacks[3]).setPassword("changeit".toCharArray()); +// } +// }; +// try { +// LoginContext kernelLc = new LoginContext(KernelConstants.LOGIN_CONTEXT_HARDENED_KERNEL, kernelSubject, +// cbHandler); +// kernelLc.login(); +// } catch (LoginException e) { +// throw new CmsException("Cannot log in kernel", e); +// } +// return kernelSubject; +// } + +// void destroy() { +// // Logout kernel +// try { +// LoginContext kernelLc = new LoginContext(KernelConstants.LOGIN_CONTEXT_KERNEL, kernelSubject); +// kernelLc.logout(); +// } catch (LoginException e) { +// throw new CmsException("Cannot log out kernel", e); +// } +// +// // Security.removeProvider(SECURITY_PROVIDER); +// } public Subject getKernelSubject() { return kernelSubject; @@ -112,33 +105,59 @@ class NodeSecurity { 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); + throw new CmsException("Invalid value for security level " + newValue); if (newValue >= securityLevel) throw new CmsException( - "Impossible to increase security level (from " - + securityLevel + " to " + newValue + ")"); + "Impossible to increase security level (from " + securityLevel + " to " + newValue + ")"); securityLevel = newValue; } private void createKeyStoreIfNeeded() { + // for (Provider provider : Security.getProviders()) + // System.out.println(provider.getName()); + 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(); KeyStore keyStore = PkiUtils.getKeyStore(keyStoreFile, ksPwd); - PkiUtils.generateSelfSignedCertificate(keyStore, - new X500Principal(AuthConstants.ROLE_KERNEL), keyPwd); +// PkiUtils.generateSelfSignedCertificate(keyStore, new X500Principal(AuthConstants.ROLE_KERNEL), 1024, +// keyPwd); PkiUtils.saveKeyStore(keyStoreFile, ksPwd, keyStore); + if (log.isDebugEnabled()) + log.debug("Created keystore " + keyStoreFile); } catch (Exception e) { - throw new CmsException("Cannot create key store " - + keyStoreFile, e); + if (keyStoreFile.length() == 0) + keyStoreFile.delete(); + log.error("Cannot create keystore " + keyStoreFile, e); } } } + + 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); + // } }