Revert "Save work"

This reverts commit 9e98f39.

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/backend/kubernetes/KubernetesBackend.java

@@ -586,7 +586,7 @@ protected void doStopProxy(Proxy proxy) throws Exception {
 				// specify gracePeriod 0, this was the default in previous version of the fabric8 k8s client
 				kubeClient.resource(pod).withGracePeriod(0).delete();
 			}
-
+			
 			Service service = Service.class.cast(container.getParameters().get(PARAM_SERVICE));
 			if (service != null) {
 				kubeClient.resource(service).withGracePeriod(0).delete();

src/main/java/eu/openanalytics/containerproxy/security/WebSecurityConfig.java

@@ -24,7 +24,6 @@
 import eu.openanalytics.containerproxy.auth.IAuthenticationBackend;
 import eu.openanalytics.containerproxy.auth.UserLogoutHandler;
 import eu.openanalytics.containerproxy.util.AppRecoveryFilter;
-import eu.openanalytics.containerproxy.util.IdFilter;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -78,10 +77,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
 	@Inject
 	private AppRecoveryFilter appRecoveryFilter;
-
-	@Inject
-	private IdFilter idFilter;
-
+	
 	@Autowired(required=false)
 	private List<ICustomSecurityConfig> customConfigs;
 
@@ -119,7 +115,6 @@ private void checkForIncorrectConfiguration(HttpServletRequest request) {
 	protected void configure(HttpSecurity http) throws Exception {
 		// App Recovery Filter
 		http.addFilterAfter(appRecoveryFilter, BasicAuthenticationFilter.class);
-		http.addFilterAfter(idFilter, BasicAuthenticationFilter.class);
 
 		// Perform CSRF check on the login form
 		http.csrf().requireCsrfProtectionMatcher(new AntPathRequestMatcher("/login", "POST"));

src/main/java/eu/openanalytics/containerproxy/service/ProxyService.java

@@ -299,6 +299,7 @@ public void stopProxy(Proxy proxy, boolean async, boolean ignoreAccessControl) {
 		if (!ignoreAccessControl && !userService.isAdmin() && !userService.isOwner(proxy)) {
 			throw new AccessDeniedException(String.format("Cannot stop proxy %s: access denied", proxy.getId()));
 		}
+		activeProxies.remove(proxy);
 
 		Runnable releaser = () -> {
 			try {
@@ -311,11 +312,6 @@ public void stopProxy(Proxy proxy, boolean async, boolean ignoreAccessControl) {
 					applicationEventPublisher.publishEvent(new ProxyStopEvent(this, proxy.getUserId(), proxy.getSpec().getId(),
 							Duration.ofMillis(System.currentTimeMillis() - proxy.getStartupTimestamp())));
 				}
-				try {
-					Thread.sleep(2000);
-				} catch (InterruptedException e) {
-					throw new RuntimeException(e);
-				}
 				removeProxy(proxy);
 			} catch (Exception e){
 				log.error("Failed to release proxy " + proxy.getId(), e);