fix(credentials): query for Agent HTTP credentials without specific u…

…serinfo
cryostatio · Sep 21, 2023 · 553b8bb · 553b8bb
1 parent b989c2d
commit 553b8bb
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 4 deletions.
diff --git a/src/main/java/io/cryostat/configuration/CredentialsManager.java b/src/main/java/io/cryostat/configuration/CredentialsManager.java
@@ -16,6 +16,8 @@
 package io.cryostat.configuration;
 
 import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -38,13 +40,15 @@
 import io.cryostat.rules.MatchExpressionEvaluator;
 import io.cryostat.rules.MatchExpressionValidationException;
 import io.cryostat.rules.MatchExpressionValidator;
+import io.cryostat.util.URIUtil;
 import io.cryostat.util.events.AbstractEventEmitter;
 import io.cryostat.util.events.EventType;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import dagger.Lazy;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.utils.URIBuilder;
 
 public class CredentialsManager
         extends AbstractEventEmitter<CredentialsManager.CredentialsEvent, String> {
@@ -160,12 +164,27 @@ public int removeCredentials(String matchExpression) throws MatchExpressionValid
     }
 
     public Credentials getCredentialsByTargetId(String targetId) throws ScriptException {
-        for (ServiceRef service : this.platformClient.listDiscoverableServices()) {
-            if (Objects.equals(targetId, service.getServiceUri().toString())) {
-                return getCredentials(service);
+        try {
+            for (ServiceRef service : this.platformClient.listDiscoverableServices()) {
+                URI uri = service.getServiceUri();
+                boolean match = false;
+                boolean isJmx = URIUtil.isJmxUrl(uri);
+                if (isJmx) {
+                    match = Objects.equals(uri.toString(), targetId);
+                } else {
+                    URI in = new URI(targetId);
+                    match = Objects.equals(uri, in);
+                    URI userless = new URIBuilder(uri).setUserInfo(null).build();
+                    match |= Objects.equals(userless, in);
+                }
+                if (match) {
+                    return getCredentials(service);
+                }
             }
+            return null;
+        } catch (URISyntaxException use) {
+            throw new IllegalStateException(use);
         }
-        return null;
     }
 
     public Credentials getCredentials(ServiceRef serviceRef) throws ScriptException {

diff --git a/src/main/java/io/cryostat/util/URIUtil.java b/src/main/java/io/cryostat/util/URIUtil.java
@@ -16,6 +16,7 @@
 package io.cryostat.util;
 
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
@@ -39,6 +40,19 @@ public static URI convert(JMXServiceURL serviceUrl) throws URISyntaxException {
         return new URI(serviceUrl.toString());
     }
 
+    public static boolean isJmxUrl(URI uri) {
+        return isJmxUrl(uri.toString());
+    }
+
+    public static boolean isJmxUrl(String uri) {
+        try {
+            new JMXServiceURL(uri);
+            return true;
+        } catch (MalformedURLException mue) {
+            return false;
+        }
+    }
+
     public static boolean isRmiUrl(JMXServiceURL serviceUrl) {
         String rmiPart = "/jndi/rmi://";
         String pathPart = serviceUrl.getURLPath();