Fixed remote build url overriding for protocol and port

jenkinsci · Feb 25, 2020 · 38e2699 · 38e2699
1 parent 7951c39
commit 38e2699
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 15 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/ParameterizedRemoteTrigger/RemoteBuildConfiguration.java b/src/main/java/org/jenkinsci/plugins/ParameterizedRemoteTrigger/RemoteBuildConfiguration.java
@@ -841,21 +841,9 @@ public RemoteBuildInfo updateBuildInfo(@Nonnull RemoteBuildInfo buildInfo, @Nonn
 			}
 			QueueItemData queueItem = getQueueItemData(queueId, context);
 			if (queueItem.isExecuted()) {
-				URL effectiveRemoteBuildURL = queueItem.getBuildURL();
-				try {
-					URI effectiveUri = new URI(context.effectiveRemoteServer.getAddress());
-					String effectiveHostname = effectiveUri.getHost();
-					URL remoteURL = queueItem.getBuildURL();
-					if (remoteURL != null) {
-						URI remoteUri = remoteURL.toURI();
-						String remoteHostname = remoteUri.getHost();
-						String effectiveRemoteAddress = remoteUri.toString().replaceAll(remoteHostname,
-								effectiveHostname);
-						effectiveRemoteBuildURL = new URL(effectiveRemoteAddress);
-					}
-				} catch (URISyntaxException ex) {
-					throw new AbortException(String.format("Unexpected syntax error: %s.", ex.toString()));
-				}
+				URL remoteBuildURL = queueItem.getBuildURL();
+				String effectiveRemoteServerAddress = context.effectiveRemoteServer.getAddress();
+				URL effectiveRemoteBuildURL = generateEffectiveRemoteBuildURL(remoteBuildURL, effectiveRemoteServerAddress);
 				buildInfo.setBuildData(queueItem.getBuildNumber(), effectiveRemoteBuildURL);
 			}
 			return buildInfo;
@@ -882,6 +870,24 @@ public RemoteBuildInfo updateBuildInfo(@Nonnull RemoteBuildInfo buildInfo, @Nonn
 		return buildInfo;
 	}
 
+	protected static URL generateEffectiveRemoteBuildURL(URL remoteBuildURL, String effectiveRemoteServerAddress) throws AbortException {
+		if (effectiveRemoteServerAddress == null || remoteBuildURL == null) {
+			return remoteBuildURL;
+		}
+
+		try {
+			URI effectiveUri = new URI(effectiveRemoteServerAddress);
+			return new URL(
+					effectiveUri.getScheme(),
+					effectiveUri.getHost(),
+					effectiveUri.getPort(),
+					remoteBuildURL.getPath()
+			);
+		} catch (URISyntaxException | MalformedURLException ex) {
+			throw new AbortException(String.format("Unexpected syntax error: %s.", ex.toString()));
+		}
+	}
+
 	private String printOffsetConsoleOutput(BuildContext context, String offset, RemoteBuildInfo buildInfo)
 			throws IOException, InterruptedException {
 		if (offset.equals("-1")) {

diff --git a/...t/java/org/jenkinsci/plugins/ParameterizedRemoteTrigger/RemoteBuildConfigurationTest.java b/...t/java/org/jenkinsci/plugins/ParameterizedRemoteTrigger/RemoteBuildConfigurationTest.java
@@ -12,6 +12,7 @@
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -453,6 +454,16 @@ public void testRemoveHashParameters() {
         assertEquals("xxx", RemoteBuildConfiguration.removeHashParameters("xxx#zzz"));
     }
 
+    @Test @WithoutJenkins
+    public void testGenerateEffectiveRemoteBuildURL() throws Exception {
+        URL remoteBuildURL = new URL("http://test:8080/job/Abc/3/");
+
+        assertEquals(new URL("https://foobar:8443/job/Abc/3/"), RemoteBuildConfiguration.generateEffectiveRemoteBuildURL(remoteBuildURL, "https://foobar:8443"));
+        assertEquals(new URL("http://foobar:8888/job/Abc/3/"), RemoteBuildConfiguration.generateEffectiveRemoteBuildURL(remoteBuildURL, "http://foobar:8888"));
+        assertEquals(new URL("https://foobar/job/Abc/3/"), RemoteBuildConfiguration.generateEffectiveRemoteBuildURL(remoteBuildURL, "https://foobar"));
+        assertEquals(new URL("http://foobar/job/Abc/3/"), RemoteBuildConfiguration.generateEffectiveRemoteBuildURL(remoteBuildURL, "http://foobar"));
+    }
+
     @Test @WithoutJenkins
     public void testGenerateJobUrl() throws MalformedURLException, AbortException {
         RemoteJenkinsServer remoteServer = new RemoteJenkinsServer();