Enable script-security tests again

[jglick]

Reverting #1444 since these should pass as soon as jenkinsci/script-security-plugin#549 is deployed now that it is deployed.

Fixes #1463

[jglick]

https://ci.jenkins.io/job/Core/job/acceptance-test-harness/job/PR-1463/2/testReport/plugins/GroovyPluginTest/latest_linux_jdk21_firefox_split9___run_system_groovy_from_file/ 👀

…	WARNING	o.k.s.HttpResponseRenderer$Default#handleJavaScriptProxyMethodCall: call to /$stapler/bound/…/approveSignature failed
java.lang.IllegalStateException: Expected 1 instance of org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval$ApprovedWhitelist but got 2
	at hudson.ExtensionList.lookupSingleton(ExtensionList.java:457)
	at org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval$ApprovedWhitelist.configurationChanged(ScriptApproval.java:974)
	at org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval.reconfigure(ScriptApproval.java:1135)
	at org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval.approveSignature(ScriptApproval.java:1145)

[jglick]

Core bug? Locally

[
    org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval$ApprovedWhitelist,
    org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.ProxyWhitelist,
    org.jenkinsci.plugins.scriptsecurity.sandbox.Whitelist
].each {c ->
  println "$c: ${ExtensionList.lookup(c)}"
}; null

⇒

class org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval$ApprovedWhitelist: [org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval$ApprovedWhitelist@2a5adf3f[org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.AclAwareWhitelist@761fbf66], org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval$ApprovedWhitelist@2a5adf3f[org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.AclAwareWhitelist@761fbf66]]
class org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.ProxyWhitelist: [org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval$ApprovedWhitelist@2a5adf3f[org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.AclAwareWhitelist@761fbf66]]
class org.jenkinsci.plugins.scriptsecurity.sandbox.Whitelist: [org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.AnnotatedWhitelist@79647c59, org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.StaticWhitelist@3b3da89b, org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval$ApprovedWhitelist@2a5adf3f[org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.AclAwareWhitelist@761fbf66]]

Note that the ApprovedWhitelist appears twice when looked up under itself, but not when lookup up under supertypes. And I suppose this only happens when script-security is dynamically installed. Also https://ci.jenkins.io/job/Core/job/acceptance-test-harness/job/PR-1463/2/testReport/plugins/GroovyPluginTest/lts_linux_jdk11_firefox_split9___run_system_groovy_from_file/ passed. As did https://ci.jenkins.io/job/Core/job/acceptance-test-harness/job/PR-1463/2/testReport/plugins/ScriptSecurityPluginTest/latest_linux_jdk21_firefox_split8___signatureNeedsApproval/ which uses the same idiom

acceptance-test-harness/src/test/java/plugins/ScriptSecurityPluginTest.java

Lines 124 to 126 in 29e61b9

	ScriptApproval sa = new ScriptApproval(jenkins);
	sa.open();
	sa.findSignature("getProperties").approve();

[jglick]

I get the same error locally from ScriptSecurityPluginTest.signatureNeedsApproval so I suppose it is timing-sensitive.

[timja]

thanks!