You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2026/05/22 06:41:05 UTC
(tomcat) branch main updated: Improve escaping of XML in the manager servlet
This is an automated email from the ASF dual-hosted git repository.
rmaucher pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new d88e89b9da Improve escaping of XML in the manager servlet
d88e89b9da is described below
commit d88e89b9da70bdce630ab01bfdf02421b734ec1a
Author: remm <re...@apache.org>
AuthorDate: Fri May 22 08:40:55 2026 +0200
Improve escaping of XML in the manager servlet
---
java/org/apache/catalina/manager/StatusTransformer.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/manager/StatusTransformer.java b/java/org/apache/catalina/manager/StatusTransformer.java
index 13072b6453..29178577c3 100644
--- a/java/org/apache/catalina/manager/StatusTransformer.java
+++ b/java/org/apache/catalina/manager/StatusTransformer.java
@@ -656,24 +656,24 @@ public class StatusTransformer {
}
writer.write("\"");
writer.write(" remoteAddr=\"" +
- Escape.htmlElementContent(mBeanServer.getAttribute(pName, "remoteAddr")) + "\"");
+ Escape.xml(String.valueOf(mBeanServer.getAttribute(pName, "remoteAddr"))) + "\"");
writer.write(" virtualHost=\"" +
- Escape.htmlElementContent(mBeanServer.getAttribute(pName, "virtualHost")) + "\"");
+ Escape.xml(String.valueOf(mBeanServer.getAttribute(pName, "virtualHost"))) + "\"");
if (showRequest) {
writer.write(
- " method=\"" + Escape.htmlElementContent(mBeanServer.getAttribute(pName, "method")) + "\"");
+ " method=\"" + Escape.xml(String.valueOf(mBeanServer.getAttribute(pName, "method"))) + "\"");
writer.write(" currentUri=\"" +
- Escape.htmlElementContent(mBeanServer.getAttribute(pName, "currentUri")) + "\"");
+ Escape.xml(String.valueOf(mBeanServer.getAttribute(pName, "currentUri"))) + "\"");
String queryString = (String) mBeanServer.getAttribute(pName, "currentQueryString");
if (queryString != null && !queryString.isEmpty()) {
- writer.write(" currentQueryString=\"" + Escape.htmlElementContent(queryString) + "\"");
+ writer.write(" currentQueryString=\"" + Escape.xml(queryString) + "\"");
} else {
writer.write(" currentQueryString=\"?\"");
}
writer.write(" protocol=\"" +
- Escape.htmlElementContent(mBeanServer.getAttribute(pName, "protocol")) + "\"");
+ Escape.xml(String.valueOf(mBeanServer.getAttribute(pName, "protocol"))) + "\"");
} else {
writer.write(" method=\"?\"");
writer.write(" currentUri=\"?\"");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org