Skip to content

Commit

Permalink
Fixed imports of RequestFacade
Browse files Browse the repository at this point in the history
  • Loading branch information
@dmatej
dmatej committed Apr 6, 2022
1 parent 7541f0a commit ff4c62b
Showing 1 changed file with 40 additions and 24 deletions.
64 changes: 40 additions & 24 deletions appserver/web/web-core/src/main/java/org/apache/catalina/connector/RequestFacade.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,11 @@

package org.apache.catalina.connector;

import java.io.BufferedReader;
import java.io.IOException;
import java.security.AccessControlException;
import java.security.AccessController;
import java.security.Principal;
import java.security.PrivilegedAction;
import java.security.SecurityPermission;
import java.util.Collection;
import java.util.Enumeration;
import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;

import org.apache.catalina.Globals;
import org.apache.catalina.LogFacade;
import org.apache.catalina.core.RequestFacadeHelper;
import org.apache.catalina.security.SecurityUtil;

import com.sun.enterprise.security.web.integration.WebPrincipal;

import jakarta.servlet.AsyncContext;
import jakarta.servlet.DispatcherType;
import jakarta.servlet.RequestDispatcher;
import jakarta.servlet.ServletConnection;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletInputStream;
Expand All @@ -56,6 +37,24 @@
import jakarta.servlet.http.Part;
import jakarta.servlet.http.PushBuilder;

import java.io.BufferedReader;
import java.io.IOException;
import java.security.AccessControlException;
import java.security.AccessController;
import java.security.Principal;
import java.security.PrivilegedAction;
import java.security.SecurityPermission;
import java.util.Collection;
import java.util.Enumeration;
import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;

import org.apache.catalina.Globals;
import org.apache.catalina.LogFacade;
import org.apache.catalina.core.RequestFacadeHelper;
import org.apache.catalina.security.SecurityUtil;


/**
* Facade class that wraps a Coyote request object.
Expand All @@ -77,6 +76,7 @@ public class RequestFacade
private final class GetAttributePrivilegedAction
implements PrivilegedAction<Enumeration<String>> {

@Override
public Enumeration<String> run() {
return request.getAttributeNames();
}
Expand All @@ -86,6 +86,7 @@ public Enumeration<String> run() {
private final class GetParameterMapPrivilegedAction
implements PrivilegedAction<Map<String, String[]>> {

@Override
public Map<String, String[]> run() {
return request.getParameterMap();
}
Expand All @@ -95,12 +96,13 @@ public Map<String, String[]> run() {
private final class GetRequestDispatcherPrivilegedAction
implements PrivilegedAction<RequestDispatcher> {

private String path;
private final String path;

public GetRequestDispatcherPrivilegedAction(String path){
this.path = path;
}

@Override
public RequestDispatcher run() {
return request.getRequestDispatcher(path);
}
Expand All @@ -116,6 +118,7 @@ public GetParameterPrivilegedAction(String name){
this.name = name;
}

@Override
public String run() {
return request.getParameter(name);
}
Expand All @@ -125,6 +128,7 @@ public String run() {
private final class GetParameterNamesPrivilegedAction
implements PrivilegedAction<Enumeration<String>> {

@Override
public Enumeration<String> run() {
return request.getParameterNames();
}
Expand All @@ -140,6 +144,7 @@ public GetParameterValuePrivilegedAction(String name){
this.name = name;
}

@Override
public String[] run() {
return request.getParameterValues(name);
}
Expand All @@ -149,6 +154,7 @@ public String[] run() {
private final class GetCookiesPrivilegedAction
implements PrivilegedAction<Cookie[]> {

@Override
public Cookie[] run() {
return request.getCookies();
}
Expand All @@ -158,6 +164,7 @@ public Cookie[] run() {
private final class GetCharacterEncodingPrivilegedAction
implements PrivilegedAction<String> {

@Override
public String run() {
return request.getCharacterEncoding();
}
Expand All @@ -167,12 +174,13 @@ public String run() {
private final class GetHeadersPrivilegedAction
implements PrivilegedAction<Enumeration<String>> {

private String name;
private final String name;

public GetHeadersPrivilegedAction(String name){
this.name = name;
}

@Override
public Enumeration<String> run() {
return request.getHeaders(name);
}
Expand All @@ -182,6 +190,7 @@ public Enumeration<String> run() {
private final class GetHeaderNamesPrivilegedAction
implements PrivilegedAction<Enumeration<String>> {

@Override
public Enumeration<String> run() {
return request.getHeaderNames();
}
Expand All @@ -191,6 +200,7 @@ public Enumeration<String> run() {
private final class GetLocalePrivilegedAction
implements PrivilegedAction<Locale> {

@Override
public Locale run() {
return request.getLocale();
}
Expand All @@ -200,6 +210,7 @@ public Locale run() {
private final class GetLocalesPrivilegedAction
implements PrivilegedAction<Enumeration<Locale>> {

@Override
public Enumeration<Locale> run() {
return request.getLocales();
}
Expand All @@ -208,12 +219,13 @@ public Enumeration<Locale> run() {
private final class GetSessionPrivilegedAction
implements PrivilegedAction<HttpSession> {

private boolean create;
private final boolean create;

public GetSessionPrivilegedAction(boolean create){
this.create = create;
}

@Override
public HttpSession run() {
return request.getSession(create);
}
Expand All @@ -222,6 +234,7 @@ public HttpSession run() {
private final class ChangeSessionIdPrivilegedAction
implements PrivilegedAction<String> {

@Override
public String run() {
return request.changeSessionId();
}
Expand Down Expand Up @@ -293,6 +306,7 @@ public RequestFacade(Request request,
/**
* Prevent cloning the facade.
*/
@Override
protected Object clone()
throws CloneNotSupportedException {
throw new CloneNotSupportedException();
Expand Down Expand Up @@ -409,6 +423,7 @@ public ServletInputStream getInputStream() throws IOException {
return request.getInputStream();
}

@Override
public HttpServletMapping getHttpServletMapping() {

if (request == null) {
Expand All @@ -418,6 +433,7 @@ public HttpServletMapping getHttpServletMapping() {
return request.getHttpServletMapping();
}

@Override
public String getParameter(String name) {

if (request == null) {
Expand Down Expand Up @@ -464,7 +480,7 @@ public String[] getParameterValues(String name) {
ret = AccessController.doPrivileged(
new GetParameterValuePrivilegedAction(name));
if (ret != null) {
ret = (String[]) ret.clone();
ret = ret.clone();
}
} else {
ret = request.getParameterValues(name);
Expand Down Expand Up @@ -670,7 +686,7 @@ public Cookie[] getCookies() {
ret = AccessController.doPrivileged(
new GetCookiesPrivilegedAction());
if (ret != null) {
ret = (Cookie[]) ret.clone();
ret = ret.clone();
}
} else {
ret = request.getCookies();
Expand Down

0 comments on commit ff4c62b

Please sign in to comment.