From e89da8d52d510df19aeb2c2574fdfc9b8a0a29a3 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 17 Oct 2014 10:21:00 -0400 Subject: [PATCH] Also removing BYPASS_CALLABLES, which should have been superseded by richer admin UI. --- .../security/CallableDirectionChecker.java | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/core/src/main/java/jenkins/security/CallableDirectionChecker.java b/core/src/main/java/jenkins/security/CallableDirectionChecker.java index 8a3d43ea6d..8b6507eca6 100644 --- a/core/src/main/java/jenkins/security/CallableDirectionChecker.java +++ b/core/src/main/java/jenkins/security/CallableDirectionChecker.java @@ -12,8 +12,6 @@ import org.kohsuke.accmod.restrictions.NoExternalUse; import javax.annotation.Nonnull; import java.util.Collection; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; import java.util.logging.Level; import java.util.logging.Logger; @@ -40,12 +38,6 @@ public class CallableDirectionChecker extends RoleChecker { */ public static boolean BYPASS = Boolean.getBoolean(BYPASS_PROP); - /** - * Whitelist of {@link RoleSensitive} class names (mostly {@link Callable} classes) that are allowed - * to pass through. - */ - public static ConcurrentMap BYPASS_CALLABLES = new ConcurrentHashMap(); - private CallableDirectionChecker(Object context) { this.context = context; } @@ -106,20 +98,7 @@ public class CallableDirectionChecker extends RoleChecker { public static class DefaultWhitelist extends CallableWhitelist { @Override public boolean isWhitelisted(RoleSensitive subject, Collection expected, Object context) { - final String name = subject.getClass().getName(); - - if (BYPASS) // everything is whitelisted - return true; - - if (BYPASS_CALLABLES.containsKey(name)) - return true; - - if (Boolean.getBoolean(BYPASS_PROP+"."+name)) { - BYPASS_CALLABLES.put(name,null); - return true; - } - - return false; + return BYPASS; } }