billbarker 2003/09/04 21:24:47
Modified: catalina/src/share/org/apache/catalina/users MemoryUser.java
Log:
XML-escape the values when writing out the tomcat-users.xml file.
Expanded on a patch
Submitted By: Mark Thomas [EMAIL PROTECTED]
Revision Changes Path
1.6 +10 -10
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/users/MemoryUser.java
Index: MemoryUser.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/users/MemoryUser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MemoryUser.java 10 Feb 2002 08:06:20 -0000 1.5
+++ MemoryUser.java 5 Sep 2003 04:24:47 -0000 1.6
@@ -70,7 +70,7 @@
import org.apache.catalina.Role;
import org.apache.catalina.User;
import org.apache.catalina.UserDatabase;
-
+import org.apache.catalina.util.RequestUtil;
/**
* <p>Concrete implementation of [EMAIL PROTECTED] User} for the
@@ -294,13 +294,13 @@
public String toString() {
StringBuffer sb = new StringBuffer("<user username=\"");
- sb.append(username);
+ sb.append(RequestUtil.filter(username));
sb.append("\" password=\"");
- sb.append(password);
+ sb.append(RequestUtil.filter(password));
sb.append("\"");
if (fullName != null) {
sb.append(" fullName=\"");
- sb.append(fullName);
+ sb.append(RequestUtil.filter(fullName));
sb.append("\"");
}
synchronized (groups) {
@@ -313,7 +313,7 @@
sb.append(',');
}
n++;
- sb.append(((Group) values.next()).getGroupname());
+ sb.append(RequestUtil.filter(((Group)
values.next()).getGroupname()));
}
sb.append("\"");
}
@@ -328,7 +328,7 @@
sb.append(',');
}
n++;
- sb.append(((Role) values.next()).getRolename());
+ sb.append(RequestUtil.filter(((Role)
values.next()).getRolename()));
}
sb.append("\"");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
