diff --git a/pom.xml b/pom.xml index 110644d..2020d5a 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ secure-requester-whitelist 1.8-SNAPSHOT hpi - Secure Requester Whitelist Plugin + Secure Requester Allowlist Plugin Allows an administrator to specify sites trusted to make JSONP or primitive-XPath REST API requests. https://github.com/jenkinsci/${project.artifactId}-plugin diff --git a/src/main/java/org/jenkinsci/plugins/secure_requester_whitelist/Whitelist.java b/src/main/java/org/jenkinsci/plugins/secure_requester_whitelist/Whitelist.java index 9036237..956d875 100644 --- a/src/main/java/org/jenkinsci/plugins/secure_requester_whitelist/Whitelist.java +++ b/src/main/java/org/jenkinsci/plugins/secure_requester_whitelist/Whitelist.java @@ -36,7 +36,7 @@ import org.kohsuke.stapler.StaplerRequest; @Extension -@Symbol("secureRequesterWhitelist") +@Symbol({"secureRequesterAllowlist", "secureRequesterWhitelist"}) public class Whitelist extends GlobalConfiguration { public static Whitelist get() { diff --git a/src/main/resources/org/jenkinsci/plugins/secure_requester_whitelist/Whitelist/config.jelly b/src/main/resources/org/jenkinsci/plugins/secure_requester_whitelist/Whitelist/config.jelly index 83b317c..2d322ed 100644 --- a/src/main/resources/org/jenkinsci/plugins/secure_requester_whitelist/Whitelist/config.jelly +++ b/src/main/resources/org/jenkinsci/plugins/secure_requester_whitelist/Whitelist/config.jelly @@ -25,7 +25,7 @@ THE SOFTWARE. - + diff --git a/src/test/java/org/jenkinsci/plugins/secure_requester_whitelist/LegacySymbolCasCTest.java b/src/test/java/org/jenkinsci/plugins/secure_requester_whitelist/LegacySymbolCasCTest.java new file mode 100644 index 0000000..f20e6e2 --- /dev/null +++ b/src/test/java/org/jenkinsci/plugins/secure_requester_whitelist/LegacySymbolCasCTest.java @@ -0,0 +1,27 @@ +package org.jenkinsci.plugins.secure_requester_whitelist; + +import io.jenkins.plugins.casc.misc.RoundTripAbstractTest; +import org.jvnet.hudson.test.RestartableJenkinsRule; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +public class LegacySymbolCasCTest extends RoundTripAbstractTest { + + @Override + protected String configResource() { + return "LegacySymbol.yml"; + } + + @Override + protected void assertConfiguredAsExpected(RestartableJenkinsRule restartableJenkinsRule, String s) { + final Whitelist whitelist = Whitelist.get(); + assertTrue(whitelist.isAllowNoReferer()); + assertEquals("acme.org jenkins.io", whitelist.getDomains()); + } + + @Override + protected String stringInLogExpected() { + return "Setting org.jenkinsci.plugins.secure_requester_whitelist.Whitelist"; + } +} diff --git a/src/test/resources/org/jenkinsci/plugins/secure_requester_whitelist/CasCTest.yml b/src/test/resources/org/jenkinsci/plugins/secure_requester_whitelist/CasCTest.yml index bb0bf7e..5694b6a 100644 --- a/src/test/resources/org/jenkinsci/plugins/secure_requester_whitelist/CasCTest.yml +++ b/src/test/resources/org/jenkinsci/plugins/secure_requester_whitelist/CasCTest.yml @@ -1,4 +1,4 @@ security: - secureRequesterWhitelist: + secureRequesterAllowlist: allowNoReferer: true domains: "acme.org jenkins.io" \ No newline at end of file diff --git a/src/test/resources/org/jenkinsci/plugins/secure_requester_whitelist/LegacySymbol.yml b/src/test/resources/org/jenkinsci/plugins/secure_requester_whitelist/LegacySymbol.yml new file mode 100644 index 0000000..e2cf383 --- /dev/null +++ b/src/test/resources/org/jenkinsci/plugins/secure_requester_whitelist/LegacySymbol.yml @@ -0,0 +1,4 @@ +security: + secureRequesterWhitelist: + allowNoReferer: true + domains: "acme.org jenkins.io"