Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Issue #6407 - Fix URI validation for WebSocket ClientUpgradeRequest #6411

Merged
merged 3 commits into from Jun 23, 2021
Merged

Issue #6407 - Fix URI validation for WebSocket ClientUpgradeRequest #6411

merged 3 commits into from Jun 23, 2021

Conversation

lachlan-roberts
Copy link
Contributor

Closes #6407

  • Fix logic for URI validation in the constructor of ClientUpgradeRequest.
  • Deprecate that constructor as the URI is not used and the validation is repeated after calling the WebSocketClient.connect() method.

@lachlan-roberts
Issue #6407 - fix logic in ClientUpgradeRequest(URI) constructor and …
148cf38 
…deprecate it

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
@lachlan-roberts
add javadoc and null check for HttpScheme
10ed23f 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
sbordet
sbordet requested changes Jun 15, 2021
View reviewed changes
Copy link
Contributor

@sbordet sbordet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One last nit.

...cket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java Outdated Show resolved Hide resolved
@lachlan-roberts
fix javadoc for ClientUpgradeRequest
402d79f 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
@lachlan-roberts lachlan-roberts force-pushed the jetty-10.0.x-6407-ClientUpgradeRequestUri branch from db279b8 to 402d79f Compare June 15, 2021 15:00
joakime
joakime previously requested changes Jun 15, 2021
View reviewed changes
Copy link
Contributor

@joakime joakime left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should remove all of requestURI internals from ClientUpgradeRequest, and deprecate the constructor and getters.

...cket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java Show resolved Hide resolved
@gregw gregw added this to In progress in Jetty 10.0.6/11.0.6 FROZEN via automation Jun 21, 2021
@joakime joakime dismissed their stale review June 22, 2021 15:49

Concerns were answered to satisfaction.

Jetty 10.0.6/11.0.6 FROZEN automation moved this from In progress to Reviewer approved Jun 22, 2021
@lachlan-roberts lachlan-roberts merged commit 1cd0093 into jetty-10.0.x Jun 23, 2021
Jetty 10.0.6/11.0.6 FROZEN automation moved this from Reviewer approved to Done Jun 23, 2021
@lachlan-roberts lachlan-roberts deleted the jetty-10.0.x-6407-ClientUpgradeRequestUri branch June 23, 2021 00:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbordet sbordet sbordet approved these changes

@joakime joakime Awaiting requested review from joakime

Assignees
No one assigned
Labels
None yet
Projects
No open projects
Jetty 10.0.6/11.0.6 FROZEN
  
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Malformed scheme logical expression check in WebSocket ClientUpgradeRequest
3 participants
@lachlan-roberts @joakime @sbordet