mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 21:42:27 +00:00
Stapler should delegate to us for crumb generation
This commit is contained in:
1 parent
df8a0ad803
commit
3eb1a16f64
2 files changed
+33
No files matched your search
@@ -2612,6 +2612,11 @@ public class Hudson extends Node implements ItemGroup<TopLevelItem>, StaplerProx
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the {@link CrumbIssuer} currently in use.
|
||||
*
|
||||
* @return null if none is in use.
|
||||
*/
|
||||
public CrumbIssuer getCrumbIssuer() {
|
||||
return crumbIssuer;
|
||||
}
|
||||
|
||||
@@ -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<CrumbIssuer>, 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");
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user