Author: markt
Date: Tue Aug 16 10:03:00 2011
New Revision: 1158176
URL: http://svn.apache.org/viewvc?rev=1158176&view=rev
Log:
nOnce -> nonce for consistency
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java?rev=1158176&r1=1158175&r2=1158176&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
Tue Aug 16 10:03:00 2011
@@ -280,7 +280,7 @@ public class DigestAuthenticator extends
// Send an "unauthorized" response and an appropriate challenge
- // Next, generate a nOnce token (that is a token which is supposed
+ // Next, generate a nonce token (that is a token which is supposed
// to be unique).
String nonce = generateNonce(request);
@@ -395,7 +395,7 @@ public class DigestAuthenticator extends
* WWW-Authenticate = "WWW-Authenticate" ":" "Digest"
* digest-challenge
*
- * digest-challenge = 1#( realm | [ domain ] | nOnce |
+ * digest-challenge = 1#( realm | [ domain ] | nonce |
* [ digest-opaque ] |[ stale ] | [ algorithm ] )
*
* realm = "realm" "=" realm-value
@@ -412,12 +412,12 @@ public class DigestAuthenticator extends
* @param response HTTP Servlet response
* @param config Login configuration describing how authentication
* should be performed
- * @param nOnce nonce token
+ * @param nonce nonce token
*/
protected void setAuthenticateHeader(HttpServletRequest request,
HttpServletResponse response,
LoginConfig config,
- String nOnce,
+ String nonce,
boolean isNonceStale) {
// Get the realm name
@@ -428,11 +428,11 @@ public class DigestAuthenticator extends
String authenticateHeader;
if (isNonceStale) {
authenticateHeader = "Digest realm=\"" + realmName + "\", " +
- "qop=\"" + QOP + "\", nonce=\"" + nOnce + "\", " + "opaque=\"" +
+ "qop=\"" + QOP + "\", nonce=\"" + nonce + "\", " + "opaque=\"" +
getOpaque() + "\", stale=true";
} else {
authenticateHeader = "Digest realm=\"" + realmName + "\", " +
- "qop=\"" + QOP + "\", nonce=\"" + nOnce + "\", " + "opaque=\"" +
+ "qop=\"" + QOP + "\", nonce=\"" + nonce + "\", " + "opaque=\"" +
getOpaque() + "\"";
}
@@ -603,20 +603,20 @@ public class DigestAuthenticator extends
if (i < 0 || (i + 1) == nonce.length()) {
return false;
}
- long nOnceTime;
+ long nonceTime;
try {
- nOnceTime = Long.parseLong(nonce.substring(0, i));
+ nonceTime = Long.parseLong(nonce.substring(0, i));
} catch (NumberFormatException nfe) {
return false;
}
String md5clientIpTimeKey = nonce.substring(i + 1);
long currentTime = System.currentTimeMillis();
- if ((currentTime - nOnceTime) > nonceValidity) {
+ if ((currentTime - nonceTime) > nonceValidity) {
nonceStale = true;
return false;
}
String serverIpTimeKey =
- request.getRemoteAddr() + ":" + nOnceTime + ":" + key;
+ request.getRemoteAddr() + ":" + nonceTime + ":" + key;
byte[] buffer = null;
synchronized (md5Helper) {
buffer = md5Helper.digest(
Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1158176&r1=1158175&r2=1158176&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Tue Aug 16
10:03:00 2011
@@ -359,7 +359,7 @@ public abstract class RealmBase extends
*
* @param username Username of the Principal to look up
* @param clientDigest Digest which has been submitted by the client
- * @param nOnce Unique (or supposedly unique) token which has been used
+ * @param nonce Unique (or supposedly unique) token which has been used
* for this request
* @param realm Realm name
* @param md5a2 Second MD5 digest used to calculate the digest :
@@ -367,7 +367,7 @@ public abstract class RealmBase extends
*/
@Override
public Principal authenticate(String username, String clientDigest,
- String nOnce, String nc, String cnonce,
+ String nonce, String nc, String cnonce,
String qop, String realm,
String md5a2) {
@@ -376,9 +376,9 @@ public abstract class RealmBase extends
return null;
String serverDigestValue;
if (qop == null) {
- serverDigestValue = md5a1 + ":" + nOnce + ":" + md5a2;
+ serverDigestValue = md5a1 + ":" + nonce + ":" + md5a2;
} else {
- serverDigestValue = md5a1 + ":" + nOnce + ":" + nc + ":" +
+ serverDigestValue = md5a1 + ":" + nonce + ":" + nc + ":" +
cnonce + ":" + qop + ":" + md5a2;
}
@@ -398,7 +398,7 @@ public abstract class RealmBase extends
if (log.isDebugEnabled()) {
log.debug("Digest : " + clientDigest + " Username:" + username
- + " ClientSigest:" + clientDigest + " nOnce:" + nOnce
+ + " ClientSigest:" + clientDigest + " nonce:" + nonce
+ " nc:" + nc + " cnonce:" + cnonce + " qop:" + qop
+ " realm:" + realm + "md5a2:" + md5a2
+ " Server digest:" + serverDigest);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
