diff --git a/core/src/main/java/jenkins/security/s2m/FilePathRuleConfig.java b/core/src/main/java/jenkins/security/s2m/FilePathRuleConfig.java index 76289186bd..122d7e687d 100644 --- a/core/src/main/java/jenkins/security/s2m/FilePathRuleConfig.java +++ b/core/src/main/java/jenkins/security/s2m/FilePathRuleConfig.java @@ -40,7 +40,7 @@ class FilePathRuleConfig extends ConfigDirectory if (line.isEmpty()) return null; line = line.replace("","/builds/"); - line = line.replace("","[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]_[0-9][0-9]-[0-9][0-9]-[0-9][0-9]"); + line = line.replace("","(?:[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]_[0-9][0-9]-[0-9][0-9]-[0-9][0-9]|[0-9]+)"); line = line.replace("","/jobs/.+"); line = line.replace("","\\Q"+Jenkins.getInstance().getRootDir().getPath()+"\\E"); diff --git a/test/src/test/java/jenkins/security/DefaultFilePathFilterTest.java b/test/src/test/java/jenkins/security/DefaultFilePathFilterTest.java index 9143042fcf..6a91ec7db5 100644 --- a/test/src/test/java/jenkins/security/DefaultFilePathFilterTest.java +++ b/test/src/test/java/jenkins/security/DefaultFilePathFilterTest.java @@ -33,7 +33,6 @@ import java.io.StringWriter; import jenkins.security.s2m.AdminWhitelistRule; import jenkins.security.s2m.DefaultFilePathFilter; -import jenkins.security.s2m.MasterKillSwitchConfiguration; import org.jenkinsci.remoting.RoleChecker; import org.junit.Before; import org.junit.Test; @@ -42,6 +41,7 @@ import org.junit.Rule; import org.jvnet.hudson.test.JenkinsRule; import javax.inject.Inject; +import org.jvnet.hudson.test.Issue; public class DefaultFilePathFilterTest { @@ -111,4 +111,12 @@ public class DefaultFilePathFilterTest { throw new NoSuchMethodError(); // simulate legacy Callable impls } } + + @Issue("JENKINS-27055") + @Test public void matchBuildDir() throws Exception { + File f = new File(r.buildAndAssertSuccess(r.createFreeStyleProject()).getRootDir(), "whatever"); + rule.setMasterKillSwitch(false); + assertTrue(rule.checkFileAccess("write", f)); + } + }