Skip to content

Fix query truncation in WebSocket.connect #173

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix query truncation in WebSocket.connect #173

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion websock/websock.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,15 @@ proc connect*(
if uri.port.len <= 0:
uri.port = if secure: "443" else: "80"

let pathQuery =
Copy link
Member

Choose a reason for hiding this comment

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

would $uri work here? It should reconstruct the whole uri (including logins etc)

Copy link
Author

Choose a reason for hiding this comment

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

I don't think so. This string will eventually get passed to HttpClient.request and used in generateHeaders, which only uses the path and query parts of the Uri.

Copy link
Author

Choose a reason for hiding this comment

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

Actually, I misunderstood the question. It should work, it just would be equivalent to {path}?{query} with the current implementation of all the other stuff. But {path}?{query} is a smaller deviation IMO.

Copy link
Contributor

Choose a reason for hiding this comment

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

please rebase and add a test case.

if uri.query.len == 0:
uri.path
else:
uri.path & "?" & uri.query

return WebSocket.connect(
host = uri.hostname & ":" & uri.port,
path = uri.path,
path = pathQuery,
hostName = uri.hostname,
protocols = protocols,
factories = factories,
Expand Down