Adapt to String#stripIndent of java 15

`stripIndent` eclipses the `DefaultGroovyMethods` which is already in the generic-whitelist. Scripts already using this method were breaking when the JVM was upstepped as it would choose standard implementation over the one provided by groovy.
jenkinsci · Sep 5, 2022 · 6517737 · 6517737
1 parent 4bd517d
commit 6517737
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
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
@@ -267,6 +267,7 @@ method java.lang.String split java.lang.String
 method java.lang.String split java.lang.String int
 method java.lang.String startsWith java.lang.String
 method java.lang.String startsWith java.lang.String int
+method java.lang.String stripIndent
 method java.lang.String substring int
 method java.lang.String substring int int
 method java.lang.String toCharArray

diff --git a/...est/java/org/jenkinsci/plugins/scriptsecurity/sandbox/whitelists/StaticWhitelistTest.java b/...est/java/org/jenkinsci/plugins/scriptsecurity/sandbox/whitelists/StaticWhitelistTest.java
@@ -122,6 +122,8 @@ static void sanity(URL definition) throws Exception {
             new MethodSignature(String.class, "isEmpty"),
             // Does not exist until Java 15.
             new MethodSignature(CharSequence.class, "isEmpty"),
+            // Overrides DefaultGroovyMethods.stripIndent(String) in Java 15+.
+            new MethodSignature(String.class, "stripIndent"),
             // Override the corresponding RandomGenerator methods in Java 17+.
             new MethodSignature(Random.class, "nextBoolean"),
             new MethodSignature(Random.class, "nextBytes", byte[].class),