Author: markt
Date: Sun Jul 22 22:23:22 2012
New Revision: 1364451
URL: http://svn.apache.org/viewvc?rev=1364451&view=rev
Log:
Make utility method static and deprecate/remove unused instances
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/MD5Encoder.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1364448
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java?rev=1364451&r1=1364450&r2=1364451&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
Sun Jul 22 22:23:22 2012
@@ -59,7 +59,10 @@ public class DigestAuthenticator extends
/**
* The MD5 helper object for this class.
+ *
+ * @deprecated Unused - will be removed in Tomcat 8.0.x
*/
+ @Deprecated
protected static final MD5Encoder md5Encoder = new MD5Encoder();
@@ -383,7 +386,7 @@ public class DigestAuthenticator extends
ipTimeKey.getBytes(Charset.defaultCharset()));
}
- return currentTime + ":" + md5Encoder.encode(buffer);
+ return currentTime + ":" + MD5Encoder.encode(buffer);
}
@@ -638,7 +641,7 @@ public class DigestAuthenticator extends
buffer = md5Helper.digest(
serverIpTimeKey.getBytes(Charset.defaultCharset()));
}
- String md5ServerIpTimeKey = md5Encoder.encode(buffer);
+ String md5ServerIpTimeKey = MD5Encoder.encode(buffer);
if (!md5ServerIpTimeKey.equals(md5clientIpTimeKey)) {
return false;
}
@@ -702,7 +705,7 @@ public class DigestAuthenticator extends
synchronized (md5Helper) {
buffer =
md5Helper.digest(a2.getBytes(Charset.defaultCharset()));
}
- String md5a2 = md5Encoder.encode(buffer);
+ String md5a2 = MD5Encoder.encode(buffer);
return realm.authenticate(userName, response, nonce, nc, cnonce,
qop, realmName, md5a2);
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1364451&r1=1364450&r2=1364451&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java Sun Jul
22 22:23:22 2012
@@ -119,7 +119,10 @@ public abstract class RealmBase extends
/**
* The MD5 helper object for this class.
+ *
+ * @deprecated Unused - will be removed in Tomcat 8.0.x
*/
+ @Deprecated
protected static final MD5Encoder md5Encoder = new MD5Encoder();
@@ -426,7 +429,7 @@ public abstract class RealmBase extends
String serverDigest = null;
// Bugzilla 32137
synchronized(md5Helper) {
- serverDigest = md5Encoder.encode(md5Helper.digest(valueBytes));
+ serverDigest = MD5Encoder.encode(md5Helper.digest(valueBytes));
}
if (log.isDebugEnabled()) {
@@ -1227,7 +1230,7 @@ public abstract class RealmBase extends
digest = md5Helper.digest(valueBytes);
}
- return md5Encoder.encode(digest);
+ return MD5Encoder.encode(digest);
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1364451&r1=1364450&r2=1364451&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
Sun Jul 22 22:23:22 2012
@@ -211,7 +211,10 @@ public class WebdavServlet
/**
* The MD5 helper object for this class.
+ *
+ * @deprecated Unused - will be removed in Tomcat 8.0.x
*/
+ @Deprecated
protected static final MD5Encoder md5Encoder = new MD5Encoder();
@@ -1152,7 +1155,7 @@ public class WebdavServlet
+ lock.depth + "-" + lock.owner + "-" + lock.tokens + "-"
+ lock.expiresAt + "-" + System.currentTimeMillis() + "-"
+ secret;
- String lockToken = md5Encoder.encode(md5Helper.digest(
+ String lockToken = MD5Encoder.encode(md5Helper.digest(
lockTokenStr.getBytes(Charset.defaultCharset())));
if ( (exists) && (object instanceof DirContext) &&
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/MD5Encoder.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/MD5Encoder.java?rev=1364451&r1=1364450&r2=1364451&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/MD5Encoder.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/MD5Encoder.java Sun Jul
22 22:23:22 2012
@@ -33,6 +33,14 @@ package org.apache.catalina.util;
public final class MD5Encoder {
+ /**
+ * @deprecated Will be made private in Tomcat 8.0.x
+ */
+ @Deprecated
+ public MD5Encoder() {
+ // NOOP
+ }
+
// ----------------------------------------------------- Instance Variables
@@ -50,7 +58,7 @@ public final class MD5Encoder {
* @param binaryData Array containing the digest
* @return Encoded MD5, or null if encoding failed
*/
- public String encode( byte[] binaryData ) {
+ public static String encode( byte[] binaryData ) {
if (binaryData.length != 16)
return null;
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java?rev=1364451&r1=1364450&r2=1364451&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
Sun Jul 22 22:23:22 2012
@@ -364,9 +364,8 @@ public class TestDigestAuthenticator ext
private static String digest(String input) throws NoSuchAlgorithmException
{
// This is slow but should be OK as this is only a test
MessageDigest md5 = MessageDigest.getInstance("MD5");
- MD5Encoder encoder = new MD5Encoder();
md5.update(input.getBytes());
- return encoder.encode(md5.digest());
+ return MD5Encoder.encode(md5.digest());
}
}
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java?rev=1364451&r1=1364450&r2=1364451&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java
Sun Jul 22 22:23:22 2012
@@ -472,10 +472,9 @@ public class TestSSOnonLoginAndDigestAut
private static String digest(String input) throws NoSuchAlgorithmException
{
// This is slow but should be OK as this is only a test
MessageDigest md5 = MessageDigest.getInstance("MD5");
- MD5Encoder encoder = new MD5Encoder();
md5.update(input.getBytes());
- return encoder.encode(md5.digest());
+ return MD5Encoder.encode(md5.digest());
}
/*
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java?rev=1364451&r1=1364450&r2=1364451&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
Sun Jul 22 22:23:22 2012
@@ -178,16 +178,15 @@ public class TesterDigestAuthenticatorPe
String a2 = METHOD + ":" + CONTEXT_PATH + URI;
MessageDigest digester = MessageDigest.getInstance("MD5");
- MD5Encoder encoder = new MD5Encoder();
- String md5a1 = encoder.encode(digester.digest(a1.getBytes()));
- String md5a2 = encoder.encode(digester.digest(a2.getBytes()));
+ String md5a1 = MD5Encoder.encode(digester.digest(a1.getBytes()));
+ String md5a2 = MD5Encoder.encode(digester.digest(a2.getBytes()));
String response = md5a1 + ":" + nonce + ":" + ncString + ":" +
cnonce + ":" + QOP + ":" + md5a2;
String md5response =
- encoder.encode(digester.digest(response.getBytes()));
+ MD5Encoder.encode(digester.digest(response.getBytes()));
StringBuilder auth = new StringBuilder();
auth.append("Digest username=\"");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
