Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JENKINS-69650] Fix test reporting of Security2779Test #7134

Merged
merged 4 commits into from
Sep 26, 2022
Merged

[JENKINS-69650] Fix test reporting of Security2779Test #7134

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c122812
[JENKINS-69650] Make Security2779Test failure easier to diagnose
MarkEWaite Sep 20, 2022
74df99a
Switch from parameterized test to individual tests
MarkEWaite Sep 21, 2022
5655e9c
Merge branch 'master' into fix-Security2779Test
jglick Sep 21, 2022
f9513ff
Merge branch 'master' into fix-Security2779Test
daniel-beck Sep 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions test/src/test/java/jenkins/security/Security2779Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,30 @@
import com.gargoylesoftware.htmlunit.ScriptResult;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import hudson.model.UnprotectedRootAction;
import java.util.Arrays;
import java.util.Collection;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.jvnet.hudson.test.JenkinsRule;
import org.jvnet.hudson.test.TestExtension;

@RunWith(Parameterized.class)
public class Security2779Test {
public static final String URL_NAME = "security2779";
private final String selector;

@Rule
public JenkinsRule j = new JenkinsRule();

@Parameterized.Parameters
public static Collection<String> getSelectors() {
return Arrays.asList("#link-panel a", "#icon-panel svg");
@Test
public void noXssInHelpLinkPanel() throws Exception {
noCrossSiteScriptingInHelp("#link-panel a");
}

public Security2779Test(String selector) {
this.selector = selector;
@Test
public void noXssInHelpIconPanel() throws Exception {
noCrossSiteScriptingInHelp("#icon-panel svg");
}

@Test
public void noXssInHelp() throws Exception {
private void noCrossSiteScriptingInHelp(String selector) throws Exception {
final AtomicInteger alerts = new AtomicInteger();
final JenkinsRule.WebClient webClient = j.createWebClient();
webClient.setAlertHandler((AlertHandler) (p, s) -> alerts.addAndGet(1));
Expand All @@ -47,7 +42,8 @@ public void noXssInHelp() throws Exception {
assertThat(eventResult, instanceOf(boolean.class));
Assert.assertTrue((boolean) eventResult);
webClient.waitForBackgroundJavaScript(2000);
Assert.assertEquals(0, alerts.get());
// Assertion includes the selector for easier diagnosis
jglick marked this conversation as resolved.
Show resolved Hide resolved
Assert.assertEquals("Alert with selector '" + selector + "'", 0, alerts.get());

final ScriptResult innerHtmlScript = page.executeJavaScript("document.querySelector('#tt').innerHTML");
Object jsResult = innerHtmlScript.getJavaScriptResult();
Expand Down