[FIXED JENKINS-31318] Check BUILD permissions not for Jenkins but for…

… each projects.
jenkinsci · Nov 22, 2015 · 91d88d9 · 91d88d9
1 parent 9d3e5bb
commit 91d88d9
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/src/main/java/com/chikli/hudson/plugin/naginator/NaginatorRetryAction.java b/src/main/java/com/chikli/hudson/plugin/naginator/NaginatorRetryAction.java
@@ -5,12 +5,14 @@
 import java.util.List;
 
 import org.kohsuke.stapler.AncestorInPath;
+import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerResponse;
 
 import hudson.model.AbstractBuild;
 import hudson.model.Action;
 import hudson.model.CauseAction;
 import hudson.model.Item;
+import hudson.model.Job;
 import hudson.model.ParametersAction;
 
 import jenkins.model.Jenkins;
@@ -20,23 +22,33 @@
  */
 public class NaginatorRetryAction implements Action {
 
+    private boolean hasPermission() {
+        Job<?, ?> job = Stapler.getCurrentRequest().findAncestorObject(Job.class);
+        if (job != null) {
+            return job.getACL().hasPermission(Item.BUILD);
+        }
+
+        Jenkins j = Jenkins.getInstance();
+        return (j != null)?j.hasPermission(Item.BUILD):false;
+    }
+
     public String getIconFileName() {
-        return Jenkins.getInstance().hasPermission(Item.BUILD) ?
+        return hasPermission() ?
             "refresh.png" : null;
     }
 
     public String getDisplayName() {
-        return Jenkins.getInstance().hasPermission(Item.BUILD) ?
+        return hasPermission() ?
             "Retry" : null;
     }
 
     public String getUrlName() {
-        return Jenkins.getInstance().hasPermission(Item.BUILD) ?
+        return hasPermission() ?
             "retry" : null;
     }
 
     public void doIndex(StaplerResponse res, @AncestorInPath AbstractBuild build) throws IOException {
-        Jenkins.getInstance().checkPermission(Item.BUILD);
+        build.getACL().checkPermission(Item.BUILD);
         NaginatorRetryAction.scheduleBuild(build, 0, NaginatorListener.calculateRetryCount(build));
         res.sendRedirect2(build.getUpUrl());
     }