Ref #26332: configure per app whether app should be stopped on logout

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/backend/strategy/impl/DefaultProxyLogoutStrategy.java

@@ -20,31 +20,50 @@
  */
 package eu.openanalytics.containerproxy.backend.strategy.impl;
 
-import javax.inject.Inject;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Component;
-
 import eu.openanalytics.containerproxy.backend.strategy.IProxyLogoutStrategy;
 import eu.openanalytics.containerproxy.model.runtime.Proxy;
 import eu.openanalytics.containerproxy.service.ProxyService;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 
 /**
- * Default logout behaviour: stop all proxies owned by the user.
+ * Default logout behaviour.
  */
 @Component
-@ConditionalOnProperty(name = "proxy.stop-proxies-on-logout", havingValue = "true", matchIfMissing = true)
 public class DefaultProxyLogoutStrategy implements IProxyLogoutStrategy {
 
+	private static final String PROP_DEFAULT_STOP_PROXIES_ON_LOGOUT = "proxy.default-stop-proxy-on-logout";
+
 	@Inject
 	private ProxyService proxyService;
-	
+
+	@Inject
+	private Environment environment;
+
+	private boolean defaultStopProxyOnLogout;
+
+	@PostConstruct
+	public void init() {
+		defaultStopProxyOnLogout = environment.getProperty(PROP_DEFAULT_STOP_PROXIES_ON_LOGOUT, Boolean.class, true);
+	}
+
 	@Override
 	public void onLogout(String userId) {
 		for (Proxy proxy: proxyService.getProxies(p -> p.getUserId().equals(userId), true)) {
-			proxyService.stopProxy(proxy, true, true);
+			if (shouldBeStopped(proxy)) {
+				proxyService.stopProxy(proxy, true, true);
+			}
+		}
+	}
+
+	public boolean shouldBeStopped(Proxy proxy) {
+		if (proxy.getSpec().stopOnLogout() != null) {
+			return proxy.getSpec().stopOnLogout();
 		}
+		return defaultStopProxyOnLogout;
 	}
 
 }

src/main/java/eu/openanalytics/containerproxy/backend/strategy/impl/NoOpProxyLogoutStrategy.java

@@ -44,6 +44,7 @@ public class ProxySpec {
 	private List<String> kubernetesAdditionalPersistentManifests = new ArrayList<>();
 
 	private Long maxLifeTime;
+	private Boolean stopOnLogout;
 
 	public ProxySpec() {
 		settings = new HashMap<>();
@@ -162,13 +163,21 @@ public void setMaxLifeTime(Long maxLifeTime) {
 		this.maxLifeTime = maxLifeTime;
 	}
 
+	public Boolean stopOnLogout() {
+		return stopOnLogout;
+	}
+
+	public void setStopOnLogout(Boolean stopOnLogout) {
+		this.stopOnLogout = stopOnLogout;
+	}
 
 	public void copy(ProxySpec target) {
 		target.setId(id);
 		target.setDisplayName(displayName);
 		target.setDescription(description);
 		target.setLogoURL(logoURL);
 		target.setMaxLifeTime(maxLifeTime);
+		target.setStopOnLogout(stopOnLogout);
 
 		if (accessControl != null) {
 			if (target.getAccessControl() == null) target.setAccessControl(new ProxyAccessControl());

src/main/java/eu/openanalytics/containerproxy/model/spec/ProxySpec.java

@@ -27,7 +27,6 @@
 import eu.openanalytics.containerproxy.event.UserLogoutEvent;
 import eu.openanalytics.containerproxy.model.runtime.Proxy;
 import eu.openanalytics.containerproxy.model.spec.ProxySpec;
-import eu.openanalytics.containerproxy.util.SessionHelper;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.context.ApplicationEventPublisher;