From 9a108de4052af482e4a3a0345d0e080ece225de6 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 27 Oct 2014 15:38:14 -0700 Subject: [PATCH] These permissions should be RUN_SCRIPTS ... as it grants access to the JVM internals of the master in the same Groovy scripts do. --- .../main/java/jenkins/security/s2m/AdminWhitelistRule.java | 6 +++--- .../jenkins/security/s2m/AdminWhitelistRule/index.jelly | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/jenkins/security/s2m/AdminWhitelistRule.java b/core/src/main/java/jenkins/security/s2m/AdminWhitelistRule.java index 880a76a388..c9aabe5691 100644 --- a/core/src/main/java/jenkins/security/s2m/AdminWhitelistRule.java +++ b/core/src/main/java/jenkins/security/s2m/AdminWhitelistRule.java @@ -155,7 +155,7 @@ public class AdminWhitelistRule implements StaplerProxy { @RequirePOST public HttpResponse doSubmit(StaplerRequest req) throws IOException { - jenkins.checkPermission(Jenkins.ADMINISTER); + jenkins.checkPermission(Jenkins.RUN_SCRIPTS); String whitelist = Util.fixNull(req.getParameter("whitelist")); if (!whitelist.endsWith("\n")) @@ -207,7 +207,7 @@ public class AdminWhitelistRule implements StaplerProxy { public void setMasterKillSwitch(boolean state) { try { - jenkins.checkPermission(Jenkins.ADMINISTER); + jenkins.checkPermission(Jenkins.RUN_SCRIPTS); FileUtils.writeStringToFile(getMasterKillSwitchFile(),Boolean.toString(state)); // treat the file as the canonical source of information in case write fails masterKillSwitch = loadMasterKillSwitchFile(); @@ -221,7 +221,7 @@ public class AdminWhitelistRule implements StaplerProxy { */ @Override public Object getTarget() { - jenkins.checkPermission(Jenkins.ADMINISTER); + jenkins.checkPermission(Jenkins.RUN_SCRIPTS); return this; } diff --git a/core/src/main/resources/jenkins/security/s2m/AdminWhitelistRule/index.jelly b/core/src/main/resources/jenkins/security/s2m/AdminWhitelistRule/index.jelly index 9662491e1c..62dbc88621 100644 --- a/core/src/main/resources/jenkins/security/s2m/AdminWhitelistRule/index.jelly +++ b/core/src/main/resources/jenkins/security/s2m/AdminWhitelistRule/index.jelly @@ -23,7 +23,7 @@ THE SOFTWARE. --> - +

${%Slave → Master Access Control}