resolve issues

cryostatio · Feb 21, 2024 · 69c274f · 69c274f
1 parent 9d814da
commit 69c274f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/TargetsPostHandler.java b/src/main/java/io/cryostat/net/web/http/api/v2/TargetsPostHandler.java
@@ -137,7 +137,9 @@ public IntermediateResponse<ServiceRef> handle(RequestParameters params) throws
             }
             // check incase custom target has short form connection url (i.e `localhost:0`,
             // etc)
-            if (connectUrl.matches("localhost:\\d+")) {
+            connectUrl = connectUrl.strip();
+            boolean isShortForm = connectUrl.matches("^[^\\s/:]+:\\d+$");
+            if (isShortForm) {
                 String[] connectUrlParts = connectUrl.split(":");
                 String host = connectUrlParts[0];
                 int port = Integer.parseInt(connectUrlParts[1]);

diff --git a/src/test/java/itest/CustomTargetsIT.java b/src/test/java/itest/CustomTargetsIT.java
@@ -15,8 +15,8 @@
  */
 package itest;
 
-import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
@@ -37,6 +37,7 @@
 import itest.util.ITestCleanupFailedException;
 import itest.util.http.JvmIdWebRequest;
 import itest.util.http.StoredCredential;
+import org.apache.http.client.utils.URLEncodedUtils;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.AfterAll;
@@ -350,7 +351,9 @@ void shouldBeAbleToDeleteTarget()
                 });
 
         String jmxServiceUrl = "service:jmx:rmi:///jndi/rmi://localhost:0/jmxrmi";
-        String encodedUrl = URLEncoder.encode(jmxServiceUrl, StandardCharsets.UTF_8);
+        String encodedUrl =
+                URLEncodedUtils.formatSegments(
+                        Collections.singletonList(jmxServiceUrl), StandardCharsets.UTF_8);
         CompletableFuture<JsonObject> response = new CompletableFuture<>();
         webClient
                 .delete("/api/v2/targets/" + encodedUrl)
@@ -377,7 +380,6 @@ void targetShouldNoLongerAppearInListing() throws ExecutionException, Interrupte
                         });
         JsonArray body = response.get();
         MatcherAssert.assertThat(body, Matchers.notNullValue());
-
         MatcherAssert.assertThat(body.size(), Matchers.equalTo(1));
 
         JsonObject selfJdp =