Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java
- Original Message - From: [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Thursday, July 29, 2004 12:19 PM Subject: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java markt 2004/07/29 12:19:43 Modified:catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java Log: Fix bug 28178. Quote user and group names to handle situation with certs where names may conain '='. As far as I can tell, this doesn't break the admin app for users but I will need to do some more testing once the 5.5 changes are completed. Revision ChangesPath 1.29 +5 -5 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanU tils.java Index: MBeanUtils.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbe ans/MBeanUtils.java,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- MBeanUtils.java 13 Jul 2004 09:38:21 - 1.28 +++ MBeanUtils.java 29 Jul 2004 19:19:43 - 1.29 @@ -1068,8 +1068,8 @@ ObjectName name = null; name = new ObjectName(domain + :type=Group,groupname= + - group.getGroupname() + ,database= + - group.getUserDatabase().getId()); + ObjectName.quote(group.getGroupname()) + + ,database= + group.getUserDatabase().getId()); return (name); } @@ -1396,8 +1396,8 @@ ObjectName name = null; name = new ObjectName(domain + :type=User,username= + - user.getUsername() + ,database= + - user.getUserDatabase().getId()); + ObjectName.quote(user.getUsername()) + + ,database= + user.getUserDatabase().getId()); return (name); } The rest of the code is using MBeanUtils.encodeStr() for this. For consistancy, you might want to use change that to do ON.quote, or use encodeStr here. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] This message is intended only for the use of the person(s) listed above as the intended recipient(s), and may contain information that is PRIVILEGED and CONFIDENTIAL. If you are not an intended recipient, you may not read, copy, or distribute this message or any attachment. If you received this communication in error, please notify us immediately by e-mail and then delete all copies of this message and any attachments. In addition you should be aware that ordinary (unencrypted) e-mail sent through the Internet is not secure. Do not send confidential or sensitive information, such as social security numbers, account numbers, personal identification numbers and passwords, to us via ordinary (unencrypted) e-mail. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java
Ah. Hadn't spotted that. I'll have a look. Thanks for the heads up. Mark -Original Message- From: Bill Barker [mailto:[EMAIL PROTECTED] Sent: Thursday, July 29, 2004 9:08 PM To: Tomcat Developers List Subject: Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina /mbeans MBeanUtils.java - Original Message - From: [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Thursday, July 29, 2004 12:19 PM Subject: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java markt 2004/07/29 12:19:43 Modified:catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java Log: Fix bug 28178. Quote user and group names to handle situation with certs where names may conain '='. As far as I can tell, this doesn't break the admin app for users but I will need to do some more testing once the 5.5 changes are completed. Revision ChangesPath 1.29 +5 -5 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina /mbeans/MBeanU tils.java Index: MBeanUtils.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apach e/catalina/mbe ans/MBeanUtils.java,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- MBeanUtils.java 13 Jul 2004 09:38:21 - 1.28 +++ MBeanUtils.java 29 Jul 2004 19:19:43 - 1.29 @@ -1068,8 +1068,8 @@ ObjectName name = null; name = new ObjectName(domain + :type=Group,groupname= + - group.getGroupname() + ,database= + - group.getUserDatabase().getId()); + ObjectName.quote(group.getGroupname()) + + ,database= + group.getUserDatabase().getId()); return (name); } @@ -1396,8 +1396,8 @@ ObjectName name = null; name = new ObjectName(domain + :type=User,username= + - user.getUsername() + ,database= + - user.getUserDatabase().getId()); + ObjectName.quote(user.getUsername()) + + ,database= + user.getUserDatabase().getId()); return (name); } The rest of the code is using MBeanUtils.encodeStr() for this. For consistancy, you might want to use change that to do ON.quote, or use encodeStr here. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java
- Original Message - From: [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Friday, November 22, 2002 2:36 PM Subject: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java amyroh 2002/11/22 14:36:52 Modified:catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java Log: Port Bill's change. Thanks Amy. I'd have gotten to it, but I don't have j-t-catalina checked out here. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
