Fix parsing of JSESSIONID only #10479
Merged
Conversation
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
joakime
approved these changes
Sep 14, 2023
There was a problem hiding this comment.
Wish we would use @Deprecated better, especially considering what the javadoc for that annotation says.
jetty-core/jetty-session/src/main/java/org/eclipse/jetty/session/AbstractSessionManager.java
Outdated
Show resolved
Hide resolved
jetty-core/jetty-session/src/main/java/org/eclipse/jetty/session/AbstractSessionManager.java
Outdated
Show resolved
Hide resolved
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
|
@joakime oops I dismissed your review accidentally after accepting your suggestions! |
janbartel
requested changes
Sep 15, 2023
jetty-core/jetty-session/src/main/java/org/eclipse/jetty/session/AbstractSessionManager.java
Outdated
Show resolved
Hide resolved
jetty-core/jetty-session/src/main/java/org/eclipse/jetty/session/AbstractSessionManager.java
Outdated
Show resolved
Hide resolved
jetty-core/jetty-session/src/main/java/org/eclipse/jetty/session/AbstractSessionManager.java
Outdated
Show resolved
Hide resolved
jetty-core/jetty-session/src/main/java/org/eclipse/jetty/session/AbstractSessionManager.java
Outdated
Show resolved
Hide resolved
jetty-core/jetty-session/src/main/java/org/eclipse/jetty/session/AbstractSessionManager.java
Outdated
Show resolved
Hide resolved
jetty-ee9/jetty-ee9-nested/src/test/java/org/eclipse/jetty/ee9/nested/SessionHandlerTest.java
Show resolved
Hide resolved
Co-authored-by: Jan Bartel <janb@webtide.com>
janbartel
reviewed
Sep 15, 2023
| if (!session.getId().equals(getSessionIdManager().getId(id))) | ||
| { | ||
| if (LOG.isDebugEnabled()) | ||
| LOG.debug("Multiple different valid session ids: {}, {}", requestedSessionId, id); |
There was a problem hiding this comment.
I think you've got all the info to be able to output the source of the ids, isn't it something like:
LOG.debug("Multiple different valid session ids: {} from cookie {}, {} from cookie {}", requestedSessionId, requestedSessionIdFromCookie, id, i < cookieIds);
And similar for the other DEBUG log messages.
joakime
approved these changes
Sep 15, 2023
better debug and exception messages
janbartel
approved these changes
Sep 18, 2023
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
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.
Improve the parsing of jsessionid parameters and unify with handling of JSESSIONID.
More tests added.