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.

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

feat: Add support for SOCKS4 (#610) #2400

Merged
merged 2 commits into from
Sep 9, 2024
Merged

Conversation

Jaltaire
Copy link
Contributor

This adds support for SOCKS4 proxies, implementing #610.

@Jaltaire
Copy link
Contributor Author

Added a simple example here to test that everything works as expected: https://github.com/Jaltaire/reqwest/blob/examples/examples/socks4.rs.

We can merge this too, if desired.

@Jaltaire
Copy link
Contributor Author

Also added a bump of tokio-socks to 0.5.2 since 0.5.2 makes SOCKS4 implementation feature-complete: https://github.com/sticnarf/tokio-socks/releases/tag/v0.5.2.

@Jaltaire
Copy link
Contributor Author

Jaltaire commented Sep 3, 2024

@seanmonstar Would you mind taking a look at this?

@Jaltaire Jaltaire force-pushed the master branch 2 times, most recently from b0dd83b to e67902f Compare September 9, 2024 07:50
@seanmonstar
Copy link
Owner

Thanks for working on this! Looks good, I'll start CI :)

@Jaltaire
Copy link
Contributor Author

Jaltaire commented Sep 9, 2024

My pleasure. :)

@seanmonstar, I just re-pushed with the cargo fmt fixes. Would you mind re-running the CI?

@Jaltaire
Copy link
Contributor Author

Jaltaire commented Sep 9, 2024

error: package `tokio-util v0.7.12` cannot be built because it requires rustc 1.70 or newer, while the currently active rustc version is 1.63.0

This doesn't seem to be related to my changes from what I can tell... Running cargo msrv even without my changes determines the MSRV to be 1.70.0. Perhaps previous CI jobs have been successful if there's some transitive dependency that's not pinned to a particular version and has been updated since? (Admittedly, I have not yet delved much into cargo dependency conflict resolution, so maybe something else at play of which I'm unaware.)

@seanmonstar How would you like to handle this? Can we bump to rust-version = "1.70.0"?

@seanmonstar
Copy link
Owner

I'll take care of it in #2412

@Jaltaire
Copy link
Contributor Author

Jaltaire commented Sep 9, 2024

@seanmonstar Just rebased off your change. Can you kick off CI again?

@seanmonstar seanmonstar merged commit 09884ed into seanmonstar:master Sep 9, 2024
36 checks passed
@Jaltaire
Copy link
Contributor Author

@seanmonstar, many thanks for helping get this through today.
Can you cut a new release version? I'm eager to use this change once you do. :)

kodiakhq bot pushed a commit to pdylanross/fatigue that referenced this pull request Oct 1, 2024
Bumps reqwest from 0.12.7 to 0.12.8.

Release notes
Sourced from reqwest's releases.

v0.12.8
What's Changed

Add support for SOCKS4 proxies.
Add multipart::Form::file() method for adding files easily.
Add Body::wrap() to wrap any http_body::Body type.
Fix the pool configuration to use a timer to remove expired connections.

New Contributors

@​workingjubilee made their first contribution in seanmonstar/reqwest#2402
@​NaokiM03 made their first contribution in seanmonstar/reqwest#2106
@​Xuanwo made their first contribution in seanmonstar/reqwest#2255
@​Jaltaire made their first contribution in seanmonstar/reqwest#2400
@​Hyask made their first contribution in seanmonstar/reqwest#2418
@​Jake-Shadle made their first contribution in seanmonstar/reqwest#2427
@​RobMor made their first contribution in seanmonstar/reqwest#2434

Full Changelog: seanmonstar/[email protected]



Changelog
Sourced from reqwest's changelog.

v0.12.8

Add support for SOCKS4 proxies.
Add multipart::Form::file() method for adding files easily.
Add Body::wrap() to wrap any http_body::Body type.
Fix the pool configuration to use a timer to remove expired connections.




Commits

95fec09 v0.12.8
baf9712 fix: pass pool_timer to hyper_util to enable the idle cleanup task (#2434)
d85f44b Bump rustls-native-certs (#2427)
c8665be tests: use a documented test network for testing
964b1c6 tests: bypass the proxy when testing timeouts
09884ed feat: Add support for SOCKS4 (#610) (#2400)
a13a6bc ci: pin tokio-util for msrv job (#2412)
4cc8ec8 feat: Expose streaming as public API wrap (#2255)
cc3dd51 Add file function to async::multipart (#2106)
193ed1f chore: Depend on wasm-bindgen 0.2.89 or higher
See full diff in compare view




Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

@dependabot rebase will rebase this PR
@dependabot recreate will recreate this PR, overwriting any edits that have been made to it
@dependabot merge will merge this PR after your CI passes on it
@dependabot squash and merge will squash and merge this PR after your CI passes on it
@dependabot cancel merge will cancel a previously requested merge and block automerging
@dependabot reopen will reopen this PR if it is closed
@dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
@dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
@dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
@dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
@dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Nutomic pushed a commit to Nutomic/reqwest that referenced this pull request Nov 7, 2024
* feat: Add support for SOCKS4 (seanmonstar#610)

* chore: bump tokio-socks to 0.5.2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants