yoavs 2004/11/19 07:01:34
Modified: catalina/src/share/org/apache/catalina/realm Tag: TOMCAT_5_0
JNDIRealm.java
webapps/docs Tag: TOMCAT_5_0 changelog.xml
Log:
Bugzilla 32269: JNDIRealm fails with InvalidNameException to authenticate
users if LDAP distinguished name (DN) contains slash or double quote
character(s)
Revision Changes Path
No revision
No revision
1.12.2.2 +6 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
Index: JNDIRealm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -r1.12.2.1 -r1.12.2.2
--- JNDIRealm.java 10 Oct 2004 20:42:32 -0000 1.12.2.1
+++ JNDIRealm.java 19 Nov 2004 15:01:34 -0000 1.12.2.2
@@ -28,6 +28,7 @@
import javax.naming.Context;
import javax.naming.CommunicationException;
+import javax.naming.CompositeName;
import javax.naming.InvalidNameException;
import javax.naming.NameNotFoundException;
import javax.naming.NamingEnumeration;
@@ -1095,7 +1096,10 @@
NameParser parser = context.getNameParser("");
Name contextName = parser.parse(context.getNameInNamespace());
Name baseName = parser.parse(userBase);
- Name entryName = parser.parse(result.getName());
+
+ // Bugzilla 32269
+ Name entryName = parser.parse(new
CompositeName(result.getName()).get(0));
+
Name name = contextName.addAll(baseName);
name = name.addAll(entryName);
String dn = name.toString();
No revision
No revision
1.70.2.78 +4 -1 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.70.2.77
retrieving revision 1.70.2.78
diff -u -r1.70.2.77 -r1.70.2.78
--- changelog.xml 19 Nov 2004 14:51:17 -0000 1.70.2.77
+++ changelog.xml 19 Nov 2004 15:01:34 -0000 1.70.2.78
@@ -47,7 +47,7 @@
<bug>31592</bug>: Allow specification of digest encoding for realms.
(yoavs)
</fix>
<update>
- Added and updated Connector documentation: <bug>31945</bug>. (yoavs)
+ <bug>31945</bug>: Added and updated Connector documentation. (yoavs)
</update>
<update>
<bug>31739</bug>: Minor documentation corrections for realm-howto
and AJP docs. (yoavs)
@@ -72,6 +72,9 @@
</fix>
<fix>
<bug>32023</bug>: CGIServlet fails to handle post message with
multipart/form data. (yoavs)
+ </fix>
+ <fix>
+ <bug>32269</bug>: JNDIRealm fails with InvalidNameException to
authenticate users if LDAP distinguished name (DN) contains slash or double
quote character(s). (yoavs)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]