This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch http-4.x
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/http-4.x by this push:
new cd4c7db1aa FELIX-6656 : javax.servlet / jakarta.servlet request
attributes are not correctly translated
cd4c7db1aa is described below
commit cd4c7db1aac95a3d80c757033ce760e6de583b2a
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Wed Sep 27 13:36:52 2023 +0200
FELIX-6656 : javax.servlet / jakarta.servlet request attributes are not
correctly translated
---
http/wrappers/pom.xml | 12 +
.../jakartawrappers/ServletRequestWrapper.java | 95 +++++--
.../http/javaxwrappers/ServletRequestWrapper.java | 96 +++++--
.../http/jakartawrappers/ServletRequestTest.java | 279 ++++++++++++++++++++
.../http/javaxwrappers/ServletRequestTest.java | 290 +++++++++++++++++++++
5 files changed, 716 insertions(+), 56 deletions(-)
diff --git a/http/wrappers/pom.xml b/http/wrappers/pom.xml
index 4d8dec7f12..fd611f5881 100644
--- a/http/wrappers/pom.xml
+++ b/http/wrappers/pom.xml
@@ -65,5 +65,17 @@
<version>5.0.0</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>5.5.0</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git
a/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/ServletRequestWrapper.java
b/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/ServletRequestWrapper.java
index 95357e43fc..2d11a541a0 100644
---
a/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/ServletRequestWrapper.java
+++
b/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/ServletRequestWrapper.java
@@ -44,7 +44,10 @@ import static
jakarta.servlet.RequestDispatcher.INCLUDE_SERVLET_PATH;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.Enumeration;
+import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -107,86 +110,112 @@ public class ServletRequestWrapper implements
ServletRequest {
return value;
}
- @Override
- public Object getAttribute(final String name) {
+ public static String getTranslatedAttributeName(final String name) {
if ( FORWARD_CONTEXT_PATH.equals(name) ) {
- return
this.request.getAttribute(javax.servlet.RequestDispatcher.FORWARD_CONTEXT_PATH);
+ return javax.servlet.RequestDispatcher.FORWARD_CONTEXT_PATH;
} else if ( FORWARD_MAPPING.equals(name) ) {
- return
wrapHttpServletMapping(this.request.getAttribute(javax.servlet.RequestDispatcher.FORWARD_MAPPING));
+ return javax.servlet.RequestDispatcher.FORWARD_MAPPING;
} else if ( FORWARD_PATH_INFO.equals(name) ) {
- return
this.request.getAttribute(javax.servlet.RequestDispatcher.FORWARD_PATH_INFO);
+ return javax.servlet.RequestDispatcher.FORWARD_PATH_INFO;
} else if ( FORWARD_QUERY_STRING.equals(name) ) {
- return
this.request.getAttribute(javax.servlet.RequestDispatcher.FORWARD_QUERY_STRING);
+ return javax.servlet.RequestDispatcher.FORWARD_QUERY_STRING;
} else if ( FORWARD_REQUEST_URI.equals(name) ) {
- return
this.request.getAttribute(javax.servlet.RequestDispatcher.FORWARD_REQUEST_URI);
+ return javax.servlet.RequestDispatcher.FORWARD_REQUEST_URI;
} else if ( FORWARD_SERVLET_PATH.equals(name) ) {
- return
this.request.getAttribute(javax.servlet.RequestDispatcher.FORWARD_SERVLET_PATH);
+ return javax.servlet.RequestDispatcher.FORWARD_SERVLET_PATH;
} else if ( INCLUDE_CONTEXT_PATH.equals(name) ) {
- return
this.request.getAttribute(javax.servlet.RequestDispatcher.INCLUDE_CONTEXT_PATH);
+ return javax.servlet.RequestDispatcher.INCLUDE_CONTEXT_PATH;
} else if ( INCLUDE_MAPPING.equals(name) ) {
- return
wrapHttpServletMapping(this.request.getAttribute(javax.servlet.RequestDispatcher.INCLUDE_MAPPING));
+ return javax.servlet.RequestDispatcher.INCLUDE_MAPPING;
} else if ( INCLUDE_PATH_INFO.equals(name) ) {
- return
this.request.getAttribute(javax.servlet.RequestDispatcher.INCLUDE_PATH_INFO);
+ return javax.servlet.RequestDispatcher.INCLUDE_PATH_INFO;
} else if ( INCLUDE_QUERY_STRING.equals(name) ) {
- return
this.request.getAttribute(javax.servlet.RequestDispatcher.INCLUDE_QUERY_STRING);
+ return javax.servlet.RequestDispatcher.INCLUDE_QUERY_STRING;
} else if ( INCLUDE_REQUEST_URI.equals(name) ) {
- return
this.request.getAttribute(javax.servlet.RequestDispatcher.INCLUDE_REQUEST_URI);
+ return javax.servlet.RequestDispatcher.INCLUDE_REQUEST_URI;
} else if ( INCLUDE_SERVLET_PATH.equals(name) ) {
- return
this.request.getAttribute(javax.servlet.RequestDispatcher.INCLUDE_SERVLET_PATH);
+ return javax.servlet.RequestDispatcher.INCLUDE_SERVLET_PATH;
} else if ( ERROR_EXCEPTION.equals(name) ) {
- return
this.request.getAttribute(javax.servlet.RequestDispatcher.ERROR_EXCEPTION);
+ return javax.servlet.RequestDispatcher.ERROR_EXCEPTION;
} else if ( ERROR_EXCEPTION_TYPE.equals(name) ) {
- return
this.request.getAttribute(javax.servlet.RequestDispatcher.ERROR_EXCEPTION_TYPE);
+ return javax.servlet.RequestDispatcher.ERROR_EXCEPTION_TYPE;
} else if ( ERROR_MESSAGE.equals(name) ) {
- return
this.request.getAttribute(javax.servlet.RequestDispatcher.ERROR_MESSAGE);
+ return javax.servlet.RequestDispatcher.ERROR_MESSAGE;
} else if ( ERROR_REQUEST_URI.equals(name) ) {
- return
this.request.getAttribute(javax.servlet.RequestDispatcher.ERROR_REQUEST_URI);
+ return javax.servlet.RequestDispatcher.ERROR_REQUEST_URI;
} else if ( ERROR_SERVLET_NAME.equals(name) ) {
- return
this.request.getAttribute(javax.servlet.RequestDispatcher.ERROR_SERVLET_NAME);
+ return javax.servlet.RequestDispatcher.ERROR_SERVLET_NAME;
} else if ( ERROR_STATUS_CODE.equals(name) ) {
- return
this.request.getAttribute(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE);
+ return javax.servlet.RequestDispatcher.ERROR_STATUS_CODE;
} else if ( ASYNC_CONTEXT_PATH.equals(name) ) {
- return
this.request.getAttribute(javax.servlet.AsyncContext.ASYNC_CONTEXT_PATH);
+ return javax.servlet.AsyncContext.ASYNC_CONTEXT_PATH;
} else if ( ASYNC_MAPPING.equals(name) ) {
- return
wrapHttpServletMapping(this.request.getAttribute(javax.servlet.AsyncContext.ASYNC_MAPPING));
+ return javax.servlet.AsyncContext.ASYNC_MAPPING;
} else if ( ASYNC_PATH_INFO.equals(name) ) {
- return
this.request.getAttribute(javax.servlet.AsyncContext.ASYNC_PATH_INFO);
+ return javax.servlet.AsyncContext.ASYNC_PATH_INFO;
} else if ( ASYNC_QUERY_STRING.equals(name) ) {
- return
this.request.getAttribute(javax.servlet.AsyncContext.ASYNC_QUERY_STRING);
+ return javax.servlet.AsyncContext.ASYNC_QUERY_STRING;
} else if ( ASYNC_REQUEST_URI.equals(name) ) {
- return
this.request.getAttribute(javax.servlet.AsyncContext.ASYNC_REQUEST_URI);
+ return javax.servlet.AsyncContext.ASYNC_REQUEST_URI;
} else if ( ASYNC_SERVLET_PATH.equals(name) ) {
- return
this.request.getAttribute(javax.servlet.AsyncContext.ASYNC_SERVLET_PATH);
+ return javax.servlet.AsyncContext.ASYNC_SERVLET_PATH;
+ }
+ return null;
+ }
+
+ @Override
+ public Object getAttribute(final String name) {
+ final String translatedName = getTranslatedAttributeName(name);
+ if ( translatedName != null ) {
+ final Object value = this.request.getAttribute(translatedName);
+ if ( FORWARD_MAPPING.equals(name) ) {
+ return wrapHttpServletMapping(value);
+ } else if ( INCLUDE_MAPPING.equals(name) ) {
+ return wrapHttpServletMapping(value);
+ } else if ( ASYNC_MAPPING.equals(name) ) {
+ return wrapHttpServletMapping(value);
+ }
+ return value;
}
return this.request.getAttribute(name);
}
@Override
public Enumeration<String> getAttributeNames() {
- return this.request.getAttributeNames();
+ final List<String> names =
Collections.list(this.request.getAttributeNames());
+ final List<String> translatedNames = new ArrayList<>();
+ for(final String name : names) {
+ final String translatedName =
org.apache.felix.http.javaxwrappers.ServletRequestWrapper.getTranslatedAttributeName(name);
+ if ( translatedName != null ) {
+ translatedNames.add(translatedName);
+ } else {
+ translatedNames.add(name);
+ }
+ }
+ return Collections.enumeration(translatedNames);
}
@Override
@@ -276,12 +305,22 @@ public class ServletRequestWrapper implements
ServletRequest {
@Override
public void setAttribute(final String name, final Object o) {
- this.request.setAttribute(name, o);
+ final String translatedName = getTranslatedAttributeName(name);
+ if (translatedName != null) {
+ this.request.setAttribute(translatedName, o);
+ this.request.removeAttribute(name);
+ } else {
+ this.request.setAttribute(name, o);
+ }
}
@Override
public void removeAttribute(final String name) {
+ final String translatedName = getTranslatedAttributeName(name);
this.request.removeAttribute(name);
+ if (translatedName != null) {
+ this.request.removeAttribute(translatedName);
+ }
}
@Override
diff --git
a/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/ServletRequestWrapper.java
b/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/ServletRequestWrapper.java
index 8e9bdab978..70030206bd 100644
---
a/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/ServletRequestWrapper.java
+++
b/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/ServletRequestWrapper.java
@@ -44,7 +44,10 @@ import static
jakarta.servlet.RequestDispatcher.INCLUDE_SERVLET_PATH;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.Enumeration;
+import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -104,86 +107,113 @@ public class ServletRequestWrapper implements
javax.servlet.ServletRequest {
return value;
}
- @Override
- public Object getAttribute(final String name) {
+ public static String getTranslatedAttributeName(final String name) {
if ( javax.servlet.RequestDispatcher.FORWARD_CONTEXT_PATH.equals(name)
) {
- return this.request.getAttribute(FORWARD_CONTEXT_PATH);
+ return FORWARD_CONTEXT_PATH;
} else if (
javax.servlet.RequestDispatcher.FORWARD_MAPPING.equals(name) ) {
- return
wrapHttpServletMapping(this.request.getAttribute(FORWARD_MAPPING));
+ return FORWARD_MAPPING;
} else if (
javax.servlet.RequestDispatcher.FORWARD_PATH_INFO.equals(name) ) {
- return this.request.getAttribute(FORWARD_PATH_INFO);
+ return FORWARD_PATH_INFO;
} else if (
javax.servlet.RequestDispatcher.FORWARD_QUERY_STRING.equals(name) ) {
- return this.request.getAttribute(FORWARD_QUERY_STRING);
+ return FORWARD_QUERY_STRING;
} else if (
javax.servlet.RequestDispatcher.FORWARD_REQUEST_URI.equals(name) ) {
- return this.request.getAttribute(FORWARD_REQUEST_URI);
+ return FORWARD_REQUEST_URI;
} else if (
javax.servlet.RequestDispatcher.FORWARD_SERVLET_PATH.equals(name) ) {
- return this.request.getAttribute(FORWARD_SERVLET_PATH);
+ return FORWARD_SERVLET_PATH;
} else if (
javax.servlet.RequestDispatcher.INCLUDE_CONTEXT_PATH.equals(name) ) {
- return this.request.getAttribute(INCLUDE_CONTEXT_PATH);
+ return INCLUDE_CONTEXT_PATH;
} else if (
javax.servlet.RequestDispatcher.INCLUDE_MAPPING.equals(name) ) {
- return
wrapHttpServletMapping(this.request.getAttribute(INCLUDE_MAPPING));
+ return INCLUDE_MAPPING;
} else if (
javax.servlet.RequestDispatcher.INCLUDE_PATH_INFO.equals(name) ) {
- return this.request.getAttribute(INCLUDE_PATH_INFO);
+ return INCLUDE_PATH_INFO;
} else if (
javax.servlet.RequestDispatcher.INCLUDE_QUERY_STRING.equals(name) ) {
- return this.request.getAttribute(INCLUDE_QUERY_STRING);
+ return INCLUDE_QUERY_STRING;
} else if (
javax.servlet.RequestDispatcher.INCLUDE_REQUEST_URI.equals(name) ) {
- return this.request.getAttribute(INCLUDE_REQUEST_URI);
+ return INCLUDE_REQUEST_URI;
} else if (
javax.servlet.RequestDispatcher.INCLUDE_SERVLET_PATH.equals(name) ) {
- return this.request.getAttribute(INCLUDE_SERVLET_PATH);
+ return INCLUDE_SERVLET_PATH;
} else if (
javax.servlet.RequestDispatcher.ERROR_EXCEPTION.equals(name) ) {
- return this.request.getAttribute(ERROR_EXCEPTION);
+ return ERROR_EXCEPTION;
} else if (
javax.servlet.RequestDispatcher.ERROR_EXCEPTION_TYPE.equals(name) ) {
- return this.request.getAttribute(ERROR_EXCEPTION_TYPE);
+ return ERROR_EXCEPTION_TYPE;
} else if ( javax.servlet.RequestDispatcher.ERROR_MESSAGE.equals(name)
) {
- return this.request.getAttribute(ERROR_MESSAGE);
+ return ERROR_MESSAGE;
} else if (
javax.servlet.RequestDispatcher.ERROR_REQUEST_URI.equals(name) ) {
- return this.request.getAttribute(ERROR_REQUEST_URI);
+ return ERROR_REQUEST_URI;
} else if (
javax.servlet.RequestDispatcher.ERROR_SERVLET_NAME.equals(name) ) {
- return this.request.getAttribute(ERROR_SERVLET_NAME);
+ return ERROR_SERVLET_NAME;
} else if (
javax.servlet.RequestDispatcher.ERROR_STATUS_CODE.equals(name) ) {
- return this.request.getAttribute(ERROR_STATUS_CODE);
+ return ERROR_STATUS_CODE;
} else if ( javax.servlet.AsyncContext.ASYNC_CONTEXT_PATH.equals(name)
) {
- return this.request.getAttribute(ASYNC_CONTEXT_PATH);
+ return ASYNC_CONTEXT_PATH;
} else if ( javax.servlet.AsyncContext.ASYNC_MAPPING.equals(name) ) {
- return
wrapHttpServletMapping(this.request.getAttribute(ASYNC_MAPPING));
+ return ASYNC_MAPPING;
} else if ( javax.servlet.AsyncContext.ASYNC_PATH_INFO.equals(name) ) {
- return this.request.getAttribute(ASYNC_PATH_INFO);
+ return ASYNC_PATH_INFO;
} else if ( javax.servlet.AsyncContext.ASYNC_QUERY_STRING.equals(name)
) {
- return this.request.getAttribute(ASYNC_QUERY_STRING);
+ return ASYNC_QUERY_STRING;
} else if ( javax.servlet.AsyncContext.ASYNC_REQUEST_URI.equals(name)
) {
- return this.request.getAttribute(ASYNC_REQUEST_URI);
+ return ASYNC_REQUEST_URI;
} else if ( javax.servlet.AsyncContext.ASYNC_SERVLET_PATH.equals(name)
) {
- return this.request.getAttribute(ASYNC_SERVLET_PATH);
+ return ASYNC_SERVLET_PATH;
+ }
+ return null;
+ }
+
+ @Override
+ public Object getAttribute(final String name) {
+ final String translatedName = getTranslatedAttributeName(name);
+ if ( translatedName != null ) {
+ final Object value = this.request.getAttribute(translatedName);
+ if ( javax.servlet.RequestDispatcher.FORWARD_MAPPING.equals(name)
) {
+ return wrapHttpServletMapping(value);
+ } else if (
javax.servlet.RequestDispatcher.INCLUDE_MAPPING.equals(name) ) {
+ return wrapHttpServletMapping(value);
+ } else if ( javax.servlet.AsyncContext.ASYNC_MAPPING.equals(name)
) {
+ return wrapHttpServletMapping(value);
+ }
+ return value;
}
return this.request.getAttribute(name);
}
@Override
public Enumeration<String> getAttributeNames() {
- return this.request.getAttributeNames();
+ final List<String> names =
Collections.list(this.request.getAttributeNames());
+ final List<String> translatedNames = new ArrayList<>();
+ for(final String name : names) {
+ final String translatedName =
org.apache.felix.http.jakartawrappers.ServletRequestWrapper.getTranslatedAttributeName(name);
+ if ( translatedName != null ) {
+ translatedNames.add(translatedName);
+ } else {
+ translatedNames.add(name);
+ }
+ }
+ return Collections.enumeration(translatedNames);
+
}
@Override
@@ -273,12 +303,22 @@ public class ServletRequestWrapper implements
javax.servlet.ServletRequest {
@Override
public void setAttribute(final String name, final Object o) {
- this.request.setAttribute(name, o);
+ final String translatedName = getTranslatedAttributeName(name);
+ if (translatedName != null) {
+ this.request.setAttribute(translatedName, o);
+ this.request.removeAttribute(name);
+ } else {
+ this.request.setAttribute(name, o);
+ }
}
@Override
public void removeAttribute(final String name) {
+ final String translatedName = getTranslatedAttributeName(name);
this.request.removeAttribute(name);
+ if (translatedName != null) {
+ this.request.removeAttribute(translatedName);
+ }
}
@Override
diff --git
a/http/wrappers/src/test/java/org/apache/felix/http/jakartawrappers/ServletRequestTest.java
b/http/wrappers/src/test/java/org/apache/felix/http/jakartawrappers/ServletRequestTest.java
new file mode 100644
index 0000000000..322068352f
--- /dev/null
+++
b/http/wrappers/src/test/java/org/apache/felix/http/jakartawrappers/ServletRequestTest.java
@@ -0,0 +1,279 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.felix.http.jakartawrappers;
+
+import jakarta.servlet.ServletRequest;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.servlet.AsyncContext;
+import javax.servlet.DispatcherType;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletInputStream;
+import javax.servlet.ServletResponse;
+
+import org.junit.Test;
+
+public class ServletRequestTest {
+
+ private javax.servlet.ServletRequest createRequest() {
+ return new javax.servlet.ServletRequest() {
+
+ final private Map<String, Object> attributes = new HashMap<>();
+
+ @Override
+ public AsyncContext getAsyncContext() {
+ return null;
+ }
+
+ @Override
+ public Object getAttribute(String name) {
+ return attributes.get(name);
+ }
+
+ @Override
+ public Enumeration<String> getAttributeNames() {
+ return Collections.enumeration(attributes.keySet());
+ }
+
+ @Override
+ public String getCharacterEncoding() {
+ return null;
+ }
+
+ @Override
+ public int getContentLength() {
+ return 0;
+ }
+
+ @Override
+ public long getContentLengthLong() {
+ return 0;
+ }
+
+ @Override
+ public String getContentType() {
+ return null;
+ }
+
+ @Override
+ public DispatcherType getDispatcherType() {
+ return null;
+ }
+
+ @Override
+ public ServletInputStream getInputStream() throws IOException {
+ return null;
+ }
+
+ @Override
+ public String getLocalAddr() {
+ return null;
+ }
+
+ @Override
+ public String getLocalName() {
+ return null;
+ }
+
+ @Override
+ public int getLocalPort() {
+ return 0;
+ }
+
+ @Override
+ public Locale getLocale() {
+ return null;
+ }
+
+ @Override
+ public Enumeration<Locale> getLocales() {
+ return null;
+ }
+
+ @Override
+ public String getParameter(String name) {
+ return null;
+ }
+
+ @Override
+ public Map<String, String[]> getParameterMap() {
+ return null;
+ }
+
+ @Override
+ public Enumeration<String> getParameterNames() {
+ return null;
+ }
+
+ @Override
+ public String[] getParameterValues(String name) {
+ return null;
+ }
+
+ @Override
+ public String getProtocol() {
+ return null;
+ }
+
+ @Override
+ public BufferedReader getReader() throws IOException {
+ return null;
+ }
+
+ @Override
+ public String getRealPath(String path) {
+ return null;
+ }
+
+ @Override
+ public String getRemoteAddr() {
+ return null;
+ }
+
+ @Override
+ public String getRemoteHost() {
+ return null;
+ }
+
+ @Override
+ public int getRemotePort() {
+ return 0;
+ }
+
+ @Override
+ public RequestDispatcher getRequestDispatcher(String path) {
+ return null;
+ }
+
+ @Override
+ public String getScheme() {
+ return null;
+ }
+
+ @Override
+ public String getServerName() {
+ return null;
+ }
+
+ @Override
+ public int getServerPort() {
+ return 0;
+ }
+
+ @Override
+ public ServletContext getServletContext() {
+ return null;
+ }
+
+ @Override
+ public boolean isAsyncStarted() {
+ return false;
+ }
+
+ @Override
+ public boolean isAsyncSupported() {
+ return false;
+ }
+
+ @Override
+ public boolean isSecure() {
+ return false;
+ }
+
+ @Override
+ public void removeAttribute(String name) {
+ attributes.remove(name);
+ }
+
+ @Override
+ public void setAttribute(String name, Object o) {
+ this.attributes.put(name, o);
+ }
+
+ @Override
+ public void setCharacterEncoding(String env) throws
UnsupportedEncodingException {
+ }
+
+ @Override
+ public AsyncContext startAsync() throws IllegalStateException {
+ return null;
+ }
+
+ @Override
+ public AsyncContext startAsync(javax.servlet.ServletRequest
servletRequest, ServletResponse servletResponse)
+ throws IllegalStateException {
+ return null;
+ }
+ };
+ }
+
+ @Test public void testAttributeGetterSetter() {
+ final javax.servlet.ServletRequest sr = createRequest();
+ final ServletRequest req = ServletRequestWrapper.getWrapper(sr);
+ req.setAttribute("foo", "bar");
+ assertEquals("bar", req.getAttribute("foo"));
+ req.setAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE,
"500");
+ assertEquals("500",
req.getAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+
+ final List<String> names = Collections.list(req.getAttributeNames());
+ assertEquals(2, names.size());
+ assertTrue(names.contains("foo"));
+
assertTrue(names.contains(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+
+ req.removeAttribute("foo");
+ assertNull(req.getAttribute("foo"));
+
req.removeAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE);
+
assertNull(req.getAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+ assertFalse(req.getAttributeNames().hasMoreElements());
+ }
+
+ @Test public void testProvidedAttributes() {
+ final javax.servlet.ServletRequest sr = createRequest();
+ sr.setAttribute(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE,
"500");
+ sr.setAttribute("foo", "bar");
+
+ final ServletRequest req = ServletRequestWrapper.getWrapper(sr);
+ assertEquals("bar", req.getAttribute("foo"));
+ assertEquals("500",
req.getAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+
+ final List<String> names = Collections.list(req.getAttributeNames());
+ assertEquals(2, names.size());
+ assertTrue(names.contains("foo"));
+
assertTrue(names.contains(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+
+ req.removeAttribute("foo");
+ assertNull(req.getAttribute("foo"));
+
req.removeAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE);
+
assertNull(req.getAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+ assertFalse(req.getAttributeNames().hasMoreElements());
+ }
+}
diff --git
a/http/wrappers/src/test/java/org/apache/felix/http/javaxwrappers/ServletRequestTest.java
b/http/wrappers/src/test/java/org/apache/felix/http/javaxwrappers/ServletRequestTest.java
new file mode 100644
index 0000000000..8700eb3a28
--- /dev/null
+++
b/http/wrappers/src/test/java/org/apache/felix/http/javaxwrappers/ServletRequestTest.java
@@ -0,0 +1,290 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.felix.http.javaxwrappers;
+
+import javax.servlet.ServletRequest;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletConnection;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletResponse;
+
+import org.junit.Test;
+
+public class ServletRequestTest {
+
+ private jakarta.servlet.ServletRequest createRequest() {
+ return new jakarta.servlet.ServletRequest() {
+
+ final private Map<String, Object> attributes = new HashMap<>();
+
+ @Override
+ public AsyncContext getAsyncContext() {
+ return null;
+ }
+
+ @Override
+ public Object getAttribute(String name) {
+ return attributes.get(name);
+ }
+
+ @Override
+ public Enumeration<String> getAttributeNames() {
+ return Collections.enumeration(attributes.keySet());
+ }
+
+ @Override
+ public String getCharacterEncoding() {
+ return null;
+ }
+
+ @Override
+ public int getContentLength() {
+ return 0;
+ }
+
+ @Override
+ public long getContentLengthLong() {
+ return 0;
+ }
+
+ @Override
+ public String getContentType() {
+ return null;
+ }
+
+ @Override
+ public DispatcherType getDispatcherType() {
+ return null;
+ }
+
+ @Override
+ public ServletInputStream getInputStream() throws IOException {
+ return null;
+ }
+
+ @Override
+ public String getLocalAddr() {
+ return null;
+ }
+
+ @Override
+ public String getLocalName() {
+ return null;
+ }
+
+ @Override
+ public int getLocalPort() {
+ return 0;
+ }
+
+ @Override
+ public Locale getLocale() {
+ return null;
+ }
+
+ @Override
+ public Enumeration<Locale> getLocales() {
+ return null;
+ }
+
+ @Override
+ public String getParameter(String name) {
+ return null;
+ }
+
+ @Override
+ public Map<String, String[]> getParameterMap() {
+ return null;
+ }
+
+ @Override
+ public Enumeration<String> getParameterNames() {
+ return null;
+ }
+
+ @Override
+ public String[] getParameterValues(String name) {
+ return null;
+ }
+
+ @Override
+ public String getProtocol() {
+ return null;
+ }
+
+ @Override
+ public BufferedReader getReader() throws IOException {
+ return null;
+ }
+
+ @Override
+ public String getRemoteAddr() {
+ return null;
+ }
+
+ @Override
+ public String getRemoteHost() {
+ return null;
+ }
+
+ @Override
+ public int getRemotePort() {
+ return 0;
+ }
+
+ @Override
+ public RequestDispatcher getRequestDispatcher(String path) {
+ return null;
+ }
+
+ @Override
+ public String getScheme() {
+ return null;
+ }
+
+ @Override
+ public String getServerName() {
+ return null;
+ }
+
+ @Override
+ public int getServerPort() {
+ return 0;
+ }
+
+ @Override
+ public ServletContext getServletContext() {
+ return null;
+ }
+
+ @Override
+ public boolean isAsyncStarted() {
+ return false;
+ }
+
+ @Override
+ public boolean isAsyncSupported() {
+ return false;
+ }
+
+ @Override
+ public boolean isSecure() {
+ return false;
+ }
+
+ @Override
+ public void removeAttribute(String name) {
+ attributes.remove(name);
+ }
+
+ @Override
+ public void setAttribute(String name, Object o) {
+ this.attributes.put(name, o);
+ }
+
+ @Override
+ public void setCharacterEncoding(String env) throws
UnsupportedEncodingException {
+ }
+
+ @Override
+ public AsyncContext startAsync() throws IllegalStateException {
+ return null;
+ }
+
+ @Override
+ public AsyncContext startAsync(jakarta.servlet.ServletRequest
servletRequest, ServletResponse servletResponse)
+ throws IllegalStateException {
+ return null;
+ }
+
+ @Override
+ public String getProtocolRequestId() {
+ return null;
+ }
+
+ @Override
+ public String getRequestId() {
+ return null;
+ }
+
+ @Override
+ public ServletConnection getServletConnection() {
+ return null;
+ }
+ };
+ }
+
+ @Test public void testAttributeGetterSetter() {
+ final jakarta.servlet.ServletRequest sr = createRequest();
+ final ServletRequest req = ServletRequestWrapper.getWrapper(sr);
+ req.setAttribute("foo", "bar");
+ assertEquals("bar", req.getAttribute("foo"));
+ req.setAttribute(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE,
"500");
+ assertEquals("500",
req.getAttribute(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+
+ final List<String> names = Collections.list(req.getAttributeNames());
+ assertEquals(2, names.size());
+ assertTrue(names.contains("foo"));
+
assertTrue(names.contains(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+
+ req.removeAttribute("foo");
+ assertNull(req.getAttribute("foo"));
+ req.removeAttribute(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE);
+
assertNull(req.getAttribute(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+ assertFalse(req.getAttributeNames().hasMoreElements());
+ }
+
+ @Test public void testProvidedAttributes() {
+ final jakarta.servlet.ServletRequest sr = createRequest();
+ sr.setAttribute(jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE,
"500");
+ sr.setAttribute("foo", "bar");
+
+ final ServletRequest req = ServletRequestWrapper.getWrapper(sr);
+ assertEquals("bar", req.getAttribute("foo"));
+ assertEquals("500",
req.getAttribute(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+
+ final List<String> names = Collections.list(req.getAttributeNames());
+ assertEquals(2, names.size());
+ assertTrue(names.contains("foo"));
+
assertTrue(names.contains(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+
+ req.removeAttribute("foo");
+ assertNull(req.getAttribute("foo"));
+ req.removeAttribute(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE);
+
assertNull(req.getAttribute(javax.servlet.RequestDispatcher.ERROR_STATUS_CODE));
+ assertFalse(req.getAttributeNames().hasMoreElements());
+ }
+}
