-
Notifications
You must be signed in to change notification settings - Fork 558
[Issue-259] SameSite attribute is not preserved #260
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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
84 changes: 84 additions & 0 deletions
84
src/test/java/org/mitre/dsmiley/httpproxy/CookieSameSiteTest.java
This file contains hidden or 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,84 @@ | ||
| /* | ||
| * Licensed 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.mitre.dsmiley.httpproxy; | ||
|
|
||
| import static org.junit.Assert.assertNotNull; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| import jakarta.servlet.ServletException; | ||
| import jakarta.servlet.http.HttpServlet; | ||
| import jakarta.servlet.http.HttpServletRequest; | ||
| import jakarta.servlet.http.HttpServletResponse; | ||
| import java.io.IOException; | ||
| import org.apache.http.Header; | ||
| import org.apache.http.client.methods.CloseableHttpResponse; | ||
| import org.apache.http.client.methods.HttpGet; | ||
| import org.apache.http.impl.client.CloseableHttpClient; | ||
| import org.apache.http.impl.client.HttpClientBuilder; | ||
| import org.eclipse.jetty.ee10.servlet.ServletContextHandler; | ||
| import org.eclipse.jetty.ee10.servlet.ServletHolder; | ||
| import org.eclipse.jetty.server.Server; | ||
| import org.eclipse.jetty.server.ServerConnector; | ||
| import org.junit.After; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
|
|
||
| public class CookieSameSiteTest { | ||
|
|
||
| private Server server; | ||
| private ServletContextHandler context; | ||
| private int serverPort; | ||
|
|
||
| @Before | ||
| public void setUp() throws Exception { | ||
| server = new Server(0); | ||
| context = new ServletContextHandler(); | ||
| context.setContextPath("/"); | ||
| server.setHandler(context); | ||
| server.start(); | ||
| serverPort = ((ServerConnector) server.getConnectors()[0]).getLocalPort(); | ||
| } | ||
|
|
||
| @After | ||
| public void tearDown() throws Exception { | ||
| server.stop(); | ||
| serverPort = -1; | ||
| } | ||
|
|
||
| @Test | ||
| public void testSameSiteAttributeIsPreserved() throws Exception { | ||
| // Backend returns a cookie with SameSite=Strict | ||
| ServletHolder backendHolder = new ServletHolder(new HttpServlet() { | ||
| @Override | ||
| protected void doGet(HttpServletRequest req, HttpServletResponse resp) | ||
| throws ServletException, IOException { | ||
| resp.addHeader("Set-Cookie", "JSESSIONID=1234; Path=/backend; SameSite=Strict"); | ||
| } | ||
| }); | ||
| context.addServlet(backendHolder, "/backend/*"); | ||
|
|
||
| ServletHolder proxyHolder = context.addServlet(ProxyServlet.class, "/proxy/*"); | ||
| proxyHolder.setInitParameter(ProxyServlet.P_TARGET_URI, | ||
| String.format("http://localhost:%d/backend/", serverPort)); | ||
|
|
||
| HttpGet request = new HttpGet(String.format("http://localhost:%d/proxy/test", serverPort)); | ||
| try (CloseableHttpClient client = HttpClientBuilder.create().disableRedirectHandling().build(); | ||
| CloseableHttpResponse response = client.execute(request)) { | ||
| Header setCookieHeader = response.getFirstHeader("Set-Cookie"); | ||
| assertNotNull("Set-Cookie header must be present", setCookieHeader); | ||
| assertTrue("SameSite attribute must be preserved when proxying cookies", | ||
| setCookieHeader.getValue().contains("SameSite=Strict")); | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://jakartaee.github.io/platform/jakartaee10/JakartaEE10ReleasePlan shows servlet 6 only requires Java 11. But this PR adds Jetty dependencies that elevate to Java 17.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @dsmiley ,
According to https://jetty.org/download.html the lowest jetty version to support servlet 6.0 is jetty 12, which in turn does indeed require Java 17. I don't think that this is a problem, as it is just a test dependency. Another idea would be to use Tomcat 10.1.x, which would support Servlet 6.0 but still Java 11.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See #262.