Skip to content
Permalink
Browse files

[JENKINS-39470] Migrate to 2.17 parent POM. Apply a couple fixes that…

… avoided the build to finish successfully.
  • Loading branch information...
varyvol committed Nov 3, 2016
1 parent d67300b commit 5cab126a4b66adb105239207a6cc997976ba3699
13 pom.xml
@@ -3,9 +3,9 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<!-- TODO switch to 1.532.2 if JENKINS-16936 is backported -->
<version>1.537</version>
<version>2.17</version>
</parent>

<artifactId>secure-requester-whitelist</artifactId>
<version>1.1-SNAPSHOT</version>
<packaging>hpi</packaging>
@@ -18,25 +18,30 @@
<url>http://www.opensource.org/licenses/mit-license.php</url>
</license>
</licenses>

<scm>
<connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
<developerConnection>scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
</scm>

<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>

<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>

<properties>
<!-- TODO until bc4c132 in 1.545, or below 1.536 -->
<concurrency>1</concurrency>
<jenkins.version>1.580.1</jenkins.version>
<java.level>6</java.level>
<findbugs.failOnError>false</findbugs.failOnError>
</properties>
</project>
@@ -1,3 +1,4 @@
<?jelly escape-by-default='true'?>
<div>
Allows an administrator to specify sites trusted to make JSONP or primitive-XPath REST API requests.
</div>
@@ -25,7 +25,7 @@
package org.jenkinsci.plugins.secure_requester_whitelist;

import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
import com.gargoylesoftware.htmlunit.WebRequestSettings;
import com.gargoylesoftware.htmlunit.WebRequest;
import java.net.URL;
import net.sf.json.JSONObject;
import static org.junit.Assert.*;
@@ -39,10 +39,13 @@
@Rule public JenkinsRule r = new JenkinsRule();

@PresetData(PresetData.DataSet.NO_ANONYMOUS_READACCESS)
@Test public void authorizing() throws Exception {
@Test
public void authorizing() throws Exception {
assertJSONP(null, 403);
assertJSONP("http://apache.org/", 403);

Whitelist.get().configure(null, new JSONObject().accumulate("allowNoReferer", true).accumulate("domains", "apache.org jenkins-ci.org"));

assertJSONP(null, 200);
assertJSONP("http://apache.org/", 200);
assertJSONP("http://jenkins-ci.org/", 200);
@@ -51,13 +54,15 @@
assertJSONP("huh?", 403);
}

private void assertJSONP(String referer, int expectedStatusCode) throws Exception {
JenkinsRule.WebClient wc = r.createWebClient();
private void assertJSONP(final String referer, final int expectedStatusCode) throws Exception {
final JenkinsRule.WebClient wc = r.createWebClient();
wc.login("alice");
WebRequestSettings req = new WebRequestSettings(new URL(wc.getContextPath() + "api/json?jsonp"));

final WebRequest req = new WebRequest(new URL(wc.getContextPath() + "api/json?jsonp"));
if (referer != null) {
req.setAdditionalHeader("Referer", referer);
}

try {
wc.getPage(req);
assertEquals(expectedStatusCode, 200);

0 comments on commit 5cab126

Please sign in to comment.
You can’t perform that action at this time.