Skip to content

Commit

Permalink
Run ATH with CSP
Browse files Browse the repository at this point in the history
  • Loading branch information
basil committed Oct 1, 2024
1 parent e1f474e commit 2802270
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ if (needSplittingFromWorkspace) {
}

def axes = [
jenkinsVersions: ['lts', 'latest'],
jenkinsVersions: ['latest'],
platforms: ['linux'],
jdks: [17, 21],
browsers: ['firefox'],
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
<properties>
<changelist>999999-SNAPSHOT</changelist>
<spotbugs.skip>true</spotbugs.skip>
<jenkins.version>2.478</jenkins.version>
<!-- TODO https://github.com/jenkinsci/jenkins/pull/6867 -->
<jenkins.version>2.479-rc35397.f9a_d8fa_b_dc44</jenkins.version>
<selenium.version>4.25.0</selenium.version>
<!-- aligned with selenium -->
<guava.version>33.3.1-jre</guava.version>
Expand Down
41 changes: 41 additions & 0 deletions src/main/java/org/jenkinsci/test/acceptance/junit/CspRule.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package org.jenkinsci.test.acceptance.junit;

import com.google.inject.Inject;
import com.google.inject.Injector;
import java.util.logging.Logger;
import org.jenkinsci.test.acceptance.po.GlobalSecurityConfig;
import org.jenkinsci.test.acceptance.po.Jenkins;
import org.jenkinsci.test.acceptance.update_center.PluginSpec;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;

@GlobalRule
public final class CspRule implements TestRule {

private static final Logger LOGGER = Logger.getLogger(CspRule.class.getName());

@Inject
Injector injector;

@Override
public Statement apply(final Statement base, final Description d) {
return new Statement() {
private Jenkins jenkins;

@Override
public void evaluate() throws Throwable {
jenkins = injector.getInstance(Jenkins.class);
final PluginSpec plugin = new PluginSpec("csp");
LOGGER.info("Installing plugin for test: " + plugin);
jenkins.getPluginManager().installPlugins(plugin);
LOGGER.info("Configuring CSP plugin for test");
final GlobalSecurityConfig security = new GlobalSecurityConfig(jenkins);
security.open();
security.disableCspReportOnly();
security.save();
base.evaluate();
}
};
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import java.net.URL;
import org.jenkinsci.test.acceptance.plugins.authorize_project.BuildAccessControl;
import org.jenkinsci.test.acceptance.plugins.git_client.ssh_host_key_verification.SshHostKeyVerificationStrategy;
import org.openqa.selenium.By;
import org.openqa.selenium.NoSuchElementException;
import org.openqa.selenium.WebElement;

Expand Down Expand Up @@ -83,6 +84,10 @@ private void maybeCheckUseSecurity() {
}
}

public void disableCspReportOnly() {
control(By.name("_.reportOnly")).uncheck();
}

public <T extends BuildAccessControl> T addBuildAccessControl(final Class<T> type) {
final String path =
createPageArea("/jenkins-security-QueueItemAuthenticatorConfiguration/authenticators", () -> control(
Expand Down

0 comments on commit 2802270

Please sign in to comment.