Making it possible to use Groovy functions with def syntax.

jenkinsci · May 1, 2014 · 90057e9 · 90057e9
1 parent 6b2c8b6
commit 90057e9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/scriptsecurity/sandbox/groovy/SandboxInterceptor.java b/src/main/java/org/jenkinsci/plugins/scriptsecurity/sandbox/groovy/SandboxInterceptor.java
@@ -33,6 +33,7 @@
 import org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.EnumeratingWhitelist;
 import org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.StaticWhitelist;
 import org.kohsuke.groovy.sandbox.GroovyInterceptor;
+import org.kohsuke.groovy.sandbox.impl.Checker;
 
 @SuppressWarnings("rawtypes")
 final class SandboxInterceptor extends GroovyInterceptor {
@@ -73,6 +74,10 @@ final class SandboxInterceptor extends GroovyInterceptor {
     @Override public Object onStaticCall(GroovyInterceptor.Invoker invoker, Class receiver, String method, Object... args) throws Throwable {
         Method m = GroovyCallSiteSelector.staticMethod(receiver, method, args);
         if (m == null) {
+            if (receiver == Checker.class && method.startsWith("checked")) {
+                // TODO cf. defSyntax; this seems like a bug in the sandbox
+                return super.onStaticCall(invoker, receiver, method, args);
+            }
             throw new RejectedAccessException("unclassified staticMethod " + EnumeratingWhitelist.getName(receiver) + " " + method + printArgumentTypes(args));
         } else if (whitelist.permitsStaticMethod(m, args)) {
             return super.onStaticCall(invoker, receiver, method, args);

diff --git a/...test/java/org/jenkinsci/plugins/scriptsecurity/sandbox/groovy/SandboxInterceptorTest.java b/...test/java/org/jenkinsci/plugins/scriptsecurity/sandbox/groovy/SandboxInterceptorTest.java
@@ -239,12 +239,16 @@ public static final class Special {
         }
     }
 
-    @Ignore("TODO fails with: unclassified staticMethod org.kohsuke.groovy.sandbox.impl.Checker checkedCall java.lang.Class java.lang.Boolean java.lang.Boolean java.lang.String java.lang.Object[]")
     @Test public void defSyntax() throws Exception {
         String clazz = Unsafe.class.getName();
         Whitelist w = new ProxyWhitelist(new AnnotatedWhitelist(), /* for some reason def syntax triggers this */new StaticWhitelist(Collections.singleton("method java.util.Collection toArray")));
         assertEvaluate(w, "ok", "m(); def m() {" + clazz + ".ok()}");
         assertEvaluate(w, "ok", "m(); def static m() {" + clazz + ".ok()}");
+        try {
+            assertEvaluate(w, "should be rejected", "m(); def m() {" + clazz + ".explode()}");
+        } catch (RejectedAccessException x) {
+            assertEquals("staticMethod " + clazz + " explode", x.getSignature());
+        }
     }
 
     public static final class Unsafe {