Issue #12429 - case-insensitive headers for websocket #12441
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
Signed-off-by: Lachlan Roberts <[email protected]>
gregw
requested changes
Oct 30, 2024
jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
Outdated
Show resolved
Hide resolved
...ain/java/org/eclipse/jetty/websocket/client/internal/DelegatedJettyClientUpgradeRequest.java
Outdated
Show resolved
Hide resolved
...server/src/main/java/org/eclipse/jetty/websocket/server/internal/UpgradeRequestDelegate.java
Show resolved
Hide resolved
Signed-off-by: Lachlan Roberts <[email protected]>
Signed-off-by: Lachlan Roberts <[email protected]>
Signed-off-by: Lachlan Roberts <[email protected]>
Signed-off-by: Lachlan Roberts <[email protected]>
|
@gregw @joakime I have changed it so that the I have also reviewed the error handling for the |
gregw
requested changes
Oct 31, 2024
jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpFieldsMap.java
Outdated
Show resolved
Hide resolved
jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
Outdated
Show resolved
Hide resolved
jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Lachlan Roberts <[email protected]>
…Fields Signed-off-by: Lachlan Roberts <[email protected]>
gregw
requested changes
Nov 1, 2024
jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Lachlan Roberts <[email protected]>
gregw
previously approved these changes
Nov 1, 2024
sbordet
requested changes
Nov 4, 2024
...-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/ServerWebSocketContainer.java
Outdated
Show resolved
Hide resolved
...erver/src/main/java/org/eclipse/jetty/websocket/server/internal/UpgradeResponseDelegate.java
Outdated
Show resolved
Hide resolved
...in/java/org/eclipse/jetty/ee10/websocket/jakarta/server/JakartaWebSocketServerContainer.java
Show resolved
Hide resolved
...n/java/org/eclipse/jetty/ee10/websocket/jakarta/server/internal/JakartaWebSocketCreator.java
Outdated
Show resolved
Hide resolved
.../java/org/eclipse/jetty/ee10/websocket/jakarta/tests/client/AnnotatedClientEndpointTest.java
Outdated
Show resolved
Hide resolved
...ain/java/org/eclipse/jetty/ee9/websocket/jakarta/server/JakartaWebSocketServerContainer.java
Show resolved
Hide resolved
...in/java/org/eclipse/jetty/ee9/websocket/jakarta/server/internal/JakartaWebSocketCreator.java
Outdated
Show resolved
Hide resolved
...t/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/client/AnnotatedClientEndpointTest.java
Outdated
Show resolved
Hide resolved
...rver/src/main/java/org/eclipse/jetty/ee9/websocket/server/JettyWebSocketServerContainer.java
Outdated
Show resolved
Hide resolved
...rver/src/main/java/org/eclipse/jetty/ee9/websocket/server/JettyWebSocketServerContainer.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Lachlan Roberts <[email protected]>
sbordet
requested changes
Nov 6, 2024
Signed-off-by: Lachlan Roberts <[email protected]>
sbordet
requested changes
Nov 8, 2024
| cb.failed(t); | ||
| if (LOG.isDebugEnabled()) | ||
| LOG.debug("Could not create WebSocket endpoint", t); | ||
| Response.writeError(req, resp, cb, HttpStatus.INTERNAL_SERVER_ERROR_500, "Could not create WebSocket endpoint"); |
There was a problem hiding this comment.
Can you check whether cb.failed() is enough, because the javadocs of creator.createWebSocket() say to use JettyServerUpgradeResponse. sendError().
There was a problem hiding this comment.
I think cb.failed() is probably better. This will result in the JettyWebSocketServerContainer#upgrade throwing, which can be caught and handled by their application, or if its not caught will result in a sendError() anyway.
...server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/CreatorNegotiator.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Lachlan Roberts <[email protected]>
gregw
approved these changes
Nov 8, 2024
sbordet
approved these changes
Nov 8, 2024
lachlan-roberts
deleted the
jetty-12.0.x-12429-caseInsensitiveHeadersWebSocket
branch
lachlan-roberts
added a commit
that referenced
this pull request
Nov 12, 2024
Signed-off-by: Lachlan Roberts <[email protected]>
lachlan-roberts
added a commit
that referenced
this pull request
Nov 12, 2024
Signed-off-by: Lachlan Roberts <[email protected]>
lachlan-roberts
added a commit
that referenced
this pull request
Nov 15, 2024
…veHeadersWebSocket2 WebSocket cleanups from PR #12441
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in 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 #12429
Add a new static method
HttpFields.asMap(HttpFields fields)and use it everywhere in WebSocket where theHttpFieldsare converted into aMap<String, List<String>>so that the headers in the map are treated as case-insensitive.