Skip to content

Check security tests on master branch #26081

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

Closed
MarkEWaite wants to merge 7 commits into from
Closed

Check security tests on master branch #26081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0028355
Fast incremental build
MarkEWaite Apr 8, 2025
7081cb3
Run only security tests
MarkEWaite Jan 7, 2026
c2e6c96
Only test Security914
MarkEWaite Jan 7, 2026
969efa6
Use a valid core test name
MarkEWaite Jan 7, 2026
b2132a7
Test with Maven plugin instead of Credentials
MarkEWaite Jan 8, 2026
8795c6f
Try with matrix-project, a bundled plugin
MarkEWaite Jan 8, 2026
de2efca
Test with Matrix plugin instead of Credentials plugin
MarkEWaite Jan 8, 2026
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
35 changes: 0 additions & 35 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,41 +216,6 @@ axes.values().combinations {
}
}

def athAxes = [
platforms: ['linux'],
jdks: [21],
browsers: ['firefox'],
]
athAxes.values().combinations {
def (platform, jdk, browser) = it
builds["ath-${platform}-jdk${jdk}-${browser}"] = {
retry(conditions: [agent(), nonresumable()], count: 2) {
node('docker-highmem') {
// Just to be safe
deleteDir()
checkout scm

withChecks(name: 'Tests', includeStage: true) {
infra.withArtifactCachingProxy {
sh "bash ath.sh ${jdk} ${browser}"
}
junit testResults: 'target/ath-reports/TEST-*.xml', testDataPublishers: [[$class: 'AttachmentPublisher']]
}
/*
* Currently disabled, as the fact that this is a manually created subset will confuse Launchable,
* which expects this to be a full build. When we implement subsetting, this can be re-enabled using
* Launchable's subset rather than our own.
*/
/*
withCredentials([string(credentialsId: 'launchable-jenkins-acceptance-test-harness', variable: 'LAUNCHABLE_TOKEN')]) {
sh "launchable verify && launchable record tests --no-build --flavor platform=${platform} --flavor jdk=${jdk} --flavor browser=${browser} maven './target/ath-reports'"
}
*/
}
}
}
}

builds.failFast = failFast
parallel builds
infra.maybePublishIncrementals()
1 change: 1 addition & 0 deletions cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<mina-sshd.version>2.16.0</mina-sshd.version>
<!-- Filled in by jacoco-maven-plugin -->
<jacocoSurefireArgs />
<test>QuotedStringTokenizerTest</test>
</properties>

<dependencyManagement>
Expand Down
1 change: 1 addition & 0 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ THE SOFTWARE.
<remoting.minimum.supported.version>3176.v207ec082a_8c0</remoting.minimum.supported.version>
<!-- Filled in by jacoco-maven-plugin -->
<jacocoSurefireArgs />
<test>EnvVarsTest</test>
</properties>

<dependencyManagement>
Expand Down
2 changes: 2 additions & 0 deletions test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ THE SOFTWARE.

<!-- Filled in by maven-hpi-plugin with "-javaagent:/path/to/mockito-core-<version>.jar" -->
<jenkins.javaAgent />

<test>Security914*</test>
</properties>

<dependencyManagement>
Expand Down
12 changes: 6 additions & 6 deletions test/src/test/java/jenkins/security/stapler/Security914Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ void setUp(JenkinsRule rule) {
void cannotUseInvalidLocale_toTraverseFolder() throws Exception {
assumeTrue(Functions.isWindows());

assertNotNull(j.getPluginManager().getPlugin("credentials"));
j.createWebClient().goTo("plugin/credentials/images/credentials.svg", "image/svg+xml");
assertNotNull(j.getPluginManager().getPlugin("matrix-project"));
j.createWebClient().goTo("plugin/matrix-project/images/matrixproject.svg", "image/svg+xml");

JenkinsRule.WebClient wc = j.createWebClient()
.withThrowExceptionOnFailingStatusCode(false);
WebRequest request = new WebRequest(new URI(j.getURL() + "plugin/credentials/.xml").toURL());
WebRequest request = new WebRequest(new URI(j.getURL() + "plugin/matrix-project/.xml").toURL());
// plugin deployed in: test\target\jenkins7375296945862059919tmp
// rootDir is in : test\target\jenkinsTests.tmp\jenkins1274934531848159942test
// j.jenkins.getRootDir().getName() = jenkins1274934531848159942test
Expand All @@ -75,12 +75,12 @@ void cannotUseInvalidLocale_toTraverseFolder() throws Exception {
void cannotUseInvalidLocale_toAnyFileInSystem() throws Exception {
assumeTrue(Functions.isWindows());

assertNotNull(j.getPluginManager().getPlugin("credentials"));
j.createWebClient().goTo("plugin/credentials/images/credentials.svg", "image/svg+xml");
assertNotNull(j.getPluginManager().getPlugin("matrix-project"));
j.createWebClient().goTo("plugin/matrix-project/images/matrixproject.svg", "image/svg+xml");

JenkinsRule.WebClient wc = j.createWebClient()
.withThrowExceptionOnFailingStatusCode(false);
WebRequest request = new WebRequest(new URI(j.getURL() + "plugin/credentials/.ini").toURL());
WebRequest request = new WebRequest(new URI(j.getURL() + "plugin/matrix-project/.ini").toURL());
// ../ can be multiply to infinity, no impact, we just need to have enough to reach the root
request.setAdditionalHeader("Accept-Language", "../../../../../../../../../../../../windows/win");

Expand Down
Loading