Issue #5868 - allow request attributes to be set in websocket upgrade #5935
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
…dshake Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
gregw
requested changes
Feb 8, 2021
...-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeRequest.java
Show resolved
Hide resolved
| @Override | ||
| public String getRequestedSessionId() | ||
| { | ||
| throw new UnsupportedOperationException(UNSUPPORTED_WITH_WEBSOCKET_UPGRADE); | ||
| throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE); |
There was a problem hiding this comment.
All these methods could use the request object while not null and only throw once it is null.
| @@ -400,13 +406,17 @@ public String getRemoteHost() | |||
| @Override | |||
| public void setAttribute(String name, Object value) | |||
| { | |||
| throw new UnsupportedOperationException(UNSUPPORTED_WITH_WEBSOCKET_UPGRADE); | |||
| if (request == null) | |||
| throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE); | |||
There was a problem hiding this comment.
This is not what the OP requested. If request is null, then the attribute needs to be removed from the copy of the attributes.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
|
@lachlan-roberts don't forget to set labels, projects, linked issues, etc ... |
gregw
approved these changes
Feb 9, 2021
This was
linked to
issues
Feb 9, 2021
lachlan-roberts
deleted the
jetty-10.0.x-5868-WSUpgradeRequestResponse
branch
# 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.
Issue #5868 & #5865
We now remove references to the
HttpServletRequestandHttpServletResponseafter the websocket upgrade, and allow access to the request attribute setters during and after the websocket upgrade.After the upgrade all relevant information from the request & response are copied locally into
UpgradeHttpServletRequestandUpgradeHttpServletResponsebefore they are recycled.