Author: kkolinko
Date: Fri Oct 29 00:12:59 2010
New Revision: 1028559
URL: http://svn.apache.org/viewvc?rev=1028559&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49965
Use correct i18n resources for StringManager in JAASRealm
Fixed using the "alternative" patch.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1028559&r1=1028558&r2=1028559&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Oct 29 00:12:59 2010
@@ -213,22 +213,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt
-0: kkolinko: see Re:r1005192 thread on dev@
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49965
- Use correct i18n resources for StringManager in JAASRealm
- http://people.apache.org/~markt/patches/2010-10-07-bug49965-tc6.patch
- (Port of http://svn.apache.org/viewvc?view=revision&revision=920820)
- +1: markt
- -1:
- -0: kkolinko: It is amazing that the patch just removes N lines and fixes
- the issue, but I think that removing static protected fields is not
- good for binary compatibility between releases. Alternative patch
- proposed below.
-
- Alternative patch:
- http://people.apache.org/~kkolinko/patches/2010-10-13_tc6_bug49965.patch
- +1: kkolinko, kfujino, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50072
NIO connector can mis-read request line if not sent in a single packet
https://issues.apache.org/bugzilla/attachment.cgi?id=26173&action=edit
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java?rev=1028559&r1=1028558&r2=1028559&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
Fri Oct 29 00:12:59 2010
@@ -39,7 +39,6 @@ import javax.security.auth.spi.LoginModu
import org.apache.catalina.Context;
import org.apache.catalina.Realm;
-import org.apache.catalina.authenticator.Constants;
import org.apache.catalina.connector.Request;
import org.apache.catalina.deploy.SecurityConstraint;
import org.apache.catalina.util.RequestUtil;
@@ -355,10 +354,10 @@ public class JAASMemoryLoginModule exten
if (authMethod == null) {
// BASIC or FORM
principal = super.authenticate(username, password);
- } else if (authMethod.equals(Constants.DIGEST_METHOD)) {
+ } else if
(authMethod.equals(org.apache.catalina.authenticator.Constants.DIGEST_METHOD)) {
principal = super.authenticate(username, password, nonce, nc,
cnonce, qop, realmName, md5a2);
- } else if (authMethod.equals(Constants.CERT_METHOD)) {
+ } else if
(authMethod.equals(org.apache.catalina.authenticator.Constants.CERT_METHOD)) {
principal = super.getPrincipal(username);
} else {
throw new LoginException("Unknown authentication method");
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java?rev=1028559&r1=1028558&r2=1028559&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java Fri Oct
29 00:12:59 2010
@@ -34,7 +34,6 @@ import javax.security.auth.login.LoginEx
import org.apache.catalina.Container;
import org.apache.catalina.LifecycleException;
-import org.apache.catalina.authenticator.Constants;
import org.apache.catalina.util.StringManager;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -357,7 +356,7 @@ public class JAASRealm
return authenticate(username,
new JAASCallbackHandler(this, username, clientDigest, nonce,
nc, cnonce, qop, realmName, md5a2,
- Constants.DIGEST_METHOD));
+
org.apache.catalina.authenticator.Constants.DIGEST_METHOD));
}
@@ -483,7 +482,8 @@ public class JAASRealm
return authenticate(username,
new JAASCallbackHandler(this, username, null, null, null, null,
- null, null, null, Constants.CERT_METHOD));
+ null, null, null,
+
org.apache.catalina.authenticator.Constants.CERT_METHOD));
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1028559&r1=1028558&r2=1028559&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Oct 29 00:12:59 2010
@@ -123,6 +123,10 @@
no StoreConfig implementation present. (markt)
</fix>
<fix>
+ <bug>49965</bug>: Use correct i18n resources for StringManager in
+ JAASRealm. (kkolinko)
+ </fix>
+ <fix>
<bug>49987</bug>: Fix potential data race in the population of the
Servlet Context initialisation parameters. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
