diff --git a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/sandbox/whitelists/generic-whitelist b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/sandbox/whitelists/generic-whitelist index 26b77a78d..cb990da47 100644 --- a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/sandbox/whitelists/generic-whitelist +++ b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/sandbox/whitelists/generic-whitelist @@ -790,11 +790,16 @@ method java.util.random.RandomGenerator nextInt int method java.util.random.RandomGenerator nextLong method java.util.regex.MatchResult end method java.util.regex.MatchResult end int +method java.util.regex.MatchResult end java.lang.String method java.util.regex.MatchResult group method java.util.regex.MatchResult group int +method java.util.regex.MatchResult group java.lang.String method java.util.regex.MatchResult groupCount +method java.util.regex.MatchResult hasMatch +method java.util.regex.MatchResult namedGroups method java.util.regex.MatchResult start method java.util.regex.MatchResult start int +method java.util.regex.MatchResult start java.lang.String method java.util.regex.Matcher appendReplacement java.lang.StringBuffer java.lang.String method java.util.regex.Matcher appendTail java.lang.StringBuffer method java.util.regex.Matcher end java.lang.String diff --git a/src/test/java/org/jenkinsci/plugins/scriptsecurity/sandbox/whitelists/StaticWhitelistTest.java b/src/test/java/org/jenkinsci/plugins/scriptsecurity/sandbox/whitelists/StaticWhitelistTest.java index b32b8728e..c705694a7 100644 --- a/src/test/java/org/jenkinsci/plugins/scriptsecurity/sandbox/whitelists/StaticWhitelistTest.java +++ b/src/test/java/org/jenkinsci/plugins/scriptsecurity/sandbox/whitelists/StaticWhitelistTest.java @@ -41,6 +41,7 @@ import java.util.Random; import java.util.Set; import java.util.regex.Matcher; +import java.util.regex.MatchResult; import org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.EnumeratingWhitelist.MethodSignature; import org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.EnumeratingWhitelist.Signature; @@ -145,7 +146,13 @@ static void sanity(URL definition) throws Exception { // Override the corresponding MatchResult methods in Java 20+. new MethodSignature(Matcher.class, "end", String.class), new MethodSignature(Matcher.class, "group", String.class), - new MethodSignature(Matcher.class, "start", String.class) + new MethodSignature(Matcher.class, "start", String.class), + // Do not exist until Java 20. + new MethodSignature(MatchResult.class, "end", String.class), + new MethodSignature(MatchResult.class, "group", String.class), + new MethodSignature(MatchResult.class, "hasMatch"), + new MethodSignature(MatchResult.class, "namedGroups"), + new MethodSignature(MatchResult.class, "start", String.class) )); @Test public void sanity() throws Exception {