[JENKINS-46652] Check Computer.BUILD permission only on heayweight ta…

…sks.
jenkinsci · Jan 22, 2018 · 9842a2795e81bbdb0aeb5039cd9953bbb0ff2531 · 9842a27
1 parent b550c33
commit 9842a2795e81bbdb0aeb5039cd9953bbb0ff2531
Unified Split

Showing with 2 additions and 2 deletions.

+1 −1 core/src/main/java/hudson/model/Node.java

+1 −1 core/src/main/java/hudson/model/queue/MappingWorksheet.java
diff --git a/core/src/main/java/hudson/model/Node.java b/core/src/main/java/hudson/model/Node.java
@@ -394,7 +394,7 @@ public CauseOfBlockage canTake(Queue.BuildableItem item) {
         }
 
         Authentication identity = item.authenticate();
-        if (!hasPermission(identity,Computer.BUILD)) {
+        if (!(item.task instanceof Queue.FlyweightTask) && !hasPermission(identity, Computer.BUILD)) {
             // doesn't have a permission
             return CauseOfBlockage.fromMessage(Messages._Node_LackingBuildPermission(identity.getName(), getDisplayName()));
         }

diff --git a/core/src/main/java/hudson/model/queue/MappingWorksheet.java b/core/src/main/java/hudson/model/queue/MappingWorksheet.java
@@ -134,7 +134,7 @@ public boolean canAccept(WorkChunk c) {
             if (c.assignedLabel!=null && !c.assignedLabel.contains(node))
                 return false;   // label mismatch
 
-            if (!nodeAcl.hasPermission(item.authenticate(), Computer.BUILD))
+            if (!(item.task instanceof Queue.FlyweightTask) && !nodeAcl.hasPermission(item.authenticate(), Computer.BUILD))
                 return false;   // tasks don't have a permission to run on this node
 
             return true;