From 98d306c6148cee33fdc74c2340d0dd640f068a03 Mon Sep 17 00:00:00 2001
From: Kenny Moens <kenny.moens@cipalschaubroeck.be>
Date: Mon, 28 Oct 2019 09:44:45 +0100
Subject: [PATCH 1/2] JENKINS-57117 - support pipeline jobs

---
 pom.xml                                          |  4 +++-
 .../scripttrigger/ScriptTriggerExecutor.java     | 16 ++++++++++++++++
 .../groovy/GroovyScriptTrigger.java              |  7 +++++--
 .../groovy/GroovyScriptTriggerExecutor.java      |  5 +++++
 src/main/resources/index.jelly                   |  1 +
 .../scripttrigger/ScriptTrigger/config.jelly     |  1 +
 .../ScriptTriggerAction/index.jelly              |  1 +
 .../groovy/GroovyScriptTrigger/config.jelly      |  1 +
 .../groovy/GroovyScriptTriggerAction/index.jelly |  1 +
 9 files changed, 34 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 pom.xml
 mode change 100644 => 100755 src/main/java/org/jenkinsci/plugins/scripttrigger/ScriptTriggerExecutor.java
 mode change 100644 => 100755 src/main/java/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTrigger.java
 mode change 100644 => 100755 src/main/java/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTriggerExecutor.java
 mode change 100644 => 100755 src/main/resources/index.jelly
 mode change 100644 => 100755 src/main/resources/org/jenkinsci/plugins/scripttrigger/ScriptTrigger/config.jelly
 mode change 100644 => 100755 src/main/resources/org/jenkinsci/plugins/scripttrigger/ScriptTriggerAction/index.jelly
 mode change 100644 => 100755 src/main/resources/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTrigger/config.jelly
 mode change 100644 => 100755 src/main/resources/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTriggerAction/index.jelly

diff --git a/pom.xml b/pom.xml
old mode 100644
new mode 100755
index 3441fdd..d666999
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>1.424</version>
+        <version>3.51</version> <!-- or whatever the newest version available is -->
     </parent>
 
     <artifactId>scripttrigger</artifactId>
@@ -52,6 +52,8 @@ THE SOFTWARE.
     </developers>
 
     <properties>
+        <jenkins.version>2.176.1</jenkins.version>
+        <java.level>8</java.level>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.6</maven.compiler.source>
         <maven.compiler.target>1.6</maven.compiler.target>
diff --git a/src/main/java/org/jenkinsci/plugins/scripttrigger/ScriptTriggerExecutor.java b/src/main/java/org/jenkinsci/plugins/scripttrigger/ScriptTriggerExecutor.java
old mode 100644
new mode 100755
index d31da29..b2e556b
--- a/src/main/java/org/jenkinsci/plugins/scripttrigger/ScriptTriggerExecutor.java
+++ b/src/main/java/org/jenkinsci/plugins/scripttrigger/ScriptTriggerExecutor.java
@@ -32,6 +32,7 @@
 import hudson.tasks.CommandInterpreter;
 import hudson.tasks.Shell;
 import org.jenkinsci.lib.xtrigger.XTriggerLog;
+import org.jenkinsci.remoting.RoleChecker;
 
 import java.io.*;
 import java.util.Map;
@@ -78,6 +79,9 @@ protected String getStringContent(Node executingNode, final String filePath) thr
 
         try {
             return executingNode.getRootPath().act(new FilePath.FileCallable<String>() {
+                @Override
+                public void checkRoles(RoleChecker roleChecker) throws SecurityException {
+                }
 
                 public String invoke(File f, VirtualChannel channel) throws IOException, InterruptedException {
                     StringBuffer content = new StringBuffer();
@@ -106,6 +110,10 @@ private int executeScript(final Node executingNode, final String scriptContent,
         try {
 
             boolean isUnix = executingNode.getRootPath().act(new Callable<Boolean, ScriptTriggerException>() {
+                @Override
+                public void checkRoles(RoleChecker roleChecker) throws SecurityException {
+                }
+
                 public Boolean call() throws ScriptTriggerException {
                     return File.pathSeparatorChar == ':';
                 }
@@ -125,6 +133,10 @@ public Boolean call() throws ScriptTriggerException {
                 throw new ScriptTriggerException("The node is offline.");
             }
             return rootPath.act(new FilePath.FileCallable<Integer>() {
+                @Override
+                public void checkRoles(RoleChecker roleChecker) throws SecurityException {
+                }
+
                 public Integer invoke(File f, VirtualChannel channel) throws IOException, InterruptedException {
                     try {
                         return getLocalLauncher(log.getListener()).launch().cmds(cmd).envs(envVars).stdout(log.getListener()).pwd(rootPath).join();
@@ -159,6 +171,10 @@ private Launcher getLocalLauncher(TaskListener listener) throws ScriptTriggerExc
     protected boolean existsScript(Node executingNode, final String path) throws ScriptTriggerException {
         try {
             return executingNode.getRootPath().act(new Callable<Boolean, ScriptTriggerException>() {
+                @Override
+                public void checkRoles(RoleChecker roleChecker) throws SecurityException {
+                }
+
                 public Boolean call() throws ScriptTriggerException {
                     File f = new File(path);
                     if (!f.exists()) {
diff --git a/src/main/java/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTrigger.java b/src/main/java/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTrigger.java
old mode 100644
new mode 100755
index 4e5a79f..697e7b6
--- a/src/main/java/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTrigger.java
+++ b/src/main/java/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTrigger.java
@@ -30,6 +30,7 @@
 import hudson.model.*;
 import hudson.remoting.VirtualChannel;
 import hudson.security.ACL;
+import jenkins.model.Jenkins;
 import org.acegisecurity.Authentication;
 import org.acegisecurity.context.SecurityContextHolder;
 import org.apache.commons.jelly.XMLOutput;
@@ -40,6 +41,7 @@
 import org.jenkinsci.plugins.scripttrigger.AbstractTrigger;
 import org.jenkinsci.plugins.scripttrigger.LabelRestrictionClass;
 import org.jenkinsci.plugins.scripttrigger.ScriptTriggerException;
+import org.jenkinsci.remoting.RoleChecker;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 import java.io.File;
@@ -48,8 +50,6 @@
 import java.nio.charset.Charset;
 import java.util.*;
 
-import jenkins.model.Jenkins;
-
 
 /**
  * @author Gregory Boissinot
@@ -127,6 +127,9 @@ protected Action[] getScheduledActions(Node pollingNode, final XTriggerLog log)
                     throw new ScriptTriggerException("The node is offline.");
                 }
                 return rootPath.act(new FilePath.FileCallable<Action[]>() {
+                    @Override
+                    public void checkRoles(RoleChecker roleChecker) throws SecurityException {
+                    }
 
                     public Action[] invoke(File f, VirtualChannel channel) throws IOException, InterruptedException {
                         File propFile = new File(propertiesFilePath);
diff --git a/src/main/java/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTriggerExecutor.java b/src/main/java/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTriggerExecutor.java
old mode 100644
new mode 100755
index 84c0776..5e601ec
--- a/src/main/java/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTriggerExecutor.java
+++ b/src/main/java/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTriggerExecutor.java
@@ -33,6 +33,7 @@
 import org.jenkinsci.lib.xtrigger.XTriggerLog;
 import org.jenkinsci.plugins.scripttrigger.ScriptTriggerException;
 import org.jenkinsci.plugins.scripttrigger.ScriptTriggerExecutor;
+import org.jenkinsci.remoting.RoleChecker;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -60,6 +61,10 @@ public boolean evaluateGroovyScript(Node executingNode, final AbstractProject pr
             }
 
             return executingNode.getRootPath().act(new Callable<Boolean, ScriptTriggerException>() {
+                @Override
+                public void checkRoles(RoleChecker roleChecker) throws SecurityException {
+                }
+
                 public Boolean call() throws ScriptTriggerException {
                     log.info("Running as node script");
                     return evaluateGroovyScript(null, scriptContent, envVars);
diff --git a/src/main/resources/index.jelly b/src/main/resources/index.jelly
old mode 100644
new mode 100755
index ae14d0d..ddb97cc
--- a/src/main/resources/index.jelly
+++ b/src/main/resources/index.jelly
@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <div>
     This plugin makes it possible to poll changes of an environment with a script.
 </div>
diff --git a/src/main/resources/org/jenkinsci/plugins/scripttrigger/ScriptTrigger/config.jelly b/src/main/resources/org/jenkinsci/plugins/scripttrigger/ScriptTrigger/config.jelly
old mode 100644
new mode 100755
index 766cab9..7805f77
--- a/src/main/resources/org/jenkinsci/plugins/scripttrigger/ScriptTrigger/config.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/scripttrigger/ScriptTrigger/config.jelly
@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <!--
 The MIT License (MIT)
 
diff --git a/src/main/resources/org/jenkinsci/plugins/scripttrigger/ScriptTriggerAction/index.jelly b/src/main/resources/org/jenkinsci/plugins/scripttrigger/ScriptTriggerAction/index.jelly
old mode 100644
new mode 100755
index 8bbe010..757ed89
--- a/src/main/resources/org/jenkinsci/plugins/scripttrigger/ScriptTriggerAction/index.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/scripttrigger/ScriptTriggerAction/index.jelly
@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <!--
 The MIT License
 
diff --git a/src/main/resources/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTrigger/config.jelly b/src/main/resources/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTrigger/config.jelly
old mode 100644
new mode 100755
index ac88688..da9b445
--- a/src/main/resources/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTrigger/config.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTrigger/config.jelly
@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
 
     <f:entry field="groovySystemScript" title="${%Groovy System Script}">
diff --git a/src/main/resources/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTriggerAction/index.jelly b/src/main/resources/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTriggerAction/index.jelly
old mode 100644
new mode 100755
index 8bbe010..757ed89
--- a/src/main/resources/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTriggerAction/index.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTriggerAction/index.jelly
@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <!--
 The MIT License
 

From 0188f467b9226eed8f9a079847e59022a425e4f7 Mon Sep 17 00:00:00 2001
From: Kenny Moens <kenny.moens@cipalschaubroeck.be>
Date: Tue, 29 Oct 2019 09:20:11 +0100
Subject: [PATCH 2/2] JENKINS-57117 - support pipeline jobs

---
 .../scripttrigger/AbstractTrigger.java        |  7 +++---
 .../plugins/scripttrigger/ScriptTrigger.java  | 19 +++++++++------
 .../groovy/GroovyScriptTrigger.java           | 23 +++++++++++--------
 .../groovy/GroovyScriptTriggerExecutor.java   | 18 +++++++--------
 .../help-groovySystemScript.html              |  2 +-
 5 files changed, 38 insertions(+), 31 deletions(-)
 mode change 100644 => 100755 src/main/java/org/jenkinsci/plugins/scripttrigger/AbstractTrigger.java
 mode change 100644 => 100755 src/main/java/org/jenkinsci/plugins/scripttrigger/ScriptTrigger.java
 mode change 100644 => 100755 src/main/resources/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTrigger/help-groovySystemScript.html

diff --git a/src/main/java/org/jenkinsci/plugins/scripttrigger/AbstractTrigger.java b/src/main/java/org/jenkinsci/plugins/scripttrigger/AbstractTrigger.java
old mode 100644
new mode 100755
index 90bd1fc..3d4935b
--- a/src/main/java/org/jenkinsci/plugins/scripttrigger/AbstractTrigger.java
+++ b/src/main/java/org/jenkinsci/plugins/scripttrigger/AbstractTrigger.java
@@ -23,6 +23,7 @@
 package org.jenkinsci.plugins.scripttrigger;
 
 import antlr.ANTLRException;
+import com.google.common.base.Charsets;
 import hudson.Util;
 import hudson.model.Action;
 import hudson.model.BuildableItem;
@@ -71,7 +72,7 @@ protected String getName() {
     @Override
     protected String getCause() {
         try {
-            String scriptContent = Util.loadFile(getLogFile());
+            String scriptContent = Util.loadFile(getLogFile(), Charsets.UTF_8);
             String cause = extractRootCause(scriptContent);
             if (cause == null) {
                 return getDefaultMessageCause();
@@ -92,12 +93,12 @@ private String extractRootCause(String content) {
     protected Action[] getScheduledActions(Node pollingNode, XTriggerLog log) {
         String scriptContent;
         try {
-            scriptContent = Util.loadFile(getLogFile());
+            scriptContent = Util.loadFile(getLogFile(), Charsets.UTF_8);
         } catch (IOException e) {
             return new Action[0];
         }
 
-        List<Action> actionList = new ArrayList<Action>();
+        List<Action> actionList = new ArrayList<>();
         String description = extractDescription(scriptContent);
         if (description != null) {
             actionList.add(new ScriptTriggerRunAction(description));
diff --git a/src/main/java/org/jenkinsci/plugins/scripttrigger/ScriptTrigger.java b/src/main/java/org/jenkinsci/plugins/scripttrigger/ScriptTrigger.java
old mode 100644
new mode 100755
index 4360ebd..c18a80e
--- a/src/main/java/org/jenkinsci/plugins/scripttrigger/ScriptTrigger.java
+++ b/src/main/java/org/jenkinsci/plugins/scripttrigger/ScriptTrigger.java
@@ -39,6 +39,7 @@
 import java.nio.charset.Charset;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -123,12 +124,16 @@ private boolean checkIfModifiedWithScriptsEvaluation(Node executingNode, int exp
 
         ScriptTriggerExecutor executor = getScriptTriggerExecutor(log);
 
-        EnvVarsResolver envVarsResolver = new EnvVarsResolver();
         Map<String, String> envVars;
-        try {
-            envVars = envVarsResolver.getPollingEnvVars((AbstractProject) job, executingNode);
-        } catch (EnvInjectException e) {
-            throw new ScriptTriggerException(e);
+        if (job instanceof AbstractProject) {
+            EnvVarsResolver envVarsResolver = new EnvVarsResolver();
+            try {
+                envVars = envVarsResolver.getPollingEnvVars((AbstractProject) job, executingNode);
+            } catch (EnvInjectException e) {
+                throw new ScriptTriggerException(e);
+            }
+        } else {
+            envVars = new HashMap<>();
         }
 
         if (script != null) {
@@ -189,8 +194,8 @@ public InternalScriptTriggerAction(String actionTitle) {
         }
 
         @SuppressWarnings("unused")
-        public AbstractProject<?, ?> getOwner() {
-            return (AbstractProject) job;
+        public BuildableItem getOwner() {
+            return job;
         }
 
         @Override
diff --git a/src/main/java/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTrigger.java b/src/main/java/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTrigger.java
index 697e7b6..7903f13 100755
--- a/src/main/java/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTrigger.java
+++ b/src/main/java/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTrigger.java
@@ -169,25 +169,28 @@ protected boolean checkIfModified(Node pollingNode, XTriggerLog log) throws Scri
         try {
 
             GroovyScriptTriggerExecutor executor = getGroovyScriptTriggerExecutor(log);
-            final AbstractProject proj = (AbstractProject) job;
 
-            EnvVarsResolver envVarsResolver = new EnvVarsResolver();
             Map<String, String> envVars;
-            try {
-                envVars = envVarsResolver.getPollingEnvVars(proj, pollingNode);
-            } catch (EnvInjectException e) {
-                throw new ScriptTriggerException(e);
+            if (job instanceof AbstractProject) {
+                EnvVarsResolver envVarsResolver = new EnvVarsResolver();
+                try {
+                    envVars = envVarsResolver.getPollingEnvVars((AbstractProject) job, pollingNode);
+                } catch (EnvInjectException e) {
+                    throw new ScriptTriggerException(e);
+                }
+            } else {
+                envVars = new HashMap<>();
             }
 
             if (groovyExpression != null) {
-                boolean evaluationSucceed = executor.evaluateGroovyScript(pollingNode, proj, getGroovyExpression(), envVars, groovySystemScript);
+                boolean evaluationSucceed = executor.evaluateGroovyScript(pollingNode, job, getGroovyExpression(), envVars, groovySystemScript);
                 if (evaluationSucceed) {
                     return true;
                 }
             }
 
             if (groovyFilePath != null) {
-                boolean evaluationSucceed = executor.evaluateGroovyScriptFilePath(pollingNode, proj, Util.replaceMacro(groovyFilePath, envVars), envVars, groovySystemScript);
+                boolean evaluationSucceed = executor.evaluateGroovyScriptFilePath(pollingNode, job, Util.replaceMacro(groovyFilePath, envVars), envVars, groovySystemScript);
                 if (evaluationSucceed) {
                     return true;
                 }
@@ -232,8 +235,8 @@ public InternalGroovyScriptTriggerAction(String actionTitle) {
         }
 
         @SuppressWarnings("unused")
-        public AbstractProject<?, ?> getOwner() {
-            return (AbstractProject) job;
+        public BuildableItem getOwner() {
+            return job;
         }
 
         @Override
diff --git a/src/main/java/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTriggerExecutor.java b/src/main/java/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTriggerExecutor.java
index 5e601ec..4aa3833 100755
--- a/src/main/java/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTriggerExecutor.java
+++ b/src/main/java/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTriggerExecutor.java
@@ -25,9 +25,7 @@
 import groovy.lang.GroovyShell;
 import hudson.PluginManager;
 import hudson.Util;
-import hudson.model.AbstractProject;
-import hudson.model.Hudson;
-import hudson.model.Node;
+import hudson.model.*;
 import hudson.remoting.Callable;
 import hudson.util.IOUtils;
 import org.jenkinsci.lib.xtrigger.XTriggerLog;
@@ -49,7 +47,7 @@ public GroovyScriptTriggerExecutor(XTriggerLog log) {
         super(log);
     }
 
-    public boolean evaluateGroovyScript(Node executingNode, final AbstractProject proj, final String scriptContent, final Map<String, String> envVars, boolean groovySystemScript) throws ScriptTriggerException {
+    public boolean evaluateGroovyScript(Node executingNode, final BuildableItem items, final String scriptContent, final Map<String, String> envVars, boolean groovySystemScript) throws ScriptTriggerException {
 
         if (scriptContent == null) {
             throw new NullPointerException("The script content object must be set.");
@@ -57,7 +55,7 @@ public boolean evaluateGroovyScript(Node executingNode, final AbstractProject pr
         try {
             if (groovySystemScript) {
                 log.info("Running as system script");
-                return evaluateGroovyScript(proj, scriptContent, envVars);
+                return evaluateGroovyScript(items, scriptContent, envVars);
             }
 
             return executingNode.getRootPath().act(new Callable<Boolean, ScriptTriggerException>() {
@@ -85,7 +83,7 @@ public Boolean call() throws ScriptTriggerException {
         }
     }
 
-    private boolean evaluateGroovyScript(final AbstractProject proj, final String scriptContent, final Map<String, String> envVars) {
+    private boolean evaluateGroovyScript(final BuildableItem item, final String scriptContent, final Map<String, String> envVars) {
         if (envVars != null) {
             final StringBuilder envDebug = new StringBuilder("Replacing script vars using:");
             for (final Map.Entry<String, String> envEntry : envVars.entrySet()) {
@@ -113,8 +111,8 @@ private boolean evaluateGroovyScript(final AbstractProject proj, final String sc
 
         shell.setVariable("log", log);
         shell.setVariable("out", log.getListener().getLogger());
-        if (proj != null) {
-            shell.setVariable("project", proj);
+        if (item != null) {
+            shell.setVariable("project", item);
         }
 
         //Evaluate the new script content
@@ -153,7 +151,7 @@ protected ClassLoader getClassLoader() {
         return cl;
     }
 
-    public boolean evaluateGroovyScriptFilePath(Node executingNode, AbstractProject proj, String scriptFilePath, Map<String, String> envVars, boolean groovySystemScript) throws ScriptTriggerException {
+    public boolean evaluateGroovyScriptFilePath(Node executingNode, BuildableItem item, String scriptFilePath, Map<String, String> envVars, boolean groovySystemScript) throws ScriptTriggerException {
 
         if (scriptFilePath == null) {
             throw new NullPointerException("The scriptFilePath object must be set.");
@@ -194,7 +192,7 @@ public boolean evaluateGroovyScriptFilePath(Node executingNode, AbstractProject
             scriptContent = getStringContent(executingNode, scriptFilePath);
         }
 
-        return evaluateGroovyScript(executingNode, proj, scriptContent, envVars, groovySystemScript);
+        return evaluateGroovyScript(executingNode, item, scriptContent, envVars, groovySystemScript);
     }
 
 }
diff --git a/src/main/resources/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTrigger/help-groovySystemScript.html b/src/main/resources/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTrigger/help-groovySystemScript.html
old mode 100644
new mode 100755
index b977b96..3f23da0
--- a/src/main/resources/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTrigger/help-groovySystemScript.html
+++ b/src/main/resources/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTrigger/help-groovySystemScript.html
@@ -1,7 +1,7 @@
 <div>
     <p>
         If checked run the groovy script as a system script, the script will have access to the same
-        variables as the Groovy Console. The AbstractProject is also bound to the project variable.
+        variables as the Groovy Console. The BuildableItem is also bound to the project variable.
         <br/>
         If not checked run the groovy script on the executor node, the script will not have access
         to the hudson or job model.