Resolved incorrect badge examples for some jobs when opened directly …

…from URL
jenkinsci · Feb 15, 2024 · fe1801e · fe1801e
1 parent 3496301
commit fe1801e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 9 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/badge/actions/JobBadgeAction.java b/src/main/java/org/jenkinsci/plugins/badge/actions/JobBadgeAction.java
@@ -53,10 +53,12 @@ public String getUrl() {
         /* Needed for the jelly syntax hints page */
         String url = "";
         StaplerRequest req = Stapler.getCurrentRequest();
-        if (req != null) {
-            url = req.getReferer();
-            if (url == null) {
-                url = "null-referer";
+        if (req != null && req.getRequestURL() != null) {
+            url = req.getRequestURL().toString();
+            int badgeIndex = url.lastIndexOf("badge/");
+
+            if (badgeIndex != -1) {
+                url = url.substring(0, badgeIndex);
             }
         }
         return url;

diff --git a/src/main/java/org/jenkinsci/plugins/badge/actions/RunBadgeAction.java b/src/main/java/org/jenkinsci/plugins/badge/actions/RunBadgeAction.java
@@ -14,6 +14,7 @@
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.Stapler;
+import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.WebMethod;
 
 public class RunBadgeAction implements Action, IconSpec {
@@ -48,8 +49,17 @@ public String getUrlName() {
     public String getUrl() {
         /* TODO: Is a permission check needed here? */
         /* Needed for the jelly syntax hints page */
-        String url = Stapler.getCurrentRequest().getReferer();
-        return url == null ? "null-referer" : url;
+        String url = "";
+        StaplerRequest req = Stapler.getCurrentRequest();
+        if (req != null && req.getRequestURL() != null) {
+            url = req.getRequestURL().toString();
+            int badgeIndex = url.lastIndexOf("badge/");
+
+            if (badgeIndex != -1) {
+                url = url.substring(0, badgeIndex);
+            }
+        }
+        return url;
     }
 
     public String getUrlEncodedFullName() {

diff --git a/src/test/java/org/jenkinsci/plugins/badge/actions/RunBadgeActionTest.java b/src/test/java/org/jenkinsci/plugins/badge/actions/RunBadgeActionTest.java
@@ -37,13 +37,24 @@ void getUrlEncodedFullNameWithProjectNull() {
     }
 
     @Test
-    void getUrl() {
+    void getUrlWithoutBadge() {
         try (MockedStatic<Stapler> mockedStatic = Mockito.mockStatic(Stapler.class)) {
             StaplerRequest staplerRequest = Mockito.mock(StaplerRequest.class);
-            Mockito.when(staplerRequest.getReferer()).thenReturn("referer");
+            Mockito.when(staplerRequest.getRequestURL()).thenReturn(new StringBuffer("http://jenkins.io/"));
             mockedStatic.when(() -> Stapler.getCurrentRequest()).thenReturn(staplerRequest);
 
-            assertThat(runBadgeAction.getUrl(), is("referer"));
+            assertThat(runBadgeAction.getUrl(), is("http://jenkins.io/"));
+        }
+    }
+
+    @Test
+    void getUrlWithBadge() {
+        try (MockedStatic<Stapler> mockedStatic = Mockito.mockStatic(Stapler.class)) {
+            StaplerRequest staplerRequest = Mockito.mock(StaplerRequest.class);
+            Mockito.when(staplerRequest.getRequestURL()).thenReturn(new StringBuffer("http://jenkins.io/badge/"));
+            mockedStatic.when(() -> Stapler.getCurrentRequest()).thenReturn(staplerRequest);
+
+            assertThat(runBadgeAction.getUrl(), is("http://jenkins.io/"));
         }
     }