From 1b9f1ccdbb7d00705b036d1332908fe52c2cd7ae Mon Sep 17 00:00:00 2001 From: Yaroslav Afenkin Date: Thu, 13 Jul 2023 07:24:44 +0000 Subject: [PATCH] [SECURITY-3188] --- .../main/java/hudson/AbstractMarkupText.java | 4 +- .../jenkins/security/Security3188Test.java | 52 +++++++++++++++++++ 2 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 test/src/test/java/jenkins/security/Security3188Test.java diff --git a/core/src/main/java/hudson/AbstractMarkupText.java b/core/src/main/java/hudson/AbstractMarkupText.java index b13eeaad3e..a05cbb399d 100644 --- a/core/src/main/java/hudson/AbstractMarkupText.java +++ b/core/src/main/java/hudson/AbstractMarkupText.java @@ -83,7 +83,7 @@ public abstract class AbstractMarkupText { * @since 1.349 */ public void addHyperlink(int startPos, int endPos, String url) { - addMarkup(startPos, endPos, "", ""); + addMarkup(startPos, endPos, "", ""); } /** @@ -93,7 +93,7 @@ public abstract class AbstractMarkupText { * @since 1.395 */ public void addHyperlinkLowKey(int startPos, int endPos, String url) { - addMarkup(startPos, endPos, "", ""); + addMarkup(startPos, endPos, "", ""); } /** diff --git a/test/src/test/java/jenkins/security/Security3188Test.java b/test/src/test/java/jenkins/security/Security3188Test.java new file mode 100644 index 0000000000..28f4e58d0f --- /dev/null +++ b/test/src/test/java/jenkins/security/Security3188Test.java @@ -0,0 +1,52 @@ +package jenkins.security; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; + +import hudson.Functions; +import hudson.model.FreeStyleBuild; +import hudson.model.FreeStyleProject; +import hudson.tasks.BatchFile; +import hudson.tasks.CommandInterpreter; +import hudson.tasks.Shell; +import java.util.concurrent.atomic.AtomicBoolean; +import org.htmlunit.html.HtmlPage; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.Issue; +import org.jvnet.hudson.test.JenkinsRule; + +public class Security3188Test { + + @Rule + public JenkinsRule j = new JenkinsRule(); + + @Issue("SECURITY-3188") + @Test + public void linkCannotAttributeEscape() throws Exception { + FreeStyleProject p = j.createFreeStyleProject("p"); + p.getBuildersList().add(getScript("echo \"https://acme.com/search?q='onmouseover=alert(1);'Hello World\"")); + FreeStyleBuild build = j.buildAndAssertSuccess(p); + + AtomicBoolean alerts = new AtomicBoolean(); + try (JenkinsRule.WebClient wc = j.createWebClient()) { + wc.setAlertHandler((pr, s) -> alerts.set(true)); + final HtmlPage page = wc.goTo(build.getUrl() + "console"); + String content = page.getWebResponse().getContentAsString(); + assertThat(content, containsString("