mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-14 04:22:16 +00:00
Also removing BYPASS_CALLABLES, which should have been superseded by richer admin UI.
This commit is contained in:
1 parent
f327fc284a
commit
e89da8d52d
1 file changed
+1
-22
@@ -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<String,Void> BYPASS_CALLABLES = new ConcurrentHashMap<String,Void>();
|
||||
|
||||
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<Role> 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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user