You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/01/11 19:43:45 UTC
[tomcat] branch 9.0.x updated (0e0f8424c3 -> 844d2cc3c7)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 0e0f8424c3 Complete partial update of BND dependency to 6.4.0
new 08f39a0c1b Reduce duplication
new 844d2cc3c7 Add missing checks for null facade
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/catalina/connector/RequestFacade.java | 443 +++++----------------
1 file changed, 93 insertions(+), 350 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Reduce duplication
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 08f39a0c1b45522e92d3ddcffb6f71735943c5d5
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 11 19:35:45 2023 +0000
Reduce duplication
---
.../apache/catalina/connector/RequestFacade.java | 410 ++++-----------------
1 file changed, 70 insertions(+), 340 deletions(-)
diff --git a/java/org/apache/catalina/connector/RequestFacade.java b/java/org/apache/catalina/connector/RequestFacade.java
index 11ad088491..2c9a23db5a 100644
--- a/java/org/apache/catalina/connector/RequestFacade.java
+++ b/java/org/apache/catalina/connector/RequestFacade.java
@@ -57,8 +57,6 @@ import org.apache.tomcat.util.res.StringManager;
public class RequestFacade implements HttpServletRequest {
- // ----------------------------------------------------------- DoPrivileged
-
private final class GetAttributePrivilegedAction
implements PrivilegedAction<Enumeration<String>> {
@@ -217,22 +215,9 @@ public class RequestFacade implements HttpServletRequest {
}
}
- // ----------------------------------------------------------- Constructors
-
-
- /**
- * Construct a wrapper for the specified request.
- *
- * @param request The request to be wrapped
- */
- public RequestFacade(Request request) {
-
- this.request = request;
-
- }
+ private static final StringManager sm = StringManager.getManager(RequestFacade.class);
- // ----------------------------------------------------- Instance Variables
/**
@@ -242,12 +227,13 @@ public class RequestFacade implements HttpServletRequest {
/**
- * The string manager for this package.
+ * Construct a wrapper for the specified request.
+ *
+ * @param request The request to be wrapped
*/
- protected static final StringManager sm = StringManager.getManager(RequestFacade.class);
-
-
- // --------------------------------------------------------- Public Methods
+ public RequestFacade(Request request) {
+ this.request = request;
+ }
/**
@@ -270,26 +256,16 @@ public class RequestFacade implements HttpServletRequest {
// ------------------------------------------------- ServletRequest Methods
-
@Override
public Object getAttribute(String name) {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getAttribute(name);
}
@Override
public Enumeration<String> getAttributeNames() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
+ checkFacade();
if (Globals.IS_SECURITY_ENABLED){
return AccessController.doPrivileged(
@@ -302,11 +278,7 @@ public class RequestFacade implements HttpServletRequest {
@Override
public String getCharacterEncoding() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
+ checkFacade();
if (Globals.IS_SECURITY_ENABLED){
return AccessController.doPrivileged(
@@ -318,61 +290,36 @@ public class RequestFacade implements HttpServletRequest {
@Override
- public void setCharacterEncoding(String env)
- throws java.io.UnsupportedEncodingException {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ public void setCharacterEncoding(String env) throws java.io.UnsupportedEncodingException {
+ checkFacade();
request.setCharacterEncoding(env);
}
@Override
public int getContentLength() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getContentLength();
}
@Override
public String getContentType() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getContentType();
}
@Override
public ServletInputStream getInputStream() throws IOException {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getInputStream();
}
@Override
public String getParameter(String name) {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
+ checkFacade();
if (Globals.IS_SECURITY_ENABLED){
return AccessController.doPrivileged(
@@ -385,11 +332,7 @@ public class RequestFacade implements HttpServletRequest {
@Override
public Enumeration<String> getParameterNames() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
+ checkFacade();
if (Globals.IS_SECURITY_ENABLED){
return AccessController.doPrivileged(
@@ -402,11 +345,7 @@ public class RequestFacade implements HttpServletRequest {
@Override
public String[] getParameterValues(String name) {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
+ checkFacade();
String[] ret = null;
@@ -430,11 +369,7 @@ public class RequestFacade implements HttpServletRequest {
@Override
public Map<String,String[]> getParameterMap() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
+ checkFacade();
if (Globals.IS_SECURITY_ENABLED){
return AccessController.doPrivileged(
@@ -447,119 +382,70 @@ public class RequestFacade implements HttpServletRequest {
@Override
public String getProtocol() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getProtocol();
}
@Override
public String getScheme() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getScheme();
}
@Override
public String getServerName() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getServerName();
}
@Override
public int getServerPort() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getServerPort();
}
@Override
public BufferedReader getReader() throws IOException {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getReader();
}
@Override
public String getRemoteAddr() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getRemoteAddr();
}
@Override
public String getRemoteHost() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getRemoteHost();
}
@Override
public void setAttribute(String name, Object o) {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
request.setAttribute(name, o);
}
@Override
public void removeAttribute(String name) {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
request.removeAttribute(name);
}
@Override
public Locale getLocale() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
+ checkFacade();
if (Globals.IS_SECURITY_ENABLED){
return AccessController.doPrivileged(
@@ -572,11 +458,7 @@ public class RequestFacade implements HttpServletRequest {
@Override
public Enumeration<Locale> getLocales() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
+ checkFacade();
if (Globals.IS_SECURITY_ENABLED){
return AccessController.doPrivileged(
@@ -589,23 +471,14 @@ public class RequestFacade implements HttpServletRequest {
@Override
public boolean isSecure() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.isSecure();
}
@Override
public RequestDispatcher getRequestDispatcher(String path) {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
+ checkFacade();
if (Globals.IS_SECURITY_ENABLED){
return AccessController.doPrivileged(
@@ -629,23 +502,14 @@ public class RequestFacade implements HttpServletRequest {
@Override
public String getAuthType() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getAuthType();
}
@Override
public Cookie[] getCookies() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
+ checkFacade();
Cookie[] ret = null;
@@ -669,35 +533,21 @@ public class RequestFacade implements HttpServletRequest {
@Override
public long getDateHeader(String name) {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getDateHeader(name);
}
@Override
public String getHeader(String name) {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getHeader(name);
}
@Override
public Enumeration<String> getHeaders(String name) {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
+ checkFacade();
if (Globals.IS_SECURITY_ENABLED){
return AccessController.doPrivileged(
@@ -710,11 +560,7 @@ public class RequestFacade implements HttpServletRequest {
@Override
public Enumeration<String> getHeaderNames() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
+ checkFacade();
if (Globals.IS_SECURITY_ENABLED){
return AccessController.doPrivileged(
@@ -727,179 +573,105 @@ public class RequestFacade implements HttpServletRequest {
@Override
public int getIntHeader(String name) {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getIntHeader(name);
}
@Override
public HttpServletMapping getHttpServletMapping() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getHttpServletMapping();
}
@Override
public String getMethod() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getMethod();
}
@Override
public String getPathInfo() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getPathInfo();
}
@Override
public String getPathTranslated() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getPathTranslated();
}
@Override
public String getContextPath() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getContextPath();
}
@Override
public String getQueryString() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getQueryString();
}
@Override
public String getRemoteUser() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getRemoteUser();
}
@Override
public boolean isUserInRole(String role) {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.isUserInRole(role);
}
@Override
public java.security.Principal getUserPrincipal() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getUserPrincipal();
}
@Override
public String getRequestedSessionId() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getRequestedSessionId();
}
@Override
public String getRequestURI() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getRequestURI();
}
@Override
public StringBuffer getRequestURL() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getRequestURL();
}
@Override
public String getServletPath() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getServletPath();
}
@Override
public HttpSession getSession(boolean create) {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
+ checkFacade();
if (SecurityUtil.isPackageProtectionEnabled()){
return AccessController.
@@ -911,58 +683,33 @@ public class RequestFacade implements HttpServletRequest {
@Override
public HttpSession getSession() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return getSession(true);
}
@Override
public String changeSessionId() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.changeSessionId();
}
@Override
public boolean isRequestedSessionIdValid() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.isRequestedSessionIdValid();
}
@Override
public boolean isRequestedSessionIdFromCookie() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.isRequestedSessionIdFromCookie();
}
@Override
public boolean isRequestedSessionIdFromURL() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.isRequestedSessionIdFromURL();
}
@@ -981,59 +728,35 @@ public class RequestFacade implements HttpServletRequest {
@Override
public String getLocalAddr() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getLocalAddr();
}
@Override
public String getLocalName() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getLocalName();
}
@Override
public int getLocalPort() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getLocalPort();
}
@Override
public int getRemotePort() {
-
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getRemotePort();
}
@Override
public ServletContext getServletContext() {
- if (request == null) {
- throw new IllegalStateException(
- sm.getString("requestFacade.nullRequest"));
- }
-
+ checkFacade();
return request.getServletContext();
}
@@ -1145,4 +868,11 @@ public class RequestFacade implements HttpServletRequest {
public Map<String, String> getTrailerFields() {
return request.getTrailerFields();
}
+
+
+ private void checkFacade() {
+ if (request == null) {
+ throw new IllegalStateException(sm.getString("requestFacade.nullRequest"));
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Add missing checks for null facade
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 844d2cc3c71767bcbba2fcf8a7e9c246f0ba276a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 11 19:37:15 2023 +0000
Add missing checks for null facade
---
.../apache/catalina/connector/RequestFacade.java | 33 +++++++++++++++-------
1 file changed, 23 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/catalina/connector/RequestFacade.java b/java/org/apache/catalina/connector/RequestFacade.java
index 2c9a23db5a..d64a8160f9 100644
--- a/java/org/apache/catalina/connector/RequestFacade.java
+++ b/java/org/apache/catalina/connector/RequestFacade.java
@@ -763,79 +763,87 @@ public class RequestFacade implements HttpServletRequest {
@Override
public AsyncContext startAsync() throws IllegalStateException {
+ checkFacade();
return request.startAsync();
}
@Override
- public AsyncContext startAsync(ServletRequest request, ServletResponse response)
- throws IllegalStateException {
+ public AsyncContext startAsync(ServletRequest request, ServletResponse response) throws IllegalStateException {
+ checkFacade();
return this.request.startAsync(request, response);
}
@Override
public boolean isAsyncStarted() {
+ checkFacade();
return request.isAsyncStarted();
}
@Override
public boolean isAsyncSupported() {
+ checkFacade();
return request.isAsyncSupported();
}
@Override
public AsyncContext getAsyncContext() {
+ checkFacade();
return request.getAsyncContext();
}
@Override
public DispatcherType getDispatcherType() {
+ checkFacade();
return request.getDispatcherType();
}
@Override
- public boolean authenticate(HttpServletResponse response)
- throws IOException, ServletException {
+ public boolean authenticate(HttpServletResponse response) throws IOException, ServletException {
+ checkFacade();
return request.authenticate(response);
}
@Override
- public void login(String username, String password)
- throws ServletException {
+ public void login(String username, String password) throws ServletException {
+ checkFacade();
request.login(username, password);
}
@Override
public void logout() throws ServletException {
+ checkFacade();
request.logout();
}
@Override
- public Collection<Part> getParts() throws IllegalStateException,
- IOException, ServletException {
+ public Collection<Part> getParts() throws IllegalStateException, IOException, ServletException {
+ checkFacade();
return request.getParts();
}
@Override
- public Part getPart(String name) throws IllegalStateException, IOException,
- ServletException {
+ public Part getPart(String name) throws IllegalStateException, IOException, ServletException {
+ checkFacade();
return request.getPart(name);
}
public boolean getAllowTrace() {
+ checkFacade();
return request.getConnector().getAllowTrace();
}
@Override
public long getContentLengthLong() {
+ checkFacade();
return request.getContentLengthLong();
}
@@ -843,29 +851,34 @@ public class RequestFacade implements HttpServletRequest {
@Override
public <T extends HttpUpgradeHandler> T upgrade(
Class<T> httpUpgradeHandlerClass) throws java.io.IOException, ServletException {
+ checkFacade();
return request.upgrade(httpUpgradeHandlerClass);
}
@Override
public PushBuilder newPushBuilder() {
+ checkFacade();
return request.newPushBuilder();
}
public PushBuilder newPushBuilder(HttpServletRequest request) {
+ checkFacade();
return this.request.newPushBuilder(request);
}
@Override
public boolean isTrailerFieldsReady() {
+ checkFacade();
return request.isTrailerFieldsReady();
}
@Override
public Map<String, String> getTrailerFields() {
+ checkFacade();
return request.getTrailerFields();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org