Fix #33229: don't fetch all proxies for getUserProxies

Author: LEDfan

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

@@ -200,11 +200,6 @@ public RedisTemplate<String, OAuth2AuthorizedClient> oAuth2AuthorizedClientRedis
         return template;
     }
 
-    @Bean
-    public RedisTemplate<String, String> unClaimSeatIdsTemplate(RedisConnectionFactory connectionFactory) {
-        return createRedisTemplate(connectionFactory, String.class);
-    }
-
     @Bean
     public RedisTemplate<String, Seat> seatsTemplate(RedisConnectionFactory connectionFactory) {
         return createRedisTemplate(connectionFactory, Seat.class);

src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/HttpHeadersKey.java

@@ -27,6 +27,8 @@ public class HttpHeadersKey extends RuntimeValueKey<HttpHeaders> {
 
     public static final HttpHeadersKey inst = new HttpHeadersKey();
 
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
     public HttpHeadersKey() {
         super("openanalytics.eu/sp-http-headers",
             "SHINYPROXY_HTTP_HEADERS",
@@ -41,7 +43,6 @@ public HttpHeadersKey() {
 
     @Override
     public HttpHeaders deserializeFromString(String value) {
-        ObjectMapper objectMapper = new ObjectMapper();
         try {
             return objectMapper.readValue(value, HttpHeaders.class);
         } catch (JsonProcessingException e) {
@@ -51,7 +52,6 @@ public HttpHeaders deserializeFromString(String value) {
 
     @Override
     public String serializeToString(HttpHeaders value) {
-        ObjectMapper objectMapper = new ObjectMapper();
         try {
             return objectMapper.writeValueAsString(value);
         } catch (JsonProcessingException e) {

src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/ParameterNamesKey.java

@@ -27,6 +27,7 @@
 public class ParameterNamesKey extends RuntimeValueKey<ParameterNames> {
 
     public static final ParameterNamesKey inst = new ParameterNamesKey();
+    private final ObjectMapper objectMapper = new ObjectMapper();
 
     public ParameterNamesKey() {
         super("openanalytics.eu/sp-parameters-names",
@@ -42,7 +43,6 @@ public ParameterNamesKey() {
 
     @Override
     public ParameterNames deserializeFromString(String value) {
-        ObjectMapper objectMapper = new ObjectMapper();
         try {
             return objectMapper.readValue(value, ParameterNames.class);
         } catch (JsonProcessingException e) {
@@ -52,7 +52,6 @@ public ParameterNames deserializeFromString(String value) {
 
     @Override
     public String serializeToString(ParameterNames value) {
-        ObjectMapper objectMapper = new ObjectMapper();
         try {
             return objectMapper.writeValueAsString(value);
         } catch (JsonProcessingException e) {

src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/ParameterValuesKey.java

@@ -27,6 +27,7 @@
 public class ParameterValuesKey extends RuntimeValueKey<ParameterValues> {
 
     public static final ParameterValuesKey inst = new ParameterValuesKey();
+    private final ObjectMapper objectMapper = new ObjectMapper();
 
     public ParameterValuesKey() {
         super("openanalytics.eu/sp-parameters",
@@ -42,7 +43,6 @@ public ParameterValuesKey() {
 
     @Override
     public ParameterValues deserializeFromString(String value) {
-        ObjectMapper objectMapper = new ObjectMapper();
         try {
             return objectMapper.readValue(value, ParameterValues.class);
         } catch (JsonProcessingException e) {
@@ -52,7 +52,6 @@ public ParameterValues deserializeFromString(String value) {
 
     @Override
     public String serializeToString(ParameterValues value) {
-        ObjectMapper objectMapper = new ObjectMapper();
         try {
             return objectMapper.writeValueAsString(value);
         } catch (JsonProcessingException e) {

src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/PortMappingsKey.java

@@ -27,6 +27,7 @@
 public class PortMappingsKey extends RuntimeValueKey<PortMappings> {
 
     public static final PortMappingsKey inst = new PortMappingsKey();
+    private final ObjectMapper objectMapper = new ObjectMapper();
 
     private PortMappingsKey() {
         super("openanalytics.eu/sp-port-mappings",
@@ -42,7 +43,6 @@ private PortMappingsKey() {
 
     @Override
     public PortMappings deserializeFromString(String value) {
-        ObjectMapper objectMapper = new ObjectMapper();
         try {
             return objectMapper.readValue(value, PortMappings.class);
         } catch (JsonProcessingException e) {
@@ -52,7 +52,6 @@ public PortMappings deserializeFromString(String value) {
 
     @Override
     public String serializeToString(PortMappings value) {
-        ObjectMapper objectMapper = new ObjectMapper();
         try {
             return objectMapper.writeValueAsString(value);
         } catch (JsonProcessingException e) {

src/main/java/eu/openanalytics/containerproxy/model/store/IProxyStore.java

@@ -23,6 +23,7 @@
 import eu.openanalytics.containerproxy.model.runtime.Proxy;
 
 import java.util.Collection;
+import java.util.List;
 
 /**
  * Interface to manage Active Proxies in the ProxyService.
@@ -38,4 +39,6 @@ public interface IProxyStore {
     void updateProxy(Proxy proxy);
 
     Proxy getProxy(String proxyId);
+
+    List<Proxy> getUserProxies(String userId);
 }

src/main/java/eu/openanalytics/containerproxy/model/store/memory/MemoryProxyStore.java

@@ -20,16 +20,22 @@
  */
 package eu.openanalytics.containerproxy.model.store.memory;
 
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.ListMultimap;
+import com.google.common.collect.Multimaps;
 import eu.openanalytics.containerproxy.model.runtime.Proxy;
 import eu.openanalytics.containerproxy.model.store.IProxyStore;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class MemoryProxyStore implements IProxyStore {
 
     private final ConcurrentHashMap<String, Proxy> activeProxies = new ConcurrentHashMap<>();
+    private final ListMultimap<String, String> userProxies = Multimaps.synchronizedListMultimap(ArrayListMultimap.create());
 
     @Override
     public Collection<Proxy> getAllProxies() {
@@ -39,11 +45,13 @@ public Collection<Proxy> getAllProxies() {
     @Override
     public void addProxy(Proxy proxy) {
         activeProxies.put(proxy.getId(), proxy);
+        userProxies.put(proxy.getUserId(), proxy.getId());
     }
 
     @Override
     public void removeProxy(Proxy proxy) {
         activeProxies.remove(proxy.getId());
+        userProxies.remove(proxy.getUserId(), proxy.getId());
     }
 
     @Override
@@ -56,4 +64,17 @@ public Proxy getProxy(String proxyId) {
         return activeProxies.get(proxyId);
     }
 
+    @Override
+    public List<Proxy> getUserProxies(String userId) {
+        List<Proxy> result = new ArrayList<>();
+        List<String> ids = userProxies.get(userId);
+        for (String proxyId : ids) {
+            Proxy proxy = activeProxies.get(proxyId);
+            if (proxy != null && proxy.getUserId().equalsIgnoreCase(userId)) {
+                result.add(proxy);
+            }
+        }
+        return result;
+    }
+
 }

src/main/java/eu/openanalytics/containerproxy/model/store/redis/RedisProxyStore.java

@@ -24,33 +24,46 @@
 import eu.openanalytics.containerproxy.model.runtime.Proxy;
 import eu.openanalytics.containerproxy.model.store.IProxyStore;
 import eu.openanalytics.containerproxy.service.IdentifierService;
+import eu.openanalytics.containerproxy.util.ProxyHashMap;
 import eu.openanalytics.containerproxy.util.ProxyMappingManager;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.context.event.EventListener;
 import org.springframework.data.redis.core.HashOperations;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.SetOperations;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class RedisProxyStore implements IProxyStore {
 
     private final Logger logger = LogManager.getLogger(RedisProxyStore.class);
     @Inject
     private RedisTemplate<String, Proxy> redisTemplate;
     @Inject
+    private RedisTemplate<String, String> userProxyTemplate;
+    @Inject
     private ProxyMappingManager mappingManager;
     @Inject
     private IdentifierService identifierService;
     private String redisKey;
     private HashOperations<String, String, Proxy> ops; // TODO refactor to bound?
+    private SetOperations<String, String> userProxyOps;
+
+    private final ConcurrentHashMap<String, Proxy> cache = ProxyHashMap.create();
+    private String userProxyRedisKey;
 
     @PostConstruct
     public void init() {
         redisKey = "shinyproxy_" + identifierService.realmId + "__active_proxies";
         ops = redisTemplate.opsForHash();
+        userProxyRedisKey = "shinyproxy_user_proxies__";
+        userProxyOps = userProxyTemplate.opsForSet();
     }
 
     @Override
@@ -65,13 +78,15 @@ public void addProxy(Proxy proxy) {
         logger.debug("Add proxy {}", proxy.getId());
         ops.put(redisKey, proxy.getId(), proxy);
         updateMappings(proxy.getId(), proxy);
+        userProxyOps.add(userProxyRedisKey + proxy.getUserId(), proxy.getId());
     }
 
     @Override
     public void removeProxy(Proxy proxy) {
         logger.debug("Remove proxy {}", proxy.getId());
         ops.delete(redisKey, proxy.getId());
         updateMappings(proxy.getId(), proxy);
+        userProxyOps.remove(userProxyRedisKey + proxy.getUserId(), proxy.getId());
     }
 
     @Override
@@ -89,6 +104,22 @@ public Proxy getProxy(String proxyId) {
         return proxy;
     }
 
+    @Override
+    public List<Proxy> getUserProxies(String userId) {
+        List<Proxy> result = new ArrayList<>();
+        Set<String> ids = userProxyOps.members(userProxyRedisKey + userId);
+        if (ids == null) {
+            return result;
+        }
+        List<Proxy> proxies = ops.multiGet(redisKey, ids);
+        for (Proxy proxy : proxies) {
+            if (proxy != null && proxy.getUserId().equalsIgnoreCase(userId)) {
+                result.add(proxy);
+            }
+        }
+        return result;
+    }
+
     @EventListener
     public void onProxyStopped(ProxyStopEvent event) {
         logger.debug("Redis: remove mappings (event) {}", event.getProxyId());

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

@@ -195,7 +195,7 @@ public Stream<Proxy> getUserProxiesBySpecId(String specId) {
      * @return A List of matching proxies, may be empty.
      */
     public List<Proxy> getUserProxies() {
-        return proxyStore.getAllProxies().stream().filter(p -> userService.isOwner(p)).toList();
+        return proxyStore.getUserProxies(userService.getCurrentUserId());
     }
 
     /**
@@ -204,7 +204,7 @@ public List<Proxy> getUserProxies() {
      * @return A List of matching proxies, may be empty.
      */
     public List<Proxy> getUserProxies(String userId) {
-        return proxyStore.getAllProxies().stream().filter(p -> p.getUserId().equals(userId)).toList();
+        return proxyStore.getUserProxies(userId);
     }
 
     /**