-
Couldn't load subscription status.
- Fork 1.1k
[GenAI] Fix 11819: updating SimpleHttpRequest.updateCookies to remove existing cookie headers #12147
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
Open
Jarvx
wants to merge
3
commits into
micronaut-projects:4.10.x
Choose a base branch
from
Jarvx:fix-11819
base: 4.10.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+103
−1
Open
[GenAI] Fix 11819: updating SimpleHttpRequest.updateCookies to remove existing cookie headers #12147
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
93 changes: 93 additions & 0 deletions
93
http/src/test/java/io/micronaut/http/cookie/CookieHeaderSingleValueTest.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,93 @@ | ||
| package io.micronaut.http.cookie; | ||
|
|
||
| import io.micronaut.http.HttpHeaders; | ||
| import io.micronaut.http.MutableHttpRequest; | ||
| import io.micronaut.http.cookie.Cookie; | ||
| import io.micronaut.http.client.netty.NettyClientHttpRequestFactory; | ||
| import io.micronaut.http.simple.SimpleHttpRequestFactory; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.LinkedHashSet; | ||
| import java.util.List; | ||
| import java.util.Set; | ||
| import java.util.stream.Collectors; | ||
| import java.util.stream.StreamSupport; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
|
|
||
| public class CookieHeaderSingleValueTest { | ||
|
|
||
| private static final Set<Cookie> COOKIES = new LinkedHashSet<Cookie>() {{ | ||
| add(Cookie.of("a", "1")); | ||
| add(Cookie.of("b", "2")); | ||
| add(Cookie.of("a", "3")); | ||
| }}; | ||
|
|
||
| private static String normalize(String header) { | ||
| if (header == null) { | ||
| return ""; | ||
| } | ||
| // remove all whitespace for deterministic comparison (some implementations include a space after semicolon) | ||
| return header.replaceAll("\\s+", "").trim(); | ||
| } | ||
|
|
||
| private static List<String> headerValues(MutableHttpRequest<?> request, String name) { | ||
| Iterable<String> it = request.getHeaders().getAll(name); | ||
| return StreamSupport.stream(it.spliterator(), false).collect(Collectors.toList()); | ||
| } | ||
|
|
||
| @Test | ||
| public void simpleRequestAddsCookiesIntoSingleHeader() { | ||
| MutableHttpRequest<?> request = new SimpleHttpRequestFactory().get("/"); | ||
| // ensure starting clean | ||
| request.getHeaders().remove(HttpHeaders.COOKIE); | ||
|
|
||
| for (Cookie c : COOKIES) { | ||
| request.cookie(c); | ||
| } | ||
|
|
||
| List<String> all = headerValues(request, HttpHeaders.COOKIE); | ||
| assertEquals(1, all.size(), "Expected exactly one Cookie header value for SimpleHttpRequest"); | ||
|
|
||
| String header = request.getHeaders().get(HttpHeaders.COOKIE); | ||
| assertEquals("a=3;b=2", normalize(header)); | ||
| } | ||
|
|
||
| @Test | ||
| public void nettyClientRequestAddsCookiesIntoSingleHeader() { | ||
| MutableHttpRequest<?> request = new NettyClientHttpRequestFactory().get("/"); | ||
| // ensure starting clean | ||
| request.getHeaders().remove(HttpHeaders.COOKIE); | ||
|
|
||
| for (Cookie c : COOKIES) { | ||
| request.cookie(c); | ||
| } | ||
|
|
||
| List<String> all = headerValues(request, HttpHeaders.COOKIE); | ||
| assertEquals(1, all.size(), "Expected exactly one Cookie header value for NettyClientHttpRequest"); | ||
|
|
||
| String header = request.getHeaders().get(HttpHeaders.COOKIE); | ||
| assertEquals("a=3;b=2", normalize(header)); | ||
| } | ||
|
|
||
| @Test | ||
| public void addingCookiesTwiceKeepsSingleHeaderWithLastValueWin() { | ||
| MutableHttpRequest<?> request = new SimpleHttpRequestFactory().get("/"); | ||
| request.getHeaders().remove(HttpHeaders.COOKIE); | ||
|
|
||
| for (Cookie c : COOKIES) { | ||
| request.cookie(c); | ||
| } | ||
| // add again to exercise mutation | ||
| for (Cookie c : COOKIES) { | ||
| request.cookie(c); | ||
| } | ||
|
|
||
| List<String> all = headerValues(request, HttpHeaders.COOKIE); | ||
| assertEquals(1, all.size(), "Expected exactly one Cookie header value after repeated additions"); | ||
|
|
||
| String header = request.getHeaders().get(HttpHeaders.COOKIE); | ||
| assertEquals("a=3;b=2", normalize(header)); | ||
| } | ||
| } | ||
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.
test should be placed in where other cookie related tests are keep in the
io.micronaut.http.cookiepackage of themicronaut-httpmoduleUh oh!
There was an error while loading. Please reload this page.
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.
Okay. I'll move it to the folder
http/src/test/. Please understand that it's not easy to find perfect test case for me at the moment. I'll need your feedback for this information.