[FIXED JENKINS-44619] Don't allow replays of nonbuildable jobs

jenkinsci · Sep 18, 2017 · 42f6682 · 42f6682
1 parent 3396c97
commit 42f6682
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -139,7 +139,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-job</artifactId>
-            <version>2.10</version>
+            <version>2.11.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java
@@ -115,6 +115,11 @@ private ReplayAction(Run run) {
         if (!run.hasPermission(REPLAY)) {
             return false;
         }
+
+        if (!run.getParent().isBuildable()) {
+            return false;
+        }
+
         CpsFlowExecution exec = getExecution();
         if (exec == null) {
             return false;

diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java
@@ -171,6 +171,12 @@ public static void assertPermissionId() {
                 assertTrue(canReplay(b2, "dev1"));
                 assertTrue(canReplay(b2, "dev2"));
                 assertFalse(canReplay(b2, "dev3"));
+                // Disable the job and verify that no one can replay it.
+                p.makeDisabled(true);
+                assertFalse(canReplay(b2, "admin"));
+                assertFalse(canReplay(b2, "dev1"));
+                assertFalse(canReplay(b2, "dev2"));
+                assertFalse(canReplay(b2, "dev3"));
             }
         });
     }