Skip to content

Implement SOCKS proxy functionality #375

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
Merged
merged 27 commits into from
Jun 18, 2021
Merged

Implement SOCKS proxy functionality #375

merged 27 commits into from
Jun 18, 2021

Conversation

Davidde94
Copy link
Collaborator

@Davidde94 Davidde94 commented Jun 16, 2021 •
edited
Loading

Add a new Proxy type to enable a HTTPClient to send requests via a SOCKSv5 Proxy server.

@Davidde94 Davidde94 marked this pull request as draft June 16, 2021 13:28
@Davidde94 Davidde94 marked this pull request as ready for review June 16, 2021 19:01
@fabianfett fabianfett mentioned this pull request Jun 16, 2021
Merged
Lukasa
Lukasa requested changes Jun 17, 2021
View reviewed changes
Copy link
Collaborator

@Lukasa Lukasa left a comment

Choose a reason for hiding this comment

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

Cool, looking good! Some notes in the diff.

@Davidde94 Davidde94 requested a review from Lukasa June 17, 2021 14:14
@Davidde94
Copy link
Collaborator Author

@swift-server-bot test this please

@Lukasa Lukasa requested a review from PeterAdams-A June 17, 2021 15:28
@Davidde94 Davidde94 requested a review from Lukasa June 17, 2021 16:09
PeterAdams-A
PeterAdams-A approved these changes Jun 18, 2021
View reviewed changes
Copy link
Collaborator

@PeterAdams-A PeterAdams-A left a comment

Choose a reason for hiding this comment

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

A few minor comments but looks generally OK to me.

fabianfett
fabianfett reviewed Jun 18, 2021
View reviewed changes
Sources/AsyncHTTPClient/HTTPHandler.swift
Comment on lines +345 to +346
public struct Authorization: Hashable {
private enum Scheme: Hashable {
Copy link
Member

Choose a reason for hiding this comment

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

Why was this added?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Getting equatable conformance on the internal Proxy Type enum.

Lukasa
Lukasa requested changes Jun 18, 2021
View reviewed changes
Copy link
Collaborator

@Lukasa Lukasa left a comment

Choose a reason for hiding this comment

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

Cool, a few cleanups needed here.

@Davidde94 Davidde94 requested a review from Lukasa June 18, 2021 11:14
Lukasa
Lukasa approved these changes Jun 18, 2021
View reviewed changes
Copy link
Collaborator

@Lukasa Lukasa left a comment

Choose a reason for hiding this comment

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

Ok, this LGTM. Let's get a swift-nio-extras release out the door and we can move forward here.

@Lukasa Lukasa added the 🆕 semver/minor Adds new public API. label Jun 18, 2021
@Davidde94
Copy link
Collaborator Author

@swift-server-bot test this please

Lukasa
Lukasa reviewed Jun 18, 2021
View reviewed changes
fabianfett
fabianfett reviewed Jun 18, 2021
View reviewed changes
Tests/AsyncHTTPClientTests/HTTPClientTests.swift Outdated
@@ -22,6 +22,7 @@ import NIOConcurrencyHelpers
import NIOFoundationCompat
import NIOHTTP1
import NIOHTTPCompression
import NIOSOCKS
Copy link
Member

Choose a reason for hiding this comment

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

I don't think we need this here :)

fabianfett
fabianfett approved these changes Jun 18, 2021
View reviewed changes
Copy link
Member

@fabianfett fabianfett left a comment

Choose a reason for hiding this comment

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

Thanks! Looks awesome!

@Davidde94 Davidde94 merged commit 3fd0658 into swift-server:main Jun 18, 2021
@Davidde94 Davidde94 deleted the de/socks-client branch June 18, 2021 12:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Lukasa Lukasa Lukasa approved these changes

@fabianfett fabianfett fabianfett approved these changes

@PeterAdams-A PeterAdams-A PeterAdams-A approved these changes

Assignees
No one assigned
Labels
🆕 semver/minor Adds new public API.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Davidde94 @Lukasa @fabianfett @PeterAdams-A