Skip to content

Commit 8bb5eda

Browse files
authored
Merge pull request #365 from haridsv/JENKINS-66735
JENKINS-66735: Whitelist some common signatures and additional signatures from `CauseOfInterruption`
2 parents b4f85af + c3d9d68 commit 8bb5eda

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

src/main/resources/org/jenkinsci/plugins/scriptsecurity/sandbox/whitelists/generic-whitelist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ new java.lang.StringBuilder int
292292
new java.lang.StringBuilder java.lang.CharSequence
293293
new java.lang.StringBuilder java.lang.String
294294
staticMethod java.lang.System currentTimeMillis
295+
staticMethod java.lang.System identityHashCode java.lang.Object
295296
method java.lang.Throwable getCause
296297
method java.lang.Throwable getMessage
297298
method java.lang.Throwable printStackTrace java.io.PrintStream
@@ -701,6 +702,8 @@ method java.util.Date setTime long
701702
method java.util.Date setYear int
702703
method java.util.Date toGMTString
703704
method java.util.Date toLocaleString
705+
new java.util.HashMap
706+
new java.util.HashMap java.util.Map
704707
new java.util.HashSet
705708
new java.util.HashSet java.util.Collection
706709
method java.util.Iterator hasNext
@@ -1144,6 +1147,7 @@ staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods sort java.util.Ite
11441147
staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods sort java.util.Iterator java.util.Comparator
11451148
staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods sort java.util.Map
11461149
staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods sort java.util.Map groovy.lang.Closure
1150+
staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods sort java.util.Map java.util.Comparator
11471151
staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods split java.lang.String
11481152
staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods split java.util.Collection groovy.lang.Closure
11491153
staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods split java.util.List groovy.lang.Closure

src/main/resources/org/jenkinsci/plugins/scriptsecurity/sandbox/whitelists/jenkins-whitelist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,5 @@ field hudson.scm.EditType EDIT
3434
method hudson.scm.EditType getName
3535
method hudson.tools.ToolInstallation getHome
3636
method hudson.tools.ToolInstallation getName
37+
method jenkins.model.CauseOfInterruption getShortDescription
38+
method jenkins.model.CauseOfInterruption$UserInterruption getUserId

0 commit comments

Comments
 (0)