Fix JENKINS-16916

- Updated ScriptContent to use better groovy setup. - In default groovy script, add all content types as closures, these can be used like ${ENV(var: "BUILD_ID")} in the groovy template
jenkinsci · Feb 24, 2013 · 88aa3db · 88aa3db
1 parent 9f207ef
commit 88aa3db
Show file tree

Hide file tree

Showing 8 changed files with 165 additions and 152 deletions.
diff --git a/src/main/java/hudson/plugins/emailext/ExtendedEmailPublisher.java b/src/main/java/hudson/plugins/emailext/ExtendedEmailPublisher.java
@@ -372,26 +372,13 @@ private boolean sendMail(EmailType mailType, AbstractBuild<?, ?> build, BuildLis
         return false;
     }
 
-    /**
-     * Provides a sandbox for groovy scripts that disallows access to the Jenkins instance.
-     */
-    private class PresendScriptSandbox extends GroovyValueFilter {
-        @Override
-        public Object filter(Object o) {
-            if(o instanceof Jenkins || o instanceof Hudson) {
-                throw new SecurityException("Use of 'jenkins' is disallowed by security policy");
-            }
-            return o;
-        }
-    }
-
     private boolean executePresendScript(AbstractBuild<?, ?> build, BuildListener listener, MimeMessage msg) 
         throws RuntimeException {
         boolean cancel = false;
         if(StringUtils.isNotBlank(presendScript)) {
             listener.getLogger().println("Executing pre-send script");
             ClassLoader cl = Jenkins.getInstance().getPluginManager().uberClassLoader;
-            PresendScriptSandbox sandbox = null;
+            ScriptSandbox sandbox = null;
             CompilerConfiguration cc = new CompilerConfiguration();
             cc.addCompilationCustomizers(new ImportCustomizer().addStarImports(
                     "jenkins",
@@ -402,7 +389,7 @@ private boolean executePresendScript(AbstractBuild<?, ?> build, BuildListener li
             if(ExtendedEmailPublisher.DESCRIPTOR.isSecurityEnabled()) {
                 debug(listener.getLogger(), "Setting up sandbox for pre-send script");
                 cc.addCompilationCustomizers(new SandboxTransformer());
-                sandbox = new PresendScriptSandbox();
+                sandbox = new ScriptSandbox();
             }
 
             Binding binding = new Binding();

diff --git a/src/main/java/hudson/plugins/emailext/ExtendedEmailPublisherDescriptor.java b/src/main/java/hudson/plugins/emailext/ExtendedEmailPublisherDescriptor.java
@@ -280,7 +280,6 @@ public boolean isTokenMacroAvailable() {
     @Override
     public Publisher newInstance(StaplerRequest req, JSONObject formData)
             throws hudson.model.Descriptor.FormException {
-
         // Save configuration for each trigger type
         ExtendedEmailPublisher m = new ExtendedEmailPublisher();
         m.recipientList = formData.getString("recipientlist_recipients");

diff --git a/src/main/java/hudson/plugins/emailext/ScriptSandbox.java b/src/main/java/hudson/plugins/emailext/ScriptSandbox.java
@@ -0,0 +1,23 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package hudson.plugins.emailext;
+
+import hudson.model.Hudson;
+import jenkins.model.Jenkins;
+import org.kohsuke.groovy.sandbox.GroovyValueFilter;
+
+/**
+ * Provides a sandbox for groovy scripts that disallows access to the Jenkins
+ * instance.
+ */
+public class ScriptSandbox extends GroovyValueFilter {
+    @Override
+    public Object filter(Object o) {
+        if (o instanceof Jenkins || o instanceof Hudson) {
+            throw new SecurityException("Use of 'jenkins' is disallowed by security policy");
+        }
+        return o;
+    }
+}
diff --git a/src/main/java/hudson/plugins/emailext/plugins/ContentBuilder.java b/src/main/java/hudson/plugins/emailext/plugins/ContentBuilder.java
@@ -10,9 +10,6 @@
 import hudson.plugins.emailext.Util;
 import hudson.tasks.Mailer;
 import hudson.tasks.Publisher;
-
-import jenkins.model.Jenkins;
-
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -21,8 +18,7 @@
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
-import java.io.IOException;
+import jenkins.model.Jenkins;
 
 /**
  * {@link Publisher} that sends notification e-mail.

diff --git a/src/main/java/hudson/plugins/emailext/plugins/EmailTrigger.java b/src/main/java/hudson/plugins/emailext/plugins/EmailTrigger.java
@@ -67,6 +67,7 @@ protected int getNumFailures(AbstractBuild<?, ?> build) {
             int result = 0; 
             AggregatedTestResultAction action = (AggregatedTestResultAction) a;
             for (ChildReport cr : action.getChildReports()) {
+                if(cr == null || cr.child == null || cr.child.getParent() == null) continue;
                 if (cr.child.getParent().equals(build.getParent())) {
                     if (cr.result instanceof TestResult) {
                         TestResult tr = (TestResult) cr.result;