-
Notifications
You must be signed in to change notification settings - Fork 357
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
prevent calling ServletRequest#getInputStream if FILTER_FORWARD_ON_404
Introduce InputStreamWrapper Signed-off-by: jansupol <jan.supol@oracle.com>
- Loading branch information
Showing
9 changed files
with
254 additions
and
221 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
97 changes: 97 additions & 0 deletions
97
...vlet-core/src/test/java/org/glassfish/jersey/servlet/internal/RequestInputStreamTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| /* | ||
| * Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License v. 2.0, which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0. | ||
| * | ||
| * This Source Code may also be made available under the following Secondary | ||
| * Licenses when the conditions for such availability set forth in the | ||
| * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, | ||
| * version 2 with the GNU Classpath Exception, which is available at | ||
| * https://www.gnu.org/software/classpath/license.html. | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 | ||
| */ | ||
|
|
||
| package org.glassfish.jersey.servlet.internal; | ||
|
|
||
| import org.glassfish.jersey.CommonProperties; | ||
| import org.glassfish.jersey.server.ResourceConfig; | ||
| import org.glassfish.jersey.server.ServerProperties; | ||
| import org.glassfish.jersey.servlet.ServletProperties; | ||
| import org.glassfish.jersey.servlet.WebComponent; | ||
| import org.glassfish.jersey.servlet.WebConfig; | ||
| import org.glassfish.jersey.servlet.WebFilterConfig; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import javax.servlet.FilterConfig; | ||
| import javax.servlet.ServletContext; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
| import java.io.IOException; | ||
| import java.lang.reflect.InvocationHandler; | ||
| import java.lang.reflect.Method; | ||
| import java.lang.reflect.Proxy; | ||
| import java.net.URI; | ||
| import java.util.Collections; | ||
| import java.util.Enumeration; | ||
|
|
||
| public class RequestInputStreamTest { | ||
| @Test | ||
| public void test404RequestInputStream() throws ServletException, IOException { | ||
| InvocationHandler handler = new InvocationHandler() { | ||
| @Override | ||
| public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { | ||
| switch (method.getName()) { | ||
| case "getHeaderNames": | ||
| return Collections.emptyEnumeration(); | ||
| case "getInputStream": | ||
| throw new IllegalStateException("ServletRequest#getInputStream clashes with ServletRequest#getReader"); | ||
| } | ||
| return null; | ||
| } | ||
| }; | ||
|
|
||
| FilterConfig filterConfig = new FilterConfig() { | ||
| @Override | ||
| public String getFilterName() { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public ServletContext getServletContext() { | ||
| return (ServletContext) Proxy.newProxyInstance(getClass().getClassLoader(), | ||
| new Class[]{ServletContext.class}, | ||
| handler); | ||
| } | ||
|
|
||
| @Override | ||
| public String getInitParameter(String name) { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public Enumeration<String> getInitParameterNames() { | ||
| return null; | ||
| } | ||
| }; | ||
| WebConfig dummyWebConfig = new WebFilterConfig(filterConfig); | ||
| ResourceConfig resourceConfig = new ResourceConfig() | ||
| .property(CommonProperties.PROVIDER_DEFAULT_DISABLE, "ALL") | ||
| .property(ServerProperties.WADL_FEATURE_DISABLE, true) | ||
| .property(ServletProperties.FILTER_FORWARD_ON_404, true) | ||
| .property(ServerProperties.RESPONSE_SET_STATUS_OVER_SEND_ERROR, true); | ||
| WebComponent component = new WebComponent(dummyWebConfig, resourceConfig); | ||
| component.service(URI.create("http://localhost"), URI.create("http://localhost"), | ||
| (HttpServletRequest) Proxy.newProxyInstance(getClass().getClassLoader(), | ||
| new Class[] {HttpServletRequest.class}, | ||
| handler | ||
| ), | ||
| (HttpServletResponse) Proxy.newProxyInstance(getClass().getClassLoader(), | ||
| new Class[]{HttpServletResponse.class}, | ||
| handler) | ||
| ); | ||
| } | ||
| } |
Oops, something went wrong.