From 42b36e460dff815ba78dfdab9ef7b1eded12a4c2 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 18 Sep 2014 15:14:55 -0700 Subject: [PATCH] Allow hudson.remoting.* callables that are used to implement lower-level functionalities ... like pipes. IOSyncer, PingThread.Ping, RPCRequest, SetMaximumBytecodeLevel look all harmless. PreloadJarTask is dubious, but with classloading from slave disabled, it becomes harmless. --- .../main/java/jenkins/security/CallableDirectionChecker.java | 3 +++ core/src/main/java/jenkins/security/MasterToSlave.java | 1 + 2 files changed, 4 insertions(+) diff --git a/core/src/main/java/jenkins/security/CallableDirectionChecker.java b/core/src/main/java/jenkins/security/CallableDirectionChecker.java index 8fbd68da96..42cfa356ab 100644 --- a/core/src/main/java/jenkins/security/CallableDirectionChecker.java +++ b/core/src/main/java/jenkins/security/CallableDirectionChecker.java @@ -29,6 +29,9 @@ public class CallableDirectionChecker extends CallableDecorator { public Callable userRequest(Callable op, Callable stem) { Class c = op.getClass(); + if (c.getName().startsWith("hudson.remoting")) + return stem; // lower level services provided by remoting, such IOSyncer, RPCRequest, Ping, etc. that we allow + boolean m2s = c.isAnnotationPresent(MasterToSlave.class); boolean s2m = c.isAnnotationPresent(SlaveToMaster.class); diff --git a/core/src/main/java/jenkins/security/MasterToSlave.java b/core/src/main/java/jenkins/security/MasterToSlave.java index 832af307a3..c5b03b6c70 100644 --- a/core/src/main/java/jenkins/security/MasterToSlave.java +++ b/core/src/main/java/jenkins/security/MasterToSlave.java @@ -15,6 +15,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * * @author Kohsuke Kawaguchi * @see SlaveToMaster + * @see CallableDirectionChecker * @since 1.THU */ @Retention(RUNTIME)