This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 546c001e3c Add escaping for context path and current/parent dir names.
546c001e3c is described below
commit 546c001e3ccfbe6e0c3e9354090d52d7a7889c1b
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Jul 20 09:51:02 2026 +0100
Add escaping for context path and current/parent dir names.
Use XML escaping for XML content
---
java/org/apache/catalina/servlets/DefaultServlet.java | 15 ++++++++-------
webapps/docs/changelog.xml | 5 +++++
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 3ec9fa0cc3..831c62a440 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1776,10 +1776,10 @@ public class DefaultServlet extends HttpServlet {
sb.append("<?xml version=\"1.0\"?>");
sb.append("<listing ");
sb.append(" contextPath='");
- sb.append(contextPath);
+ sb.append(Escape.xml(contextPath));
sb.append('\'');
sb.append(" directory='");
- sb.append(resource.getName());
+ sb.append(Escape.xml(resource.getName()));
sb.append("' ");
sb.append(" hasParent='").append(!resource.getName().equals("/"));
sb.append("'>");
@@ -1810,7 +1810,7 @@ public class DefaultServlet extends HttpServlet {
sb.append("<entry");
sb.append(" type='").append(childResource.isDirectory() ? "dir" :
"file").append('\'');
- sb.append(" urlPath='").append(rewrittenContextPath)
+ sb.append(" urlPath='").append(Escape.xml(rewrittenContextPath))
.append(Escape.xml(rewriteUrl(directoryWebappPath +
entry)))
.append(childResource.isDirectory() ? "/" :
"").append('\'');
if (childResource.isFile()) {
@@ -1820,7 +1820,7 @@ public class DefaultServlet extends HttpServlet {
sb.append("
longDate='").append(childResource.getLastModified()).append('\'');
sb.append('>');
- sb.append(Escape.htmlElementContent(entry));
+ sb.append(Escape.xml(entry));
if (childResource.isDirectory()) {
sb.append('/');
}
@@ -1928,6 +1928,7 @@ public class DefaultServlet extends HttpServlet {
}
String directoryWebappPath = resource.getWebappPath();
+ String escapedDirectoryWebappPath =
Escape.htmlElementContent(directoryWebappPath);
WebResource[] entries = resources.listResources(directoryWebappPath);
// rewriteUrl(contextPath) is expensive. cache result for later reuse
@@ -1938,7 +1939,7 @@ public class DefaultServlet extends HttpServlet {
sb.append("<html
lang=\"").append(sm.getLocale().getLanguage()).append("\">\r\n");
sb.append("<head>\r\n");
sb.append("<title>");
- sb.append(sm.getString("defaultServlet.directory.title",
directoryWebappPath));
+ sb.append(sm.getString("defaultServlet.directory.title",
escapedDirectoryWebappPath));
sb.append("</title>\r\n");
sb.append("<style>");
sb.append(org.apache.catalina.util.TomcatCSS.TOMCAT_CSS);
@@ -1946,7 +1947,7 @@ public class DefaultServlet extends HttpServlet {
sb.append("</head>\r\n");
sb.append("<body>\r\n");
sb.append("<h1>");
- sb.append(sm.getString("defaultServlet.directory.title",
directoryWebappPath));
+ sb.append(sm.getString("defaultServlet.directory.title",
escapedDirectoryWebappPath));
// Render the link to our parent (if required)
String parentDirectory = directoryWebappPath;
@@ -1967,7 +1968,7 @@ public class DefaultServlet extends HttpServlet {
}
sb.append("\">");
sb.append("<b>");
- sb.append(sm.getString("defaultServlet.directory.parent", parent));
+ sb.append(sm.getString("defaultServlet.directory.parent",
Escape.htmlElementContent(parent)));
sb.append("</b>");
sb.append("</a>");
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0e41f13ec6..290e39e9e9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -143,6 +143,11 @@
<code>qsd</code> flag should always discard the original query string
when rewriting. (remm)
</fix>
+ <fix>
+ Add appropriate escaping for context path, current directory name and
+ parent directory name for directory listings produced by the default
+ servlet. Ensure XML escaping is used with XML output. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
