CVE-2019-1003050

@@ -24,7 +24,9 @@
 package lib.form;
 
 import com.gargoylesoftware.htmlunit.html.HtmlButton;
+import com.gargoylesoftware.htmlunit.html.HtmlElement;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.DomNodeList;
 import hudson.model.FreeStyleProject;
 import hudson.model.Job;
 import hudson.model.JobProperty;
@@ -72,8 +74,8 @@ private void checkValidateButtonWork(String projectName) throws Exception {
         HtmlPage htmlPage = wc.goTo(p.getUrl() + "/configure");
         assertThat(htmlPage.getWebResponse().getStatusCode(), is(200));
 
-        List<HtmlButton> inputs = htmlPage.getDocumentElement().getHtmlElementsByTagName("button");
-        HtmlButton validateButton = inputs.stream()
+         DomNodeList<HtmlElement> inputs = htmlPage.getDocumentElement().getElementsByTagName("button");
+         HtmlButton validateButton = (HtmlButton) inputs.stream()
                 .filter(i -> i.getTextContent().contains("testInjection"))
                 .findFirst()
                 .orElseThrow(() -> new AssertionError("Validate button not found"));

@@ -48,7 +48,11 @@ THE SOFTWARE.
   </st:documentation>
   <f:entry>
     <div style="float:right">
-      <input type="button" value="${title}" class="yui-button validate-button" onclick="validateButton('${descriptor.descriptorFullUrl}/${h.jsStringEscape(method)}','${h.jsStringEscape(with)}',this)" />
+      <input type="button" value="${title}" class="yui-button validate-button" 
+             data-validate-button-descriptor-url="${descriptor.descriptorFullUrl}"
+             data-validate-button-method="${method}"
+             data-validate-button-with="${with}"
+             onclick="safeValidateButton(this)" />
     </div>
     <div style="display:none;">
       <img src="${imagesURL}/spinner.gif" /> ${attrs.progress}

@@ -0,0 +1,102 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2004-2009, Sun Microsystems, Inc.
+ *
+ * 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 lib.form;
+
+import com.gargoylesoftware.htmlunit.html.HtmlButton;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import hudson.model.FreeStyleProject;
+import hudson.model.Job;
+import hudson.model.JobProperty;
+import hudson.model.JobPropertyDescriptor;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.Issue;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.TestExtension;
+import org.kohsuke.stapler.StaplerRequest;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
+//TODO merge with ValidateButtonTest once security release done
+public class ValidateButtonSEC1327Test {
+    @Rule
+    public JenkinsRule j = new JenkinsRule();
+
+    @Test
+    public void regularUsageOfUsingDescriptorUrl() throws Exception {
+        checkValidateButtonWork("okName");
+    }
+
+    @Test
+    @Issue("SECURITY-1327")
+    public void xssUsingDescriptorUrl() throws Exception {
+        checkValidateButtonWork("TESTawsCC','a',this)+alert(1)+validateButton('aaa");
+    }
+    
+    private void checkValidateButtonWork(String projectName) throws Exception {
+        FreeStyleProject p = j.createFreeStyleProject(projectName);
+        JenkinsRule.WebClient wc = j.createWebClient();
+        ValidateProperty.DescriptorImpl descriptor = j.jenkins.getDescriptorByType(ValidateProperty.DescriptorImpl.class);
+
+        AtomicReference<String> alertReceived = new AtomicReference<>();
+        wc.setAlertHandler((page, s) -> alertReceived.set(s));
+
+        assertThat(alertReceived.get(), nullValue());
+
+        HtmlPage htmlPage = wc.goTo(p.getUrl() + "/configure");
+        assertThat(htmlPage.getWebResponse().getStatusCode(), is(200));
+
+        List<HtmlButton> inputs = htmlPage.getDocumentElement().getHtmlElementsByTagName("button");
+        HtmlButton validateButton = inputs.stream()
+                .filter(i -> i.getTextContent().contains("testInjection"))
+                .findFirst()
+                .orElseThrow(() -> new AssertionError("Validate button not found"));
+
+        assertThat(alertReceived.get(), nullValue());
+        assertThat(descriptor.called, is(false));
+
+        validateButton.click();
+
+        assertThat(alertReceived.get(), nullValue());
+
+        wc.waitForBackgroundJavaScript(5000);
+        assertThat(descriptor.called, is(true));
+    }
+
+    public static class ValidateProperty extends JobProperty<Job<?,?>> {
+        @TestExtension({"regularUsageOfUsingDescriptorUrl", "xssUsingDescriptorUrl"})
+        public static class DescriptorImpl extends JobPropertyDescriptor {
+            public boolean called = false;
+
+            public void doSomething(StaplerRequest req) {
+                called = true;
+            }
+        }
+    }
+}

@@ -0,0 +1,29 @@
+<!--
+The MIT License
+
+Copyright (c) 2019, CloudBees, Inc.
+
+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.
+-->
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:f="/lib/form">
+    <div id="test-panel">
+        <f:validateButton title="testInjection" method="something" />
+    </div>
+</j:jelly>

@@ -529,6 +529,16 @@ function makeButton(e,onclick) {
     Element.addClassName(be,clsName);
     if(n) // copy the name
         be.setAttribute("name",n);
+
+    // keep the data-* attributes from the source
+    var length = e.attributes.length;
+    for (var i = 0; i < length; i++) {
+        var attribute = e.attributes[i];
+        var attributeName = attribute.name;
+        if (attributeName.startsWith('data-')) {
+            btn._button.setAttribute(attributeName, attribute.value);
+        }
+    }
     return btn;
 }
 
@@ -2876,6 +2886,20 @@ function applySafeRedirector(url) {
 }
 
 // logic behind <f:validateButton />
+function safeValidateButton(yuiButton) {
+    var button = yuiButton._button;
+    var descriptorUrl = button.getAttribute('data-validate-button-descriptor-url');
+    var method = button.getAttribute('data-validate-button-method');
+    var checkUrl = descriptorUrl + "/" + method;
+
+    // optional, by default = empty string
+    var paramList = button.getAttribute('data-validate-button-with') || '';
+    
+    validateButton(checkUrl, paramList, yuiButton);
+}
+
+// this method should not be called directly, only get called by safeValidateButton
+// kept "public" for legacy compatibility
 function validateButton(checkUrl,paramList,button) {
   button = button._button;