Merge branch 'master' into Jenkinsfile

Author: jglick

pom.xml

@@ -33,7 +33,7 @@
     </parent>
     <groupId>org.jenkins-ci.plugins.workflow</groupId>
     <artifactId>workflow-durable-task-step</artifactId>
-    <version>2.10-SNAPSHOT</version>
+    <version>2.11-SNAPSHOT</version>
     <packaging>hpi</packaging>
     <name>Pipeline: Nodes and Processes</name>
     <url>https://wiki.jenkins-ci.org/display/JENKINS/Pipeline+Nodes+and+Processes+Plugin</url>

src/main/java/org/jenkinsci/plugins/workflow/steps/durable_task/DurableTaskStep.java

@@ -205,10 +205,9 @@ static final class Execution extends AbstractStepExecutionImpl implements Runnab
                     l = new LogTaskListener(LOGGER, Level.FINE);
                 }
             } catch (Exception x) {
-                LOGGER.log(Level.WARNING, "JENKINS-34021: could not get TaskListener in " + context, x);
+                LOGGER.log(Level.FINE, "JENKINS-34021: could not get TaskListener in " + context, x);
                 l = new LogTaskListener(LOGGER, Level.FINE);
                 recurrencePeriod = 0;
-                getContext().onFailure(x);
             }
             return l.getLogger();
         }

src/main/java/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepExecution.java

@@ -48,6 +48,8 @@
 import jenkins.util.Timer;
 import org.acegisecurity.AccessDeniedException;
 import org.acegisecurity.Authentication;
+import org.acegisecurity.context.SecurityContext;
+import org.acegisecurity.context.SecurityContextHolder;
 import org.jenkinsci.plugins.durabletask.executors.ContinuableExecutable;
 import org.jenkinsci.plugins.durabletask.executors.ContinuedTask;
 import org.jenkinsci.plugins.workflow.flow.FlowExecution;
@@ -383,7 +385,12 @@ private Object readResolve() {
         public @CheckForNull Run<?,?> runForDisplay() {
             Run<?,?> r = run();
             if (r == null && /* not stored prior to 1.13 */runId != null) {
-                return Run.fromExternalizableId(runId);
+                SecurityContext orig = ACL.impersonate(ACL.SYSTEM);
+                try {
+                    return Run.fromExternalizableId(runId);
+                } finally {
+                    SecurityContextHolder.setContext(orig);
+                }
             }
             return r;
         }

src/test/java/org/jenkinsci/plugins/workflow/steps/durable_task/ShellStepTest.java

@@ -14,8 +14,11 @@
 import hudson.tasks.Shell;
 import java.io.File;
 import java.io.Serializable;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
 import static org.hamcrest.Matchers.containsString;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
+import org.jenkinsci.plugins.workflow.cps.CpsStepContext;
 import org.jenkinsci.plugins.workflow.cps.nodes.StepAtomNode;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
@@ -35,6 +38,7 @@
 import org.jvnet.hudson.test.BuildWatcher;
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.LoggerRule;
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.DataBoundConstructor;
 
@@ -45,6 +49,8 @@ public class ShellStepTest {
 
     @Rule public JenkinsRule j = new JenkinsRule();
 
+    @Rule public LoggerRule logging = new LoggerRule();
+
     /**
      * Failure in the shell script should mark the step as red
      */
@@ -224,6 +230,21 @@ public DescriptorImpl() {
         j.assertLogContains("truth is 0 but falsity is 1", j.assertBuildStatusSuccess(p.scheduleBuild2(0)));
     }
 
+    @Issue("JENKINS-34021")
+    @Test public void deadStep() throws Exception {
+        logging.record(DurableTaskStep.class, Level.INFO).record(CpsStepContext.class, Level.INFO).capture(100);
+        WorkflowJob p = j.jenkins.createProject(WorkflowJob.class, "p");
+        p.setDefinition(new CpsFlowDefinition("try {node {isUnix() ? sh('sleep infinity') : bat('ping 127.0.0.1 > nul')}} catch (e) {sleep 1; throw e}", true));
+        WorkflowRun b = p.scheduleBuild2(0).waitForStart();
+        j.waitForMessage(Functions.isWindows() ? ">ping" : "+ sleep", b);
+        b.doTerm();
+        j.waitForCompletion(b);
+        j.assertBuildStatus(Result.ABORTED, b);
+        for (LogRecord record : logging.getRecords()) {
+            assertNull(record.getThrown());
+        }
+    }
+
     /**
      * Asserts that the predicate remains true up to the given timeout.
      */

src/test/java/org/jenkinsci/plugins/workflow/support/pickles/ExecutorPickleTest.java

@@ -24,9 +24,13 @@
 
 package org.jenkinsci.plugins.workflow.support.pickles;
 
+import hudson.model.Item;
 import hudson.model.Label;
 import hudson.model.Queue;
+import hudson.model.User;
 import hudson.slaves.DumbSlave;
+import hudson.slaves.OfflineCause;
+import jenkins.model.Jenkins;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
@@ -38,12 +42,15 @@
 import org.junit.Rule;
 import org.junit.runners.model.Statement;
 import org.jvnet.hudson.test.BuildWatcher;
+import org.jvnet.hudson.test.Issue;
+import org.jvnet.hudson.test.MockAuthorizationStrategy;
 import org.jvnet.hudson.test.RestartableJenkinsRule;
 
 public class ExecutorPickleTest {
 
     @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
     @Rule public RestartableJenkinsRule r = new RestartableJenkinsRule();
+    //@Rule public LoggerRule logging = new LoggerRule().record(Queue.class, Level.FINE);
 
     @Test public void canceledQueueItem() throws Exception {
         r.addStep(new Statement() {
@@ -71,4 +78,33 @@ public class ExecutorPickleTest {
         });
     }
 
+    @Issue("JENKINS-42556")
+    @Test public void anonDiscover() {
+        r.addStep(new Statement() {
+            @Override public void evaluate() throws Throwable {
+                r.j.jenkins.setSecurityRealm(r.j.createDummySecurityRealm());
+                r.j.jenkins.setAuthorizationStrategy(new MockAuthorizationStrategy().
+                    grant(Jenkins.ADMINISTER).everywhere().to("admin").
+                    grant(Jenkins.READ, Item.DISCOVER).everywhere().toEveryone());
+                r.j.jenkins.save(); // TODO pending https://github.com/jenkinsci/jenkins/pull/2790
+                DumbSlave remote = r.j.createSlave("remote", null, null);
+                WorkflowJob p = r.j.createProject(WorkflowJob.class, "p");
+                p.setDefinition(new CpsFlowDefinition("node('remote') {semaphore 'wait'}", true));
+                SemaphoreStep.waitForStart("wait/1", p.scheduleBuild2(0).waitForStart());
+                remote.toComputer().setTemporarilyOffline(true, new OfflineCause.UserCause(User.get("admin"), "hold"));
+            }
+        });
+        r.addStep(new Statement() {
+            @Override public void evaluate() throws Throwable {
+                SemaphoreStep.success("wait/1", null);
+                WorkflowJob p = r.j.jenkins.getItemByFullName("p", WorkflowJob.class);
+                assertFalse(p.getACL().hasPermission(Jenkins.ANONYMOUS, Item.READ));
+                WorkflowRun b = p.getBuildByNumber(1);
+                r.j.waitForMessage(Messages.ExecutorPickle_waiting_to_resume(Messages.ExecutorStepExecution_PlaceholderTask_displayName(b.getFullDisplayName())), b);
+                r.j.jenkins.getNode("remote").toComputer().setTemporarilyOffline(false, null);
+                r.j.assertBuildStatusSuccess(r.j.waitForCompletion(b));
+            }
+        });
+    }
+
 }