X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeSecurity.java;h=6d216c651f8de9602e0a7239e6a5fea2fb8775d3;hb=7e333073d07b780efe681306a1842a750cbea83c;hp=bb33daecf0602339a95596dbc8fba7e297b70a41;hpb=b7469a692d23890986d5c4880acabcf1f4f27027;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 bb33daecf..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
@@ -3,43 +3,36 @@ 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.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;
 
 /** Low-level kernel security */
+@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;
 
 	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",
@@ -47,54 +40,62 @@ class NodeSecurity implements KernelConstants {
 
 		firstInit = !new File(getOsgiInstanceDir(), DIR_NODE).exists();
 
-		this.keyStoreFile = new File(KernelUtils.getOsgiInstanceDir(),
-				"node.p12");
-		this.kernelSubject = logInKernel();
-	}
-
-	private Subject logInKernel() {
-		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_KERNEL, kernelSubject,
-					cbHandler);
-			kernelLc.login();
-		} catch (LoginException e) {
-			throw new CmsException("Cannot log in kernel", e);
-		}
-		return kernelSubject;
+		this.keyStoreFile = new File(KernelUtils.getOsgiInstanceDir(), "node.p12");
+		createKeyStoreIfNeeded();
+//		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;
@@ -110,28 +111,32 @@ class NodeSecurity implements KernelConstants {
 
 	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);
 		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);
 			}
 		}
 	}