X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fcore%2FKeyBasedSystemExecutionService.java;h=07ae046539c93ca5dd8f2deddf9c6ee62db4b7c6;hb=3e638706693d06f4b5a16c8fe0197b8c7e7794b3;hp=d586d1178268af09ed507bea46390eac1c41ef33;hpb=977a7a352131b082a98739f15e421f2bff747567;p=lgpl%2Fargeo-commons.git

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/KeyBasedSystemExecutionService.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/KeyBasedSystemExecutionService.java
index d586d1178..07ae04653 100644
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/KeyBasedSystemExecutionService.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/KeyBasedSystemExecutionService.java
@@ -1,57 +1,47 @@
 package org.argeo.security.core;
 
-import org.argeo.security.SystemExecutionService;
-import org.springframework.core.task.SimpleAsyncTaskExecutor;
-import org.springframework.core.task.TaskExecutor;
-import org.springframework.security.Authentication;
-import org.springframework.security.AuthenticationManager;
-import org.springframework.security.context.SecurityContext;
-import org.springframework.security.context.SecurityContextHolder;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.FutureTask;
 
-public class KeyBasedSystemExecutionService implements SystemExecutionService {
-	private AuthenticationManager authenticationManager;
-	private String systemAuthenticationKey;
+import org.argeo.ArgeoException;
+import org.argeo.security.SystemExecutionService;
 
-	public void executeAsSystem(Runnable runnable) {
-		wrapWithSystemAuthentication(runnable).run();
+/**
+ * Implementation of a {@link SystemExecutionService} using a key-based
+ * {@link InternalAuthentication}
+ */
+public class KeyBasedSystemExecutionService extends AbstractSystemExecution
+		implements SystemExecutionService {
+	public void execute(Runnable runnable) {
+		try {
+			wrapWithSystemAuthentication(Executors.callable(runnable)).call();
+		} catch (Exception e) {
+			throw new ArgeoException(
+					"Exception when running system authenticated task", e);
+		}
 	}
 
-	public TaskExecutor createSystemAuthenticatedTaskExecutor() {
-		return new SimpleAsyncTaskExecutor() {
-			private static final long serialVersionUID = -8126773862193265020L;
-
-			@Override
-			public Thread createThread(Runnable runnable) {
-				return super
-						.createThread(wrapWithSystemAuthentication(runnable));
-			}
-
-		};
+	public <T> Future<T> submit(Callable<T> task) {
+		FutureTask<T> future = new FutureTask<T>(
+				wrapWithSystemAuthentication(task));
+		future.run();
+		return future;
 	}
 
-	protected Runnable wrapWithSystemAuthentication(final Runnable runnable) {
-		return new Runnable() {
-
-			public void run() {
-				SecurityContext securityContext = SecurityContextHolder
-						.getContext();
-				Authentication auth = authenticationManager
-						.authenticate(new InternalAuthentication(
-								systemAuthenticationKey));
-				securityContext.setAuthentication(auth);
-
-				runnable.run();
+	protected <T> Callable<T> wrapWithSystemAuthentication(
+			final Callable<T> runnable) {
+		return new Callable<T>() {
+
+			public T call() throws Exception {
+				authenticateAsSystem();
+				try {
+					return runnable.call();
+				} finally {
+					deauthenticateAsSystem();
+				}
 			}
 		};
 	}
-
-	public void setAuthenticationManager(
-			AuthenticationManager authenticationManager) {
-		this.authenticationManager = authenticationManager;
-	}
-
-	public void setSystemAuthenticationKey(String systemAuthenticationKey) {
-		this.systemAuthenticationKey = systemAuthenticationKey;
-	}
-
 }