Fix #26372: add filter to /api/proxy for only owned proxies

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/api/ProxyController.java

@@ -34,6 +34,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import eu.openanalytics.containerproxy.model.runtime.Proxy;
@@ -61,7 +62,12 @@ public ResponseEntity<ProxySpec> getProxySpec(@PathVariable String proxySpecId)
 	}
 
 	@RequestMapping(value="/api/proxy", method=RequestMethod.GET, produces=MediaType.APPLICATION_JSON_VALUE)
-	public List<Proxy> listProxies() {
+	public List<Proxy> listProxies(@RequestParam(value = "only_owned_proxies", required = false, defaultValue = "false") boolean onlyOwnedProxies) {
+		if (onlyOwnedProxies) {
+			// even if the user is an admin this will only return proxies that the user owns
+			return proxyService.getProxiesOfCurrentUser(null);
+		}
+		// if the user is an admin this will return all proxies
 		return proxyService.getProxies(null, false);
 	}
 

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

@@ -224,6 +224,23 @@ public List<Proxy> getProxies(Predicate<Proxy> filter, boolean ignoreAccessContr
 		return matches;
 	}
 
+	/**
+	 * Find all proxies that match an optional filter and that are owned by the current user.
+	 *
+	 * @param filter The filter to match, or null.
+	 * @return A List of matching proxies, may be empty.
+	 */
+	public List<Proxy> getProxiesOfCurrentUser(Predicate<Proxy> filter) {
+		List<Proxy> matches = new ArrayList<>();
+		synchronized (activeProxies) {
+			for (Proxy proxy: activeProxies) {
+				boolean hasAccess = userService.isOwner(proxy);
+				if (hasAccess && (filter == null || filter.test(proxy))) matches.add(proxy);
+			}
+		}
+		return matches;
+	}
+
 	/**
 	 * Launch a new proxy using the given ProxySpec.
 	 *