Fix #34795: include version number in Redis session keys

Author: LEDfan

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

@@ -26,6 +26,7 @@
 import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
+import org.springframework.boot.info.BuildProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -49,12 +50,13 @@ public class RedisSessionConfig {
     private final String redisNamespace;
     private final Environment environment;
 
-    public RedisSessionConfig(IdentifierService identifierService, Environment environment) {
+    public RedisSessionConfig(IdentifierService identifierService, Environment environment, BuildProperties buildProperties) {
         this.environment = environment;
+        String version = buildProperties.getVersion().replace(".", "_").replace("-", "_");
         if (identifierService.realmId != null) {
-            redisNamespace = String.format("shinyproxy__%s__%s", identifierService.realmId, RedisIndexedSessionRepository.DEFAULT_NAMESPACE);
+            redisNamespace = String.format("shinyproxy__%s__%s__%s", identifierService.realmId, version, RedisIndexedSessionRepository.DEFAULT_NAMESPACE);
         } else {
-            redisNamespace = String.format("shinyproxy__%s", RedisIndexedSessionRepository.DEFAULT_NAMESPACE);
+            redisNamespace = String.format("shinyproxy__%s__%s", version, RedisIndexedSessionRepository.DEFAULT_NAMESPACE);
         }
     }
 
@@ -106,8 +108,7 @@ class SafeRedisSessionMapper implements BiFunction<String, Map<String, Object>,
         public MapSession apply(String sessionId, Map<String, Object> map) {
             try {
                 return this.delegate.apply(sessionId, map);
-            }
-            catch (IllegalStateException ex) {
+            } catch (IllegalStateException ex) {
                 // do not invoke RedisIndexedSessionRepository#deleteById to avoid an infinite loop because the method also invokes this mapper
                 redisOperations.delete(getRedisNamespace() + ":sessions:" + sessionId);
                 return null;

src/main/java/eu/openanalytics/containerproxy/auth/impl/oidc/redis/RedisOAuth2AuthorizedClientService.java

@@ -20,6 +20,7 @@
  */
 package eu.openanalytics.containerproxy.auth.impl.oidc.redis;
 
+import eu.openanalytics.containerproxy.RedisSessionConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.redis.core.HashOperations;
@@ -38,13 +39,16 @@ public class RedisOAuth2AuthorizedClientService implements OAuth2AuthorizedClien
     @Inject
     private RedisTemplate<String, OAuth2AuthorizedClient> redisTemplate;
 
+    @Inject
+    private RedisSessionConfig redisSessionConfig;
+
     private String redisKey;
 
     private HashOperations<String, String, OAuth2AuthorizedClient> ops;
 
     @PostConstruct
     public void init() {
-        redisKey = "shinyproxy_spring_oauth_authorized_clients__";
+        redisKey = redisSessionConfig.getRedisNamespace() + "_oauth_authorized_clients__";
         ops = redisTemplate.opsForHash();
     }