mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 21:42:27 +00:00
Merge in changes that implement the cross-site request forgery crumb feature.
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@18738 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
1 parent
fa48bd2252
commit
8c4e97d171
35 files changed
+951
-38
No files matched your search
@@ -54,6 +54,8 @@ import hudson.model.AbstractProject;
|
||||
import hudson.model.UpdateCenter.UpdateCenterConfiguration;
|
||||
import hudson.model.Node.Mode;
|
||||
import hudson.scm.SubversionSCM;
|
||||
import hudson.security.csrf.CrumbIssuer;
|
||||
import hudson.security.csrf.CrumbIssuerDescriptor;
|
||||
import hudson.slaves.CommandLauncher;
|
||||
import hudson.slaves.DumbSlave;
|
||||
import hudson.slaves.RetentionStrategy;
|
||||
@@ -98,6 +100,7 @@ import javax.servlet.ServletContextEvent;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
|
||||
import org.apache.commons.httpclient.NameValuePair;
|
||||
import org.apache.commons.io.FileUtils;
|
||||
import org.apache.commons.io.IOUtils;
|
||||
import org.apache.commons.beanutils.PropertyUtils;
|
||||
@@ -128,8 +131,10 @@ import org.xml.sax.SAXException;
|
||||
import com.gargoylesoftware.htmlunit.AjaxController;
|
||||
import com.gargoylesoftware.htmlunit.BrowserVersion;
|
||||
import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
|
||||
import com.gargoylesoftware.htmlunit.HttpMethod;
|
||||
import com.gargoylesoftware.htmlunit.Page;
|
||||
import com.gargoylesoftware.htmlunit.WebRequestSettings;
|
||||
import com.gargoylesoftware.htmlunit.html.DomNode;
|
||||
import com.gargoylesoftware.htmlunit.html.HtmlButton;
|
||||
import com.gargoylesoftware.htmlunit.html.HtmlForm;
|
||||
import com.gargoylesoftware.htmlunit.html.HtmlPage;
|
||||
@@ -199,6 +204,10 @@ public abstract class HudsonTestCase extends TestCase {
|
||||
|
||||
hudson = newHudson();
|
||||
hudson.setNoUsageStatistics(true); // collecting usage stats from tests are pointless.
|
||||
|
||||
hudson.setUseCrumbs(true);
|
||||
hudson.setCrumbIssuer(((CrumbIssuerDescriptor<CrumbIssuer>)Hudson.getInstance().getDescriptor(TestCrumbIssuer.class)).newInstance(null,null));
|
||||
|
||||
hudson.servletContext.setAttribute("app",hudson);
|
||||
hudson.servletContext.setAttribute("version","?");
|
||||
WebAppMain.installExpressionFactory(new ServletContextEvent(hudson.servletContext));
|
||||
@@ -918,6 +927,30 @@ public abstract class HudsonTestCase extends TestCase {
|
||||
public String getContextPath() {
|
||||
return "http://localhost:"+localPort+contextPath;
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a security crumb to the quest
|
||||
*/
|
||||
public WebRequestSettings addCrumb(WebRequestSettings req) {
|
||||
NameValuePair crumb[] = { new NameValuePair() };
|
||||
|
||||
crumb[0].setName(hudson.getCrumbIssuer().getDescriptor().getCrumbRequestField());
|
||||
crumb[0].setValue(hudson.getCrumbIssuer().getCrumb( null ));
|
||||
|
||||
req.setRequestParameters(Arrays.asList( crumb ));
|
||||
return req;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a URL with crumb parameters relative to {{@link #getContextPath()}
|
||||
*/
|
||||
public URL createCrumbedUrl(String relativePath) throws MalformedURLException {
|
||||
CrumbIssuer issuer = hudson.getCrumbIssuer();
|
||||
String crumbName = issuer.getDescriptor().getCrumbRequestField();
|
||||
String crumb = issuer.getCrumb(null);
|
||||
|
||||
return new URL(getContextPath()+relativePath+"?"+crumbName+"="+crumb);
|
||||
}
|
||||
}
|
||||
|
||||
// needs to keep reference, or it gets GC-ed.
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
/**
|
||||
* Copyright (c) 2008-2009 Yahoo! Inc.
|
||||
* All rights reserved.
|
||||
* The copyrights to the contents of this file are licensed under the MIT License (http://www.opensource.org/licenses/mit-license.php)
|
||||
*/
|
||||
package org.jvnet.hudson.test;
|
||||
|
||||
import javax.servlet.ServletRequest;
|
||||
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.kohsuke.stapler.StaplerRequest;
|
||||
|
||||
import hudson.Extension;
|
||||
import hudson.model.ModelObject;
|
||||
import hudson.security.csrf.CrumbIssuer;
|
||||
import hudson.security.csrf.CrumbIssuerDescriptor;
|
||||
|
||||
/**
|
||||
* A crumb issuer that issues a constant crumb value. Used for unit testing.
|
||||
* @author dty
|
||||
*/
|
||||
public class TestCrumbIssuer extends CrumbIssuer
|
||||
{
|
||||
@Override
|
||||
protected String issueCrumb( ServletRequest request, String salt )
|
||||
{
|
||||
return "test";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean validateCrumb( ServletRequest request, String salt, String crumb )
|
||||
{
|
||||
return "test".equals(crumb);
|
||||
}
|
||||
|
||||
@Extension
|
||||
public static final class DescriptorImpl extends CrumbIssuerDescriptor<TestCrumbIssuer> implements ModelObject {
|
||||
public DescriptorImpl()
|
||||
{
|
||||
super(null, null);
|
||||
load();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDisplayName() {
|
||||
return "Test Crumb";
|
||||
}
|
||||
|
||||
public TestCrumbIssuer newInstance(StaplerRequest req, JSONObject formData) throws FormException {
|
||||
return new TestCrumbIssuer();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user