From a091493c7addbb474a86bb411095994acfaf5ae6 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 10 Mar 2011 17:42:06 -0800 Subject: [PATCH] - md is not concurrency safe, so the whole thing needs to be synchronized or we need a pool, like ThreadLocal - There's a convenience method that creates hex string --- .../hudson/security/csrf/DefaultCrumbIssuer.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java b/core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java index fe11d34839..45c34facfb 100644 --- a/core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java +++ b/core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java @@ -11,6 +11,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import hudson.Extension; +import hudson.Util; import hudson.model.Hudson; import hudson.model.ModelObject; @@ -64,7 +65,7 @@ public class DefaultCrumbIssuer extends CrumbIssuer { * {@inheritDoc} */ @Override - protected String issueCrumb(ServletRequest request, String salt) { + protected synchronized String issueCrumb(ServletRequest request, String salt) { if (request instanceof HttpServletRequest) { if (md != null) { HttpServletRequest req = (HttpServletRequest) request; @@ -79,17 +80,7 @@ public class DefaultCrumbIssuer extends CrumbIssuer { } md.update(buffer.toString().getBytes()); - byte[] crumbBytes = md.digest(salt.getBytes()); - - StringBuilder hexString = new StringBuilder(); - for (int i = 0; i < crumbBytes.length; i++) { - String hex = Integer.toHexString(0xFF & crumbBytes[i]); - if (hex.length() == 1) { - hexString.append('0'); - } - hexString.append(hex); - } - return hexString.toString(); + return Util.toHexString(md.digest(salt.getBytes())); } } return null;