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=07f8ebe6d86a3fe0a7e32228cd7de3be487c5fdb;hb=1d5afdce3e91054f07ddd3c98309c363b4cf1d46;hp=01d760f12befc1ce88fa38eb37c4d308505c6a49;hpb=802beab5459c8da4970215886babb45d968e4639;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 01d760f12..07f8ebe6d 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,61 +1,64 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 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 (RuntimeException e) {
+			throw e;
+		} 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() {
+	protected <T> Callable<T> wrapWithSystemAuthentication(
+			final Callable<T> runnable) {
+		return new Callable<T>() {
 
-			public void run() {
-				SecurityContext securityContext = SecurityContextHolder
-						.getContext();
-				Authentication auth = authenticationManager
-						.authenticate(new InternalAuthentication(
-								systemAuthenticationKey));
-				securityContext.setAuthentication(auth);
+			public T call() throws Exception {
+				authenticateAsSystem();
 				try {
-					runnable.run();
+					return runnable.call();
 				} finally {
-					// remove the authentication
-					securityContext.setAuthentication(null);
+//					deauthenticateAsSystem();
 				}
 			}
 		};
 	}
-
-	public void setAuthenticationManager(
-			AuthenticationManager authenticationManager) {
-		this.authenticationManager = authenticationManager;
-	}
-
-	public void setSystemAuthenticationKey(String systemAuthenticationKey) {
-		this.systemAuthenticationKey = systemAuthenticationKey;
-	}
-
 }