From 3eb1a16f647aace8de87802cd9dc51fbbcc55bc3 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 10 Mar 2011 18:17:13 -0800 Subject: [PATCH] Stapler should delegate to us for crumb generation --- core/src/main/java/hudson/model/Hudson.java | 5 ++++ .../hudson/security/csrf/CrumbIssuer.java | 28 +++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java index d952feef8f..cff9468310 100644 --- a/core/src/main/java/hudson/model/Hudson.java +++ b/core/src/main/java/hudson/model/Hudson.java @@ -2612,6 +2612,11 @@ public class Hudson extends Node implements ItemGroup, StaplerProx } } + /** + * Gets the {@link CrumbIssuer} currently in use. + * + * @return null if none is in use. + */ public CrumbIssuer getCrumbIssuer() { return crumbIssuer; } diff --git a/core/src/main/java/hudson/security/csrf/CrumbIssuer.java b/core/src/main/java/hudson/security/csrf/CrumbIssuer.java index fce5b3ce74..b56553ba26 100644 --- a/core/src/main/java/hudson/security/csrf/CrumbIssuer.java +++ b/core/src/main/java/hudson/security/csrf/CrumbIssuer.java @@ -7,7 +7,10 @@ package hudson.security.csrf; import javax.servlet.ServletRequest; +import hudson.init.Initializer; import org.kohsuke.stapler.Stapler; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.WebApp; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; @@ -152,4 +155,29 @@ public abstract class CrumbIssuer implements Describable, Extension public Api getApi() { return new Api(this); } + + /** + * Sets up Stapler to use our crumb issuer. + */ + @Initializer + public static void initStaplerCrumbIssuer() { + WebApp.get(Hudson.getInstance().servletContext).setCrumbIssuer(new org.kohsuke.stapler.CrumbIssuer() { + @Override + public String issueCrumb(StaplerRequest request) { + CrumbIssuer ci = Hudson.getInstance().getCrumbIssuer(); + return ci!=null ? ci.getCrumb(request) : DEFAULT.issueCrumb(request); + } + + @Override + public void validateCrumb(StaplerRequest request, String submittedCrumb) { + CrumbIssuer ci = Hudson.getInstance().getCrumbIssuer(); + if (ci==null) { + DEFAULT.validateCrumb(request,submittedCrumb); + } else { + if (!ci.validateCrumb(request, ci.getDescriptor().getCrumbSalt(), submittedCrumb)) + throw new SecurityException("Crumb didn't match"); + } + } + }); + } }