Merge branch 'mailto-absolute' of https://github.com/ohtake/jenkins

core/pom.xml

@@ -425,6 +425,28 @@ THE SOFTWARE.
       <artifactId>junit-dep</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4</artifactId>
+      <version>1.4.10</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-mockito</artifactId>
+      <version>1.4.10</version>
+      <scope>test</scope>
+    </dependency>
     <dependency><!-- needed by Jelly -->
       <groupId>javax.servlet</groupId>
       <artifactId>jstl</artifactId>

core/src/main/java/hudson/Functions.java

@@ -1169,7 +1169,7 @@ public class Functions {
     public static String getActionUrl(String itUrl,Action action) {
         String urlName = action.getUrlName();
         if(urlName==null)   return null;    // to avoid NPE and fail to render the whole page
-        if(SCHEME.matcher(urlName).matches())
+        if(SCHEME.matcher(urlName).find())
             return urlName; // absolute URL
         if(urlName.startsWith("/"))
             return Stapler.getCurrentRequest().getContextPath()+urlName;
@@ -1363,7 +1363,7 @@ public class Functions {
         return DescriptorVisibilityFilter.apply(context,descriptors);
     }
     
-    private static final Pattern SCHEME = Pattern.compile("[a-z]+://.+");
+    private static final Pattern SCHEME = Pattern.compile("^([a-zA-Z][a-zA-Z0-9+.-]*):");
 
     /**
      * Returns true if we are running unit tests.

core/src/test/java/hudson/FunctionsTest.java

+/*
+ * The MIT License
+ *
+ * Copyright 2011, OHTAKE Tomohiro.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package hudson;
+
+import hudson.model.Action;
+import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.jvnet.hudson.test.Bug;
+import org.kohsuke.stapler.Stapler;
+import org.kohsuke.stapler.StaplerRequest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import static org.powermock.api.mockito.PowerMockito.*;
+
+@RunWith(PowerMockRunner.class)
+public class FunctionsTest {
+    @Test
+    public void testGetActionUrl_absoluteUriWithAuthority(){
+        String[] uris = {
+            "http://example.com/foo/bar",
+            "https://example.com/foo/bar",
+            "ftp://example.com/foo/bar",
+            "svn+ssh://nobody@example.com/foo/bar",
+        };
+        for(String uri : uris) {
+            String result = Functions.getActionUrl(null, createMockAction(uri));
+            assertEquals(uri, result);
+        }
+    }
+
+    @Test
+    @Bug(7725)
+    public void testGetActionUrl_absoluteUriWithoutAuthority(){
+        String[] uris = {
+            "mailto:nobody@example.com",
+            "mailto:nobody@example.com?subject=hello",
+            "javascript:alert('hello')",
+        };
+        for(String uri : uris) {
+            String result = Functions.getActionUrl(null, createMockAction(uri));
+            assertEquals(uri, result);
+        }
+    }
+
+    @Test
+    @PrepareForTest(Stapler.class)
+    public void testGetActionUrl_absolutePath() throws Exception{
+        String contextPath = "/jenkins";
+        StaplerRequest req = createMockRequest(contextPath);
+        String[] paths = {
+            "/",
+            "/foo/bar",
+        };
+        mockStatic(Stapler.class);
+        when(Stapler.getCurrentRequest()).thenReturn(req);
+        for(String path : paths) {
+            String result = Functions.getActionUrl(null, createMockAction(path));
+            assertEquals(contextPath + path, result);
+        }
+    }
+
+    @Test
+    @PrepareForTest(Stapler.class)
+    public void testGetActionUrl_relativePath() throws Exception{
+        String contextPath = "/jenkins";
+        String itUrl = "iturl/";
+        StaplerRequest req = createMockRequest(contextPath);
+        String[] paths = {
+            "foo/bar",
+            "./foo/bar",
+            "../foo/bar",
+        };
+        mockStatic(Stapler.class);
+        when(Stapler.getCurrentRequest()).thenReturn(req);
+        for(String path : paths) {
+            String result = Functions.getActionUrl(itUrl, createMockAction(path));
+            assertEquals(contextPath + "/" + itUrl + path, result);
+        }
+    }
+
+    private static Action createMockAction(String uri) {
+        Action action = mock(Action.class);
+        when(action.getUrlName()).thenReturn(uri);
+        return action;
+    }
+
+    private static StaplerRequest createMockRequest(String contextPath) {
+        StaplerRequest req = mock(StaplerRequest.class);
+        when(req.getContextPath()).thenReturn(contextPath);
+        return req;
+    }
+}