Fix urls when 2 clouds with same name exist

When 2 clouds are created with the same name, then accessing the second
cloud produces a different url.

Author: mawinter69

core/src/main/java/hudson/slaves/Cloud.java

@@ -140,7 +140,11 @@ public String getDisplayName() {
      * @return Jenkins relative URL.
      */
     public @NonNull String getUrl() {
-        return "cloud/" + Util.rawEncode(name) + "/";
+        if (Jenkins.get().getCloud(name) != this) { // this cloud is not the first occurrence with this name
+            return "cloud/cloudByIndex/" + Jenkins.get().clouds.indexOf(this) + "/";
+        } else {
+            return "cloud/" + Util.rawEncode(name) + "/";
+        }
     }
 
     @Override

core/src/main/java/jenkins/agents/CloudSet.java

@@ -113,11 +113,7 @@ public ManagementLink getManagementLink() {
     @Restricted(DoNotUse.class) // stapler
     public String getCloudUrl(StaplerRequest2 request, Jenkins jenkins, Cloud cloud) {
         String context = Functions.getNearestAncestorUrl(request, jenkins);
-        if (Jenkins.get().getCloud(cloud.name) != cloud) { // this cloud is not the first occurrence with this name
-            return context + "/cloud/cloudByIndex/" + getClouds().indexOf(cloud) + "/";
-        } else {
-            return context + "/" + cloud.getUrl();
-        }
+        return context + "/" + cloud.getUrl();
     }
 
     /**

core/src/main/resources/hudson/slaves/Cloud/sidepanel.jelly

@@ -27,9 +27,9 @@ THE SOFTWARE.
     <l:header />
     <l:side-panel>
         <l:tasks>
-            <j:set var="url" value="${h.getNearestAncestorUrl(request2,it)}"/>
-            <l:task contextMenu="false" href="${url}/" icon="symbol-computer" title="${%Status}"/>
-            <l:task href="${url}/configure" icon="symbol-settings"
+            <j:set var="url" value="${rootURL}/${it.url}"/>
+            <l:task contextMenu="false" href="${url}" icon="symbol-computer" title="${%Status}"/>
+            <l:task href="${url}configure" icon="symbol-settings"
                     title="${app.hasPermission(app.ADMINISTER) ? '%Configure' : '%View Configuration'}"/>
             <l:delete permission="${app.ADMINISTER}" title="${%Delete Cloud}" message="${%delete.cloud(it.displayName)}" urlPrefix="${url}"/>
             <t:actions />

core/src/main/resources/jenkins/agents/CloudSet/index.jelly

@@ -64,11 +64,11 @@ THE SOFTWARE.
                   </td>
                   <td>
                     <input type="hidden" name="name" value="${cloud.name}" />
-                    <a href="${it.getCloudUrl(request2,app,cloud)}" class="jenkins-table__link model-link inside">${cloud.name}</a>
+                    <a href="../${cloud.url}" class="jenkins-table__link model-link inside">${cloud.name}</a>
                   </td>
                   <td class="jenkins-table__cell--tight">
                     <div class="jenkins-table__cell__button-wrapper">
-                      <a href="${it.getCloudUrl(request2,app,cloud)}configure" class="jenkins-button">
+                      <a href="../${cloud.url}configure" class="jenkins-button">
                         <l:icon src="symbol-settings"/>
                       </a>
                     </div>

core/src/main/resources/lib/layout/delete.jelly

@@ -75,7 +75,8 @@ THE SOFTWARE.
 
   <j:set var="url" value="doDelete" />
   <j:if test="${attrs.urlPrefix != null}">
-    <j:set var="url" value="${urlPrefix}/doDelete" />
+    <j:set var="basePrefix" value="${urlPrefix.endsWith('/') ? urlPrefix.substring(0, urlPrefix.length() - 1) : urlPrefix}" />
+    <j:set var="url" value="${basePrefix}/doDelete" />
   </j:if>
 
 

test/src/test/java/hudson/slaves/CloudTest.java

@@ -3,6 +3,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.endsWith;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -15,6 +16,7 @@
 import hudson.security.Permission;
 import hudson.security.SidACL;
 import java.io.IOException;
+import java.net.URL;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -64,17 +66,29 @@ void ensureProvisionPermissionIsLoadable() {
         assertEquals("Provision", p.name);
     }
 
+    @Test
+    @Issue("#26174")
+    void url() {
+        ACloud aCloud = new ACloud("a", "0");
+        j.jenkins.clouds.add(aCloud);
+        ACloud aCloud2 = new ACloud("a", "0");
+        j.jenkins.clouds.add(aCloud2);
+        assertEquals("cloud/cloudByIndex/1/", aCloud2.getUrl());
+    }
+
     @Test
     void ui() throws Exception {
         ACloud aCloud = new ACloud("a", "0");
         j.jenkins.clouds.add(aCloud);
+        ACloud aCloud2 = new ACloud("a", "0");
+        j.jenkins.clouds.add(aCloud2);
 
         assertThat(aCloud.getAllActions(), containsInAnyOrder(
                 instanceOf(TaskCloudAction.class),
                 instanceOf(ReportingCloudAction.class)
         ));
 
-        HtmlPage page = j.createWebClient().goTo(aCloud.getUrl());
+        HtmlPage page = j.createWebClient().goTo(aCloud2.getUrl());
         String out = page.getWebResponse().getContentAsString();
         assertThat(out, containsString("Cloud a")); // index.jelly
         assertThat(out, containsString("Top cloud view.")); // top.jelly
@@ -84,6 +98,8 @@ void ui() throws Exception {
         assertThat(out, containsString("Report Here")); // ReportingCloudAction/summary.jelly
 
         HtmlPage actionPage = page.getAnchorByText("Task Action").click();
+        URL url = actionPage.getUrl();
+        assertThat(url.getPath(), endsWith("/cloud/cloudByIndex/1/task/")); // TaskCloudAction URL
         out = actionPage.getWebResponse().getContentAsString();
         assertThat(out, containsString("doIndex called")); // doIndex
     }