[JENKINS-25348]

Use the new wrapper classloader to ensure groovy-sandbox resolves correctly.
jenkinsci · Nov 15, 2014 · ed56f11 · ed56f11
1 parent 289c9b0
commit ed56f11
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cps/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShell.java b/cps/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShell.java
@@ -11,6 +11,7 @@
 import org.codehaus.groovy.control.CompilationFailedException;
 import org.codehaus.groovy.control.CompilerConfiguration;
 import org.codehaus.groovy.control.customizers.ImportCustomizer;
+import org.jenkinsci.plugins.scriptsecurity.sandbox.groovy.GroovySandbox;
 
 import javax.annotation.Nullable;
 import java.io.IOException;
@@ -39,7 +40,8 @@ class CpsGroovyShell extends GroovyShell {
 
     private static ClassLoader makeClassLoader() {
         Jenkins j = Jenkins.getInstance();
-        return j!=null ? j.getPluginManager().uberClassLoader : CpsGroovyShell.class.getClassLoader();
+        ClassLoader cl = j != null ? j.getPluginManager().uberClassLoader : CpsGroovyShell.class.getClassLoader();
+        return GroovySandbox.createSecureClassLoader(cl);
     }
 
     private static CompilerConfiguration makeConfig(CpsFlowExecution execution) {

diff --git a/pom.xml b/pom.xml
@@ -72,7 +72,7 @@
             <dependency>
                 <groupId>org.jenkins-ci.plugins</groupId>
                 <artifactId>script-security</artifactId>
-                <version>1.6</version>
+                <version>1.9</version>
             </dependency>
             <dependency>
                 <groupId>org.jenkins-ci.plugins</groupId>