Merge pull request #365 from haridsv/JENKINS-66735

JENKINS-66735: Whitelist some common signatures and additional signatures from `CauseOfInterruption`
jenkinsci · Jan 7, 2022 · 8bb5eda · 8bb5eda
2 parents b4f85af + c3d9d68
commit 8bb5eda
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/sandbox/whitelists/generic-whitelist b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/sandbox/whitelists/generic-whitelist
@@ -292,6 +292,7 @@ new java.lang.StringBuilder int
 new java.lang.StringBuilder java.lang.CharSequence
 new java.lang.StringBuilder java.lang.String
 staticMethod java.lang.System currentTimeMillis
+staticMethod java.lang.System identityHashCode java.lang.Object
 method java.lang.Throwable getCause
 method java.lang.Throwable getMessage
 method java.lang.Throwable printStackTrace java.io.PrintStream
@@ -701,6 +702,8 @@ method java.util.Date setTime long
 method java.util.Date setYear int
 method java.util.Date toGMTString
 method java.util.Date toLocaleString
+new java.util.HashMap
+new java.util.HashMap java.util.Map
 new java.util.HashSet
 new java.util.HashSet java.util.Collection
 method java.util.Iterator hasNext
@@ -1144,6 +1147,7 @@ staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods sort java.util.Ite
 staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods sort java.util.Iterator java.util.Comparator
 staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods sort java.util.Map
 staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods sort java.util.Map groovy.lang.Closure
+staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods sort java.util.Map java.util.Comparator
 staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods split java.lang.String
 staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods split java.util.Collection groovy.lang.Closure
 staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods split java.util.List groovy.lang.Closure

diff --git a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/sandbox/whitelists/jenkins-whitelist b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/sandbox/whitelists/jenkins-whitelist
@@ -34,3 +34,5 @@ field hudson.scm.EditType EDIT
 method hudson.scm.EditType getName
 method hudson.tools.ToolInstallation getHome
 method hudson.tools.ToolInstallation getName
+method jenkins.model.CauseOfInterruption getShortDescription
+method jenkins.model.CauseOfInterruption$UserInterruption getUserId