X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.core%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fcore%2FAbstractSystemExecution.java;h=3acf26c8a1d3097f0336aea0d1c0051556d477dc;hb=d12f4cda6ff7b1de242a19362c3680f30ccc5168;hp=0d075c3a60b5b0039a17fb95de648b12d2dbe952;hpb=759a7c0396796565b231738b855c8b0a8413be6b;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.core/src/org/argeo/security/core/AbstractSystemExecution.java b/org.argeo.security.core/src/org/argeo/security/core/AbstractSystemExecution.java
index 0d075c3a6..3acf26c8a 100644
--- a/org.argeo.security.core/src/org/argeo/security/core/AbstractSystemExecution.java
+++ b/org.argeo.security.core/src/org/argeo/security/core/AbstractSystemExecution.java
@@ -15,17 +15,11 @@
  */
 package org.argeo.security.core;
 
-import javax.security.auth.login.LoginContext;
-import javax.security.auth.login.LoginException;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
 import org.argeo.security.SystemAuthentication;
-import org.argeo.security.login.BundleContextCallbackHandler;
-import org.osgi.framework.BundleContext;
 import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -45,9 +39,7 @@ public abstract class AbstractSystemExecution {
 	private final static Log log = LogFactory
 			.getLog(AbstractSystemExecution.class);
 	private AuthenticationManager authenticationManager;
-	private BundleContext bundleContext;
 	private String systemAuthenticationKey;
-	private String loginContextName = "SYSTEM";
 
 	/** Whether the current thread was authenticated by this component. */
 	private ThreadLocal<Boolean> authenticatedBySelf = new ThreadLocal<Boolean>() {
@@ -81,28 +73,16 @@ public abstract class AbstractSystemExecution {
 
 		String key = systemAuthenticationKey != null ? systemAuthenticationKey
 				: System.getProperty(
-						InternalAuthentication.SYSTEM_KEY_PROPERTY,
+						SystemAuthentication.SYSTEM_KEY_PROPERTY,
 						InternalAuthentication.SYSTEM_KEY_DEFAULT);
 		if (key == null)
 			throw new ArgeoException("No system key defined");
-		if (authenticationManager != null) {
-			Authentication auth = authenticationManager
-					.authenticate(new InternalAuthentication(key));
-			securityContext.setAuthentication(auth);
-		} else {
-			try {
-				// TODO test this
-				if (bundleContext == null)
-					throw new ArgeoException("bundleContext must be set");
-				BundleContextCallbackHandler callbackHandler = new BundleContextCallbackHandler(
-						bundleContext);
-				LoginContext loginContext = new LoginContext(loginContextName,
-						callbackHandler);
-				loginContext.login();
-			} catch (LoginException e) {
-				throw new BadCredentialsException("Cannot authenticate");
-			}
-		}
+		if (authenticationManager == null)
+			throw new ArgeoException("Authentication manager cannot be null.");
+		Authentication auth = authenticationManager
+				.authenticate(new InternalAuthentication(key));
+		securityContext.setAuthentication(auth);
+
 		authenticatedBySelf.set(true);
 		if (log.isTraceEnabled())
 			log.trace("System authenticated");
@@ -128,20 +108,12 @@ public abstract class AbstractSystemExecution {
 		return authenticatedBySelf.get();
 	}
 
-	@Deprecated
 	public void setAuthenticationManager(
 			AuthenticationManager authenticationManager) {
-		// log.warn("This approach is deprecated, inject bundleContext instead");
 		this.authenticationManager = authenticationManager;
 	}
 
-	@Deprecated
 	public void setSystemAuthenticationKey(String systemAuthenticationKey) {
 		this.systemAuthenticationKey = systemAuthenticationKey;
 	}
-
-	public void setBundleContext(BundleContext bundleContext) {
-		this.bundleContext = bundleContext;
-	}
-
 }