From b077d9e7b59e35580532d2eaf8bdfe46739e99f9 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 16 Oct 2014 13:32:32 -0700 Subject: [PATCH] This isn't created via injection --- .../jenkins/security/admin/AdminWhitelistRule.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/jenkins/security/admin/AdminWhitelistRule.java b/core/src/main/java/jenkins/security/admin/AdminWhitelistRule.java index 5758312b54..b9420eeaeb 100644 --- a/core/src/main/java/jenkins/security/admin/AdminWhitelistRule.java +++ b/core/src/main/java/jenkins/security/admin/AdminWhitelistRule.java @@ -4,9 +4,7 @@ import hudson.Extension; import hudson.FilePath; import hudson.Util; import hudson.util.HttpResponses; -import hudson.util.TextFile; import jenkins.model.Jenkins; -import org.apache.commons.io.FileUtils; import org.jenkinsci.remoting.Role; import org.jenkinsci.remoting.RoleSensitive; import org.kohsuke.stapler.HttpResponse; @@ -15,7 +13,6 @@ import org.kohsuke.stapler.StaplerProxy; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.interceptor.RequirePOST; -import javax.inject.Inject; import java.io.File; import java.io.IOException; import java.util.Collection; @@ -29,9 +26,6 @@ import java.util.logging.Logger; */ @Extension public class AdminWhitelistRule implements StaplerProxy { - @Inject - Jenkins jenkins; - /** * Ones that we rejected but want to run by admins. */ @@ -47,7 +41,11 @@ public class AdminWhitelistRule implements StaplerProxy { */ public final FilePathRuleConfig filePathRules; + private final Jenkins jenkins; + public AdminWhitelistRule() throws IOException, InterruptedException { + this.jenkins = Jenkins.getInstance(); + // while this file is not a secret, write access to this file is dangerous, // so put this in the better-protected part of $JENKINS_HOME, which is in secrets/