X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernelUtils.java;h=9b43044d446a0e638a8d17292387cfcf525642d8;hb=0dfcfef53a629cf38bade4f8605c5b7e507c7436;hp=579138c0f2e111965eb5b0748941322563af9c76;hpb=e91af5c65a42b3ff98400caa552965cdb3f730e6;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelUtils.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelUtils.java
index 579138c0f..9b43044d4 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelUtils.java
@@ -3,25 +3,21 @@ package org.argeo.cms.internal.kernel;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
-import java.util.Collections;
 import java.util.Dictionary;
 import java.util.Enumeration;
 import java.util.Hashtable;
-import java.util.List;
 import java.util.Properties;
+import java.util.TreeSet;
 
+import javax.security.auth.Subject;
+import javax.security.auth.login.LoginContext;
+import javax.security.auth.login.LoginException;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
 import org.argeo.cms.CmsException;
-import org.argeo.cms.KernelHeader;
-import org.argeo.cms.internal.auth.GrantedAuthorityPrincipal;
-import org.springframework.security.authentication.AnonymousAuthenticationToken;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.UserDetails;
+import org.argeo.cms.auth.AuthConstants;
+import org.osgi.framework.BundleContext;
 
 /** Package utilities */
 class KernelUtils implements KernelConstants {
@@ -47,12 +43,36 @@ class KernelUtils implements KernelConstants {
 		return asDictionary(props);
 	}
 
+	static File getExecutionDir(String relativePath) {
+		File executionDir = new File(getFrameworkProp("user.dir"));
+		if (relativePath == null)
+			return executionDir;
+		try {
+			return new File(executionDir, relativePath).getCanonicalFile();
+		} catch (IOException e) {
+			throw new CmsException("Cannot get canonical file", e);
+		}
+	}
+
 	static File getOsgiInstanceDir() {
 		return new File(Activator.getBundleContext()
 				.getProperty(OSGI_INSTANCE_AREA).substring("file:".length()))
 				.getAbsoluteFile();
 	}
 
+	static String getOsgiInstancePath(String relativePath) {
+		try {
+			if (relativePath == null)
+				return getOsgiInstanceDir().getCanonicalPath();
+			else
+				return new File(getOsgiInstanceDir(), relativePath)
+						.getCanonicalPath();
+		} catch (IOException e) {
+			throw new CmsException("Cannot get instance path for "
+					+ relativePath, e);
+		}
+	}
+
 	static File getOsgiConfigurationFile(String relativePath) {
 		try {
 			return new File(new URI(Activator.getBundleContext().getProperty(
@@ -76,25 +96,39 @@ class KernelUtils implements KernelConstants {
 	}
 
 	// Security
-	@Deprecated
-	static void anonymousLogin(AuthenticationManager authenticationManager) {
+	static Subject anonymousLogin() {
+		Subject subject = new Subject();
+		LoginContext lc;
 		try {
-			List<GrantedAuthorityPrincipal> anonAuthorities = Collections
-					.singletonList(new GrantedAuthorityPrincipal(
-							KernelHeader.ROLE_ANONYMOUS));
-			UserDetails anonUser = new User(KernelHeader.USERNAME_ANONYMOUS,
-					"", true, true, true, true, anonAuthorities);
-			AnonymousAuthenticationToken anonToken = new AnonymousAuthenticationToken(
-					DEFAULT_SECURITY_KEY, anonUser, anonAuthorities);
-			Authentication authentication = authenticationManager
-					.authenticate(anonToken);
-			SecurityContextHolder.getContext()
-					.setAuthentication(authentication);
-		} catch (Exception e) {
-			throw new CmsException("Cannot authenticate", e);
+			lc = new LoginContext(AuthConstants.LOGIN_CONTEXT_ANONYMOUS,
+					subject);
+			lc.login();
+			return subject;
+		} catch (LoginException e) {
+			throw new CmsException("Cannot login as anonymous", e);
 		}
 	}
 
+	// @Deprecated
+	// static void anonymousLogin(AuthenticationManager authenticationManager) {
+	// try {
+	// List<GrantedAuthorityPrincipal> anonAuthorities = Collections
+	// .singletonList(new GrantedAuthorityPrincipal(
+	// KernelHeader.ROLE_ANONYMOUS));
+	// UserDetails anonUser = new User(KernelHeader.USERNAME_ANONYMOUS,
+	// "", true, true, true, true, anonAuthorities);
+	// AnonymousAuthenticationToken anonToken = new
+	// AnonymousAuthenticationToken(
+	// DEFAULT_SECURITY_KEY, anonUser, anonAuthorities);
+	// Authentication authentication = authenticationManager
+	// .authenticate(anonToken);
+	// SecurityContextHolder.getContext()
+	// .setAuthentication(authentication);
+	// } catch (Exception e) {
+	// throw new CmsException("Cannot authenticate", e);
+	// }
+	// }
+
 	// HTTP
 	static void logRequestHeaders(Log log, HttpServletRequest request) {
 		if (!log.isDebugEnabled())
@@ -105,6 +139,24 @@ class KernelUtils implements KernelConstants {
 			Object headerValue = request.getHeader(headerName);
 			log.debug(headerName + ": " + headerValue);
 		}
+		log.debug("");
+	}
+
+	static void logFrameworkProperties(Log log) {
+		BundleContext bc = Activator.getBundleContext();
+		for (Object sysProp : new TreeSet<Object>(System.getProperties()
+				.keySet())) {
+			log.debug(sysProp + "=" + bc.getProperty(sysProp.toString()));
+		}
+		// String[] keys = { Constants.FRAMEWORK_STORAGE,
+		// Constants.FRAMEWORK_OS_NAME, Constants.FRAMEWORK_OS_VERSION,
+		// Constants.FRAMEWORK_PROCESSOR, Constants.FRAMEWORK_SECURITY,
+		// Constants.FRAMEWORK_TRUST_REPOSITORIES,
+		// Constants.FRAMEWORK_WINDOWSYSTEM, Constants.FRAMEWORK_VENDOR,
+		// Constants.FRAMEWORK_VERSION, Constants.FRAMEWORK_STORAGE_CLEAN,
+		// Constants.FRAMEWORK_LANGUAGE, Constants.FRAMEWORK_UUID };
+		// for (String key : keys)
+		// log.debug(key + "=" + bc.getProperty(key));
 	}
 
 	private KernelUtils() {