Add RedisSessionConfig

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/RedisSessionConfig.java

@@ -0,0 +1,88 @@
+/**
+ * ContainerProxy
+ *
+ * Copyright (C) 2016-2021 Open Analytics
+ *
+ * ===========================================================================
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the Apache License as published by
+ * The Apache Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * Apache License for more details.
+ *
+ * You should have received a copy of the Apache License
+ * along with this program.  If not, see <http://www.apache.org/licenses/>
+ */
+package eu.openanalytics.containerproxy;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.session.RedisSessionProperties;
+import org.springframework.boot.autoconfigure.session.SessionProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
+import org.springframework.session.data.redis.config.ConfigureNotifyKeyspaceEventsAction;
+import org.springframework.session.data.redis.config.ConfigureRedisAction;
+import org.springframework.session.data.redis.config.annotation.web.http.RedisHttpSessionConfiguration;
+
+import javax.inject.Inject;
+import java.time.Duration;
+
+@ConditionalOnProperty(name = "spring.session.store-type", havingValue = "redis")
+@Configuration(proxyBeanMethods = false)
+@EnableConfigurationProperties(RedisSessionProperties.class)
+public class RedisSessionConfig extends RedisHttpSessionConfiguration {
+
+    private String redisNamespace;
+
+    @Inject
+    private Environment environment;
+
+    @Bean
+    @ConditionalOnMissingBean
+    public ConfigureRedisAction configureRedisAction(RedisSessionProperties redisSessionProperties) {
+        switch (redisSessionProperties.getConfigureAction()) {
+            case NOTIFY_KEYSPACE_EVENTS:
+                return new ConfigureNotifyKeyspaceEventsAction();
+            case NONE:
+                return ConfigureRedisAction.NO_OP;
+        }
+        throw new IllegalStateException(
+                "Unsupported redis configure action '" + redisSessionProperties.getConfigureAction() + "'.");
+
+    }
+
+    @Autowired
+    public void customize(SessionProperties sessionProperties, RedisSessionProperties redisSessionProperties) {
+        Duration timeout = sessionProperties.getTimeout();
+        if (timeout != null) {
+            setMaxInactiveIntervalInSeconds((int) timeout.getSeconds());
+        }
+        setFlushMode(redisSessionProperties.getFlushMode());
+        setSaveMode(redisSessionProperties.getSaveMode());
+        setCleanupCron(redisSessionProperties.getCleanupCron());
+
+        String realmId = environment.getProperty("proxy.realm-id");
+
+        if (realmId != null) {
+            redisNamespace = String.format("shinyproxy__%s__%s", realmId, redisSessionProperties.getNamespace());
+        } else {
+            redisNamespace = String.format("shinyproxy__%s", redisSessionProperties.getNamespace());
+        }
+
+        setRedisNamespace(redisNamespace);
+    }
+
+    public String getNamespace() {
+        return redisNamespace;
+    }
+
+}

src/main/java/eu/openanalytics/containerproxy/service/session/redis/RedisSessionService.java

@@ -20,14 +20,14 @@
  */
 package eu.openanalytics.containerproxy.service.session.redis;
 
+import eu.openanalytics.containerproxy.RedisSessionConfig;
 import eu.openanalytics.containerproxy.service.session.ISessionService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.session.RedisSessionProperties;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.security.core.session.SessionInformation;
-import org.springframework.security.core.session.SessionRegistry;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.session.Session;
 import org.springframework.session.data.redis.RedisIndexedSessionRepository;
 import org.springframework.stereotype.Component;
 
@@ -54,10 +54,7 @@ public class RedisSessionService implements ISessionService  {
     private RedisIndexedSessionRepository redisIndexedSessionRepository;
 
     @Inject
-    private SessionRegistry sessionRegistry;
-
-    @Inject
-    private RedisSessionProperties redisSessionProperties;
+    private RedisSessionConfig redisSessionConfig;
 
     private String keyPattern;
     private RedisTemplate<Object, Object> redisTemplate;
@@ -66,12 +63,12 @@ public class RedisSessionService implements ISessionService  {
 
     @PostConstruct
     public void init() {
-        keyPattern = redisSessionProperties.getNamespace() + ":sessions:*";
+        keyPattern = redisSessionConfig.getNamespace() + ":sessions:*";
         redisTemplate = (RedisTemplate<Object, Object>) redisIndexedSessionRepository.getSessionRedisOperations();
         new Timer().schedule(new TimerTask() {
             @Override
             public void run() {
-                 updateCachedUsersLoggedInCount();
+                updateCachedUsersLoggedInCount();
             }
         }, 0, CACHE_UPDATE_INTERVAL);
     }
@@ -96,16 +93,21 @@ private void updateCachedUsersLoggedInCount() {
             return;
         }
 
-        System.out.println(keys);
-
         Set<String> authenticatedUsers = keys
                 .stream()
                 .map((keyId) -> {
                     String sessionId = extractSessionId(keyId);
                     if (sessionId != null) {
-                        SessionInformation sessionInformation = sessionRegistry.getSessionInformation(sessionId);
-                        if (sessionInformation != null) {
-                            return sessionInformation.getPrincipal().toString();
+                        logger.debug(String.format("Extracted sessionId %s ", sessionId));
+                        Session session = redisIndexedSessionRepository.findById(sessionId);
+                        if (session != null) {
+                            Object object = session.getAttribute("SPRING_SECURITY_CONTEXT");
+                            if (object instanceof SecurityContext) {
+                                SecurityContext securityContext = (SecurityContext) object;
+                                if (securityContext.getAuthentication().isAuthenticated()) {
+                                    return securityContext.getAuthentication().getName();
+                                }
+                            }
                         }
                     }
                     return null;