This is an automated email from the ASF dual-hosted git repository.
markt 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 3bb22b3fb8 Use canonical context path.
3bb22b3fb8 is described below
commit 3bb22b3fb8ce299a6a9778adc11ff28fce7f6538
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Jul 4 19:10:30 2023 +0100
Use canonical context path.
This is more efficient and resolves a handful of Coverity Scan false
positives.
---
.../catalina/manager/HTMLManagerServlet.java | 26 +++++++++++-----------
.../catalina/manager/StatusManagerServlet.java | 14 ++++++------
.../manager/host/HTMLHostManagerServlet.java | 18 +++++++--------
3 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/java/org/apache/catalina/manager/HTMLManagerServlet.java
b/java/org/apache/catalina/manager/HTMLManagerServlet.java
index b6375ca22a..f990f462af 100644
--- a/java/org/apache/catalina/manager/HTMLManagerServlet.java
+++ b/java/org/apache/catalina/manager/HTMLManagerServlet.java
@@ -346,7 +346,7 @@ public final class HTMLManagerServlet extends
ManagerServlet {
PrintWriter writer = response.getWriter();
Object[] args = new Object[2];
- args[0] = request.getContextPath();
+ args[0] = getServletContext().getContextPath();
args[1] = smClient.getString("htmlManagerServlet.title");
// HTML Header Section
@@ -371,18 +371,18 @@ public final class HTMLManagerServlet extends
ManagerServlet {
// Manager Section
args = new Object[9];
args[0] = smClient.getString("htmlManagerServlet.manager");
- args[1] = response.encodeURL(request.getContextPath() + "/html/list");
+ args[1] = response.encodeURL(getServletContext().getContextPath() +
"/html/list");
args[2] = smClient.getString("htmlManagerServlet.list");
args[3] = // External link
- (request.getContextPath() + "/" +
+ (getServletContext().getContextPath() + "/" +
smClient.getString("htmlManagerServlet.helpHtmlManagerFile"));
args[4] = smClient.getString("htmlManagerServlet.helpHtmlManager");
args[5] = // External link
- (request.getContextPath() + "/" +
+ (getServletContext().getContextPath() + "/" +
smClient.getString("htmlManagerServlet.helpManagerFile"));
args[6] = smClient.getString("htmlManagerServlet.helpManager");
args[7] = response.encodeURL
- (request.getContextPath() + "/status");
+ (getServletContext().getContextPath() + "/status");
args[8] = smClient.getString("statusServlet.title");
writer.print(MessageFormat.format(Constants.MANAGER_SECTION, args));
@@ -473,7 +473,7 @@ public final class HTMLManagerServlet extends
ManagerServlet {
args[2] = Escape.htmlElementContent(ctxt.getDisplayName());
}
args[3] = Boolean.valueOf(ctxt.getState().isAvailable());
- args[4] =
Escape.htmlElementContent(response.encodeURL(request.getContextPath() +
+ args[4] =
Escape.htmlElementContent(response.encodeURL(getServletContext().getContextPath()
+
"/html/sessions?" + pathVersion));
Manager manager = ctxt.getManager();
if (manager instanceof DistributedManager &&
showProxySessions) {
@@ -539,7 +539,7 @@ public final class HTMLManagerServlet extends
ManagerServlet {
args = new Object[8];
args[0] = smClient.getString("htmlManagerServlet.deployTitle");
args[1] = smClient.getString("htmlManagerServlet.deployServer");
- args[2] = response.encodeURL(request.getContextPath() +
"/html/deploy");
+ args[2] = response.encodeURL(getServletContext().getContextPath() +
"/html/deploy");
args[3] = smClient.getString("htmlManagerServlet.deployPath");
args[4] = smClient.getString("htmlManagerServlet.deployVersion");
args[5] = smClient.getString("htmlManagerServlet.deployConfig");
@@ -549,7 +549,7 @@ public final class HTMLManagerServlet extends
ManagerServlet {
args = new Object[4];
args[0] = smClient.getString("htmlManagerServlet.deployUpload");
- args[1] = response.encodeURL(request.getContextPath() +
"/html/upload");
+ args[1] = response.encodeURL(getServletContext().getContextPath() +
"/html/upload");
args[2] = smClient.getString("htmlManagerServlet.deployUploadFile");
args[3] = smClient.getString("htmlManagerServlet.deployButton");
writer.print(MessageFormat.format(UPLOAD_SECTION, args));
@@ -558,7 +558,7 @@ public final class HTMLManagerServlet extends
ManagerServlet {
args = new Object[5];
args[0] = smClient.getString("htmlManagerServlet.configTitle");
args[1] =
smClient.getString("htmlManagerServlet.configSslReloadTitle");
- args[2] = response.encodeURL(request.getContextPath() +
"/html/sslReload");
+ args[2] = response.encodeURL(getServletContext().getContextPath() +
"/html/sslReload");
args[3] = smClient.getString("htmlManagerServlet.configSslHostName");
args[4] = smClient.getString("htmlManagerServlet.configReloadButton");
writer.print(MessageFormat.format(CONFIG_SECTION, args));
@@ -568,20 +568,20 @@ public final class HTMLManagerServlet extends
ManagerServlet {
args[0] = smClient.getString("htmlManagerServlet.diagnosticsTitle");
args[1] = smClient.getString("htmlManagerServlet.diagnosticsLeak");
args[2] = response.encodeURL(
- request.getContextPath() + "/html/findleaks");
+ getServletContext().getContextPath() + "/html/findleaks");
args[3] =
smClient.getString("htmlManagerServlet.diagnosticsLeakWarning");
args[4] =
smClient.getString("htmlManagerServlet.diagnosticsLeakButton");
args[5] = smClient.getString("htmlManagerServlet.diagnosticsSsl");
args[6] = response.encodeURL(
- request.getContextPath() + "/html/sslConnectorCiphers");
+ getServletContext().getContextPath() +
"/html/sslConnectorCiphers");
args[7] =
smClient.getString("htmlManagerServlet.diagnosticsSslConnectorCipherButton");
args[8] =
smClient.getString("htmlManagerServlet.diagnosticsSslConnectorCipherText");
args[9] = response.encodeURL(
- request.getContextPath() + "/html/sslConnectorCerts");
+ getServletContext().getContextPath() +
"/html/sslConnectorCerts");
args[10] =
smClient.getString("htmlManagerServlet.diagnosticsSslConnectorCertsButton");
args[11] =
smClient.getString("htmlManagerServlet.diagnosticsSslConnectorCertsText");
args[12] = response.encodeURL(
- request.getContextPath() + "/html/sslConnectorTrustedCerts");
+ getServletContext().getContextPath() +
"/html/sslConnectorTrustedCerts");
args[13] =
smClient.getString("htmlManagerServlet.diagnosticsSslConnectorTrustedCertsButton");
args[14] =
smClient.getString("htmlManagerServlet.diagnosticsSslConnectorTrustedCertsText");
writer.print(MessageFormat.format(DIAGNOSTICS_SECTION, args));
diff --git a/java/org/apache/catalina/manager/StatusManagerServlet.java
b/java/org/apache/catalina/manager/StatusManagerServlet.java
index d4ad1d0c01..f02eb35817 100644
--- a/java/org/apache/catalina/manager/StatusManagerServlet.java
+++ b/java/org/apache/catalina/manager/StatusManagerServlet.java
@@ -191,12 +191,12 @@ public class StatusManagerServlet extends HttpServlet
implements NotificationLis
}
// use StatusTransformer to output status
Object[] args = new Object[1];
- args[0] = request.getContextPath();
+ args[0] = getServletContext().getContextPath();
StatusTransformer.writeHeader(writer,args,mode);
// Body Header Section
args = new Object[2];
- args[0] = request.getContextPath();
+ args[0] = getServletContext().getContextPath();
if (completeStatus) {
args[1] = smClient.getString("statusServlet.complete");
} else {
@@ -208,23 +208,23 @@ public class StatusManagerServlet extends HttpServlet
implements NotificationLis
// Manager Section
args = new Object[9];
args[0] = smClient.getString("htmlManagerServlet.manager");
- args[1] = response.encodeURL(request.getContextPath() + "/html/list");
+ args[1] = response.encodeURL(getServletContext().getContextPath() +
"/html/list");
args[2] = smClient.getString("htmlManagerServlet.list");
args[3] = // External link
- (request.getContextPath() + "/" +
+ (getServletContext().getContextPath() + "/" +
smClient.getString("htmlManagerServlet.helpHtmlManagerFile"));
args[4] = smClient.getString("htmlManagerServlet.helpHtmlManager");
args[5] = // External link
- (request.getContextPath() + "/" +
+ (getServletContext().getContextPath() + "/" +
smClient.getString("htmlManagerServlet.helpManagerFile"));
args[6] = smClient.getString("htmlManagerServlet.helpManager");
if (completeStatus) {
args[7] = response.encodeURL
- (request.getContextPath() + "/status");
+ (getServletContext().getContextPath() + "/status");
args[8] = smClient.getString("statusServlet.title");
} else {
args[7] = response.encodeURL
- (request.getContextPath() + "/status/all");
+ (getServletContext().getContextPath() + "/status/all");
args[8] = smClient.getString("statusServlet.complete");
}
// use StatusTransformer to output status
diff --git a/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
b/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
index d6e188839a..06f31bbfc3 100644
--- a/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
+++ b/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
@@ -266,7 +266,7 @@ public final class HTMLHostManagerServlet extends
HostManagerServlet {
PrintWriter writer = response.getWriter();
Object[] args = new Object[2];
- args[0] = request.getContextPath();
+ args[0] = getServletContext().getContextPath();
args[1] = smClient.getString("htmlHostManagerServlet.title");
// HTML Header Section
@@ -291,14 +291,14 @@ public final class HTMLHostManagerServlet extends
HostManagerServlet {
// Manager Section
args = new Object[9];
args[0] = smClient.getString("htmlHostManagerServlet.manager");
- args[1] = response.encodeURL(request.getContextPath() + "/html/list");
+ args[1] = response.encodeURL(getServletContext().getContextPath() +
"/html/list");
args[2] = smClient.getString("htmlHostManagerServlet.list");
args[3] = // External link
- (request.getContextPath() + "/" +
+ (getServletContext().getContextPath() + "/" +
smClient.getString("htmlHostManagerServlet.helpHtmlManagerFile"));
args[4] = smClient.getString("htmlHostManagerServlet.helpHtmlManager");
args[5] = // External link
- (request.getContextPath() + "/" +
+ (getServletContext().getContextPath() + "/" +
smClient.getString("htmlHostManagerServlet.helpManagerFile"));
args[6] = smClient.getString("htmlHostManagerServlet.helpManager");
args[7] = response.encodeURL("/manager/status");
@@ -357,19 +357,19 @@ public final class HTMLHostManagerServlet extends
HostManagerServlet {
args = new Object[5];
if (host.getState().isAvailable()) {
args[0] = response.encodeURL
- (request.getContextPath() +
+ (getServletContext().getContextPath() +
"/html/stop?name=" +
URLEncoder.encode(hostName, "UTF-8"));
args[1] = hostsStop;
} else {
args[0] = response.encodeURL
- (request.getContextPath() +
+ (getServletContext().getContextPath() +
"/html/start?name=" +
URLEncoder.encode(hostName, "UTF-8"));
args[1] = hostsStart;
}
args[2] = response.encodeURL
- (request.getContextPath() +
+ (getServletContext().getContextPath() +
"/html/remove?name=" +
URLEncoder.encode(hostName, "UTF-8"));
args[3] = hostsRemove;
@@ -388,7 +388,7 @@ public final class HTMLHostManagerServlet extends
HostManagerServlet {
args = new Object[6];
args[0] = smClient.getString("htmlHostManagerServlet.addTitle");
args[1] = smClient.getString("htmlHostManagerServlet.addHost");
- args[2] = response.encodeURL(request.getContextPath() + "/html/add");
+ args[2] = response.encodeURL(getServletContext().getContextPath() +
"/html/add");
args[3] = smClient.getString("htmlHostManagerServlet.addName");
args[4] = smClient.getString("htmlHostManagerServlet.addAliases");
args[5] = smClient.getString("htmlHostManagerServlet.addAppBase");
@@ -430,7 +430,7 @@ public final class HTMLHostManagerServlet extends
HostManagerServlet {
// Persist Configuration Section
args = new Object[4];
args[0] = smClient.getString("htmlHostManagerServlet.persistTitle");
- args[1] = response.encodeURL(request.getContextPath() +
"/html/persist");
+ args[1] = response.encodeURL(getServletContext().getContextPath() +
"/html/persist");
args[2] =
smClient.getString("htmlHostManagerServlet.persistAllButton");
args[3] = smClient.getString("htmlHostManagerServlet.persistAll");
writer.print(MessageFormat.format(PERSIST_SECTION, args));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
