Merge remote-tracking branch 'upstream/master' into logging-exMTL

Author: jimklimov

CHANGELOG.md

@@ -50,7 +50,7 @@
         <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>exec-maven-plugin</artifactId>
-            <version>3.1.1</version>
+            <version>3.2.0</version>
             <executions>
                 <execution>
                     <phase>generate-sources</phase>

lib/pom.xml

@@ -34,6 +34,7 @@ public Next receive(Object o) {
         return new ContinuationImpl(e, k).then(b, e, cast);
     }
 
+    @SuppressFBWarnings(value = "SIC_INNER_SHOULD_BE_STATIC", justification = "Too late to fix compatibly.")
     class ContinuationImpl extends ContinuationGroup {
         final Continuation k;
         final Env e;

lib/src/main/java/com/cloudbees/groovy/cps/impl/NotBlock.java

@@ -31,7 +31,7 @@
     "less": "^3.12.2",
     "less-loader": "^7.0.2",
     "mini-css-extract-plugin": "^1.2.1",
-    "postcss": "^8.2.13",
+    "postcss": "^8.4.35",
     "postcss-less": "^4.0.0",
     "postcss-loader": "^4.0.4",
     "style-loader": "^2.0.0",

plugin/package.json

@@ -49,17 +49,11 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.387.x</artifactId>
-                <version>2378.v3e03930028f2</version>
+                <artifactId>bom-2.414.x</artifactId>
+                <version>2746.vb_79a_1d3e7b_c8</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-            <!-- TODO until in BOM: -->
-            <dependency>
-              <groupId>org.jenkins-ci.plugins</groupId>
-              <artifactId>support-core</artifactId>
-              <version>1366.v9d076592655d</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>
@@ -110,12 +104,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.jenkins-ci.plugins.workflow</groupId>
-            <artifactId>workflow-step-api</artifactId>
-            <classifier>tests</classifier>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-support</artifactId>
@@ -259,7 +247,7 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>1.19.3</version>
+            <version>1.19.6</version>
             <scope>test</scope>
             <exclusions>
                 <!-- Provided by Jenkins core -->

plugin/pom.xml

@@ -267,6 +267,7 @@ public class CpsFlowExecution extends FlowExecution implements BlockableResume {
      *
      * @see #runInCpsVmThread(FutureCallback)
      */
+    @SuppressFBWarnings(value = "PA_PUBLIC_PRIMITIVE_ATTRIBUTE", justification = "TODO clean up")
     public transient volatile ListenableFuture<CpsThreadGroup> programPromise;
     private transient volatile Collection<ListenableFuture<?>> pickleFutures;
 
@@ -915,7 +916,19 @@ private void loadProgramFailed(final Throwable problem, SettableFuture<CpsThread
     /** Report a fatal error in the VM. */
     void croak(Throwable t) {
         setResult(Result.FAILURE);
-        onProgramEnd(new Outcome(null, t));
+        boolean noStartNodes;
+        synchronized (this) {
+            noStartNodes = startNodes == null || startNodes.isEmpty();
+        }
+        if (noStartNodes) {
+            try {
+                createPlaceholderNodes(t);
+            } catch (Exception x) {
+                LOGGER.log(Level.WARNING, "Failed to create placeholder nodes in " + owner, x);
+            }
+        } else {
+            onProgramEnd(new Outcome(null, t));
+        }
         cleanUpHeap();
         try {
             saveOwner();
@@ -1280,6 +1293,8 @@ public List<Action> loadActions(FlowNode node) throws IOException {
     public void saveActions(FlowNode node, List<Action> actions) throws IOException {
         if (storage == null) {
             throw new IOException("storage not yet loaded");
+        } else if (isComplete()) {
+            throw new IOException("Cannot save actions for " + node + " for completed execution " + this + ": " + actions);
         }
         storage.saveActions(node, actions);
     }

plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java

@@ -31,7 +31,6 @@
 import hudson.model.Result;
 import java.util.Collection;
 import jenkins.model.Jenkins;
-import org.apache.commons.io.output.NullOutputStream;
 import org.jenkinsci.plugins.structs.describable.DescribableModel;
 import org.jenkinsci.plugins.structs.describable.UninstantiatedDescribable;
 import org.jenkinsci.plugins.workflow.actions.ArgumentsAction;
@@ -41,6 +40,7 @@
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import java.io.OutputStream;
 import java.lang.reflect.Type;
 import java.net.URL;
 import java.util.ArrayList;
@@ -240,6 +240,9 @@ Object sanitizeObjectAndRecordMutation(@CheckForNull Object o, @CheckForNull Env
                 this.isUnmodifiedBySanitization = true;
                 return NotStoredReason.UNSERIALIZABLE;
             }
+        } else if (modded instanceof String && ((String) modded).contains("\0")) {
+            this.isUnmodifiedBySanitization = false;
+            return "<contains ASCII NUL>";
         } else if (modded instanceof String && vars != null && !vars.isEmpty()) {
             String replaced = replaceSensitiveVariables((String)modded, vars, sensitiveVariables);
             if (!replaced.equals(modded)) {
@@ -282,7 +285,7 @@ Map<String, Object> serializationCheck(@NonNull Map<String, Object> arguments) {
             try {
                 if (val != null && !(val instanceof String) && !(val instanceof Boolean) && !(val instanceof Number) && !(val instanceof NotStoredReason) && !(val instanceof TimeUnit)) {
                     // We only need to check serialization for nontrivial types
-                    Jenkins.XSTREAM2.toXMLUTF8(entry.getValue(), NullOutputStream.NULL_OUTPUT_STREAM);  // Hacky but can't find a better way
+                    Jenkins.XSTREAM2.toXMLUTF8(entry.getValue(), OutputStream.nullOutputStream());  // Hacky but can't find a better way
                 }
                 out.put(entry.getKey(), entry.getValue());
             } catch (Exception ex) {

plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImpl.java

@@ -1,16 +1,21 @@
 package org.jenkinsci.plugins.workflow.cps.steps;
 
 import hudson.Extension;
-import org.jenkinsci.plugins.workflow.steps.AbstractStepDescriptorImpl;
-import org.jenkinsci.plugins.workflow.steps.AbstractStepImpl;
+import hudson.FilePath;
+import hudson.model.TaskListener;
+import java.util.Set;
+import org.jenkinsci.plugins.workflow.steps.Step;
+import org.jenkinsci.plugins.workflow.steps.StepContext;
+import org.jenkinsci.plugins.workflow.steps.StepDescriptor;
+import org.jenkinsci.plugins.workflow.steps.StepExecution;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 /**
  * Evaluate arbitrary script file.
  *
  * @author Kohsuke Kawaguchi
  */
-public class LoadStep extends AbstractStepImpl {
+public class LoadStep extends Step {
     /**
      * Relative path of the script within the current workspace.
      */
@@ -25,11 +30,13 @@ public String getPath() {
         return path;
     }
 
+    @Override
+    public StepExecution start(StepContext context) throws Exception {
+        return new LoadStepExecution(this, context);
+    }
+
     @Extension
-    public static class DescriptorImpl extends AbstractStepDescriptorImpl {
-        public DescriptorImpl() {
-            super(LoadStepExecution.class);
-        }
+    public static class DescriptorImpl extends StepDescriptor {
 
         @Override
         public String getFunctionName() {
@@ -40,6 +47,11 @@ public String getFunctionName() {
         public String getDisplayName() {
             return "Evaluate a Groovy source file into the Pipeline script";
         }
+
+        @Override
+        public Set<? extends Class<?>> getRequiredContext() {
+            return Set.of(FilePath.class, TaskListener.class);
+        }
     }
 
 }

plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStep.java

@@ -1,6 +1,5 @@
 package org.jenkinsci.plugins.workflow.cps.steps;
 
-import com.google.inject.Inject;
 import groovy.lang.Script;
 import hudson.FilePath;
 import hudson.model.TaskListener;
@@ -12,26 +11,27 @@
 import org.jenkinsci.plugins.workflow.cps.replay.ReplayAction;
 import org.jenkinsci.plugins.workflow.steps.AbstractStepExecutionImpl;
 import org.jenkinsci.plugins.workflow.steps.BodyExecutionCallback;
-import org.jenkinsci.plugins.workflow.steps.StepContextParameter;
+import org.jenkinsci.plugins.workflow.steps.StepContext;
 
 /**
  * Loads another Groovy script file and executes it.
  *
  * @author Kohsuke Kawaguchi
  */
 public class LoadStepExecution extends AbstractStepExecutionImpl {
-    @StepContextParameter
-    private transient FilePath cwd;
 
-    @Inject(optional=true)
     private transient LoadStep step;
 
-    @StepContextParameter
-    private transient TaskListener listener;
+    LoadStepExecution(LoadStep step, StepContext context) {
+        super(context);
+        this.step = step;
+    }
 
     @Override
     public boolean start() throws Exception {
         CpsStepContext cps = (CpsStepContext) getContext();
+        FilePath cwd = cps.get(FilePath.class);
+        TaskListener listener = cps.get(TaskListener.class);
         CpsThread t = CpsThread.current();
 
         CpsFlowExecution execution = t.getExecution();
@@ -62,6 +62,11 @@ public boolean start() throws Exception {
         return false;
     }
 
+    @Override
+    public void onResume() {
+        // do nothing
+    }
+
     private static final long serialVersionUID = 1L;
 
 }

plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStepExecution.java

@@ -1,4 +1,4 @@
-function handlePrototype(url, crumb) {
+function handlePrototype(url) {
     buildFormTree(document.forms.config);
     // TODO JSON.stringify fails in some circumstances: https://gist.github.com/jglick/70ec4b15c1f628fdf2e9 due to Array.prototype.toJSON
     // TODO simplify when Prototype.js is removed
@@ -7,13 +7,11 @@ function handlePrototype(url, crumb) {
         return; // just a separator
     }
 
-    const headers = new Headers();
-    headers.append("Content-Type", "application/x-www-form-urlencoded");
-    headers.append("Jenkins-Crumb", crumb);
-
     fetch(url, {
         method: "POST",
-        headers: headers,
+        headers: crumb.wrap({
+            "Content-Type": "application/x-www-form-urlencoded"
+        }),
         body: "json=" + encodeURIComponent(json),
 
     })
@@ -37,9 +35,8 @@ document.addEventListener('DOMContentLoaded', () => {
 
     const generatePipelineScript = document.getElementById("generatePipelineScript");
     const url = generatePipelineScript.getAttribute("data-url");
-    const crumb = generatePipelineScript.getAttribute("data-crumb");
     generatePipelineScript.onclick = (_) => {
-        handlePrototype(url, crumb);
+        handlePrototype(url);
         return false;
     };