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

SOCKS4/4a/5 proxy support in SocketsHttpHandler #48883

Merged
merged 62 commits into from
Apr 22, 2021
Merged

SOCKS4/4a/5 proxy support in SocketsHttpHandler #48883

merged 62 commits into from
Apr 22, 2021

Commits on Feb 27, 2021

  1. Separate method for proxy scheme validation.

    @huoyaoyuan
    huoyaoyuan committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    5f2407a View commit details
    Browse the repository at this point in the history

  2. Pass socks connection kind.

    @huoyaoyuan
    huoyaoyuan committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    7a70c33 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2021

  1. Unauthorized socks5 connection.

    @huoyaoyuan
    huoyaoyuan committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    d0aa8fc View commit details
    Browse the repository at this point in the history

  2. Username and password auth.

    @huoyaoyuan
    huoyaoyuan committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    b091355 View commit details
    Browse the repository at this point in the history

  3. Fix response address.

    @huoyaoyuan
    huoyaoyuan committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    98a1d12 View commit details
    Browse the repository at this point in the history

  4. Fix proxyUri value and assertion.

    @huoyaoyuan
    huoyaoyuan committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    c4cdd8e View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2021

  1. Use HttpConnectionKind for SOCKS.

    @huoyaoyuan
    huoyaoyuan committed Mar 1, 2021
    Configuration menu
    Copy the full SHA
    b5e3701 View commit details
    Browse the repository at this point in the history

  2. Handle more connection kind assertions.

    @huoyaoyuan
    huoyaoyuan committed Mar 1, 2021
    Configuration menu
    Copy the full SHA
    15b2a8f View commit details
    Browse the repository at this point in the history

  3. SOCKS4/4a support.

    @huoyaoyuan
    huoyaoyuan committed Mar 1, 2021
    Configuration menu
    Copy the full SHA
    56bf28b View commit details
    Browse the repository at this point in the history

  4. Move version selection into SocksHelper.

    @huoyaoyuan
    huoyaoyuan committed Mar 1, 2021
    Configuration menu
    Copy the full SHA
    a2a80f7 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2021

  1. Call sync version of read write.

    @huoyaoyuan
    huoyaoyuan committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    1d7fa76 View commit details
    Browse the repository at this point in the history

  2. Cancellation by disposing stream.

    @huoyaoyuan
    huoyaoyuan committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    44cce2e View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2021

  1. Dispose cancellation registration.

    @huoyaoyuan
    huoyaoyuan committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    140bbc1 View commit details
    Browse the repository at this point in the history

  2. IP addressing for SOCKS5.

    @huoyaoyuan
    huoyaoyuan committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    694b869 View commit details
    Browse the repository at this point in the history

  3. IP addressing for SOCKS4.

    @huoyaoyuan
    huoyaoyuan committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    e68224a View commit details
    Browse the repository at this point in the history

  4. Wrap write method.

    @huoyaoyuan
    huoyaoyuan committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    24e1e2d View commit details
    Browse the repository at this point in the history

  5. Cancellation and optimization.

    @huoyaoyuan
    huoyaoyuan committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    d1a8eae View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2021

  1. Optimize.

    @huoyaoyuan
    huoyaoyuan committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    7836231 View commit details
    Browse the repository at this point in the history

  2. Apply suggestions from code review 

    Co-authored-by: Miha Zupan <mihazupan.zupan1@gmail.com>
    @huoyaoyuan @MihaZupan
    huoyaoyuan and MihaZupan committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    da3ef58 View commit details
    Browse the repository at this point in the history

  3. Clarify logic.

    @huoyaoyuan
    huoyaoyuan committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    7371407 View commit details
    Browse the repository at this point in the history

  4. Remove ssl assertion.

    @huoyaoyuan
    huoyaoyuan committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    c007769 View commit details
    Browse the repository at this point in the history

  5. SocksException.

    @huoyaoyuan
    huoyaoyuan committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    0517a87 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2021

  1. Make SocksException derive from IOException.

    @huoyaoyuan
    huoyaoyuan committed Mar 6, 2021
    Configuration menu
    Copy the full SHA
    ca9babe View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2021

  1. Use binary primitives to write port in BE.

    @huoyaoyuan
    huoyaoyuan committed Mar 11, 2021
    Configuration menu
    Copy the full SHA
    50a723a View commit details
    Browse the repository at this point in the history

  2. Socks loopback test.

    @huoyaoyuan
    huoyaoyuan committed Mar 11, 2021
    Configuration menu
    Copy the full SHA
    3b6eb5f View commit details
    Browse the repository at this point in the history

  3. Expand test matrix.

    @huoyaoyuan
    huoyaoyuan committed Mar 11, 2021
    Configuration menu
    Copy the full SHA
    4882181 View commit details
    Browse the repository at this point in the history

  4. Try to solve certificate issue.

    @huoyaoyuan
    huoyaoyuan committed Mar 11, 2021
    Configuration menu
    Copy the full SHA
    5d21f2b View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2021

  1. Pass handler to httpclient.

    @huoyaoyuan
    huoyaoyuan committed Mar 16, 2021
    Configuration menu
    Copy the full SHA
    5ef161c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into socks-proxy

    @huoyaoyuan
    huoyaoyuan committed Mar 16, 2021
    Configuration menu
    Copy the full SHA
    2df3d41 View commit details
    Browse the repository at this point in the history

  3. Update ConnectToTcpHostAsync.

    @huoyaoyuan
    huoyaoyuan committed Mar 16, 2021
    Configuration menu
    Copy the full SHA
    87ef694 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2021

  1. Merge branch 'main' into socks-proxy

    @MihaZupan
    MihaZupan committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    4462be5 View commit details
    Browse the repository at this point in the history

  2. Remove custom self-signed cert use from Socks test

    @MihaZupan
    MihaZupan committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    b487d1f View commit details
    Browse the repository at this point in the history

  3. Fix LoopbackSocksServer's parsing of Socks4a domain name

    @MihaZupan
    MihaZupan committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    de78efc View commit details
    Browse the repository at this point in the history

  4. Only set RequestVersionExact for H2C 

    Setting it in general breaks H2 => H1.1 downgrade on platforms without ALPN
    @MihaZupan
    MihaZupan committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    df1d77f View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2021

  1. Merge branch 'main' into socks-proxy

    @MihaZupan
    MihaZupan committed Apr 6, 2021
    Configuration menu
    Copy the full SHA
    f9465b5 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2021

  1. Add auth test.

    @huoyaoyuan
    huoyaoyuan committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    ee02582 View commit details
    Browse the repository at this point in the history

  2. Add IP in test matrix.

    @huoyaoyuan
    huoyaoyuan committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    efc32b8 View commit details
    Browse the repository at this point in the history

  3. Only override host when required.

    @huoyaoyuan
    huoyaoyuan committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    ddb2f8d View commit details
    Browse the repository at this point in the history

  4. Don't attempt NT Auth for Socks proxies

    @MihaZupan
    MihaZupan committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    e30ee4e View commit details
    Browse the repository at this point in the history

  5. Skip HTTP2 ssl test on platforms without ALPN support

    @MihaZupan
    MihaZupan committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    7b68507 View commit details
    Browse the repository at this point in the history

  6. Use NetworkCredential directly

    @MihaZupan
    MihaZupan committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    dfb737c View commit details
    Browse the repository at this point in the history

  7. Pass AddressFamily to sync Dns resolution too

    @MihaZupan
    MihaZupan committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    1bd2c0e View commit details
    Browse the repository at this point in the history

  8. Consistently check encoded string lengths

    @MihaZupan
    MihaZupan committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    5c26033 View commit details
    Browse the repository at this point in the history

  9. Fix Socks5 user/pass auth

    @MihaZupan
    MihaZupan committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    1308e14 View commit details
    Browse the repository at this point in the history

  10. Add IPv6 test for socks5

    @MihaZupan
    MihaZupan committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    76b61ce View commit details
    Browse the repository at this point in the history

  11. Exception nits

    @MihaZupan
    MihaZupan committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    54bde51 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2021

  1. Add exceptional tests.

    @huoyaoyuan
    huoyaoyuan committed Apr 8, 2021
    Configuration menu
    Copy the full SHA
    4d7a545 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2021

  1. Merge branch 'main'

    @huoyaoyuan
    huoyaoyuan committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    7a7bae0 View commit details
    Browse the repository at this point in the history

  2. Fix exceptional test.

    @huoyaoyuan
    huoyaoyuan committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    1e5cde4 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2021

  1. Fix NRT compilation 

    Co-authored-by: Miha Zupan <mihazupan.zupan1@gmail.com>
    @huoyaoyuan @MihaZupan
    huoyaoyuan and MihaZupan committed Apr 13, 2021
    Configuration menu
    Copy the full SHA
    8bbb9e8 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2021

  1. Server shouldn't wait for request in exceptional test.

    @huoyaoyuan
    huoyaoyuan committed Apr 15, 2021
    Configuration menu
    Copy the full SHA
    32a36b5 View commit details
    Browse the repository at this point in the history

  2. Add exception message to test.

    @huoyaoyuan
    huoyaoyuan committed Apr 15, 2021
    Configuration menu
    Copy the full SHA
    9ed3686 View commit details
    Browse the repository at this point in the history

  3. Update auth failure handling.

    @huoyaoyuan
    huoyaoyuan committed Apr 15, 2021
    Configuration menu
    Copy the full SHA
    e70eb62 View commit details
    Browse the repository at this point in the history

  4. SOCKS4 and 5 uses different auth model, requires different error mess… 

    …age.
    @huoyaoyuan
    huoyaoyuan committed Apr 15, 2021
    Configuration menu
    Copy the full SHA
    c79979c View commit details
    Browse the repository at this point in the history

  5. Revert accidental indent change.

    @huoyaoyuan
    huoyaoyuan committed Apr 15, 2021
    Configuration menu
    Copy the full SHA
    bca15fa View commit details
    Browse the repository at this point in the history

  6. Expand test matrix to include Sync HTTP1

    @MihaZupan
    MihaZupan committed Apr 15, 2021
    Configuration menu
    Copy the full SHA
    0ae546d View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2021

  1. Read received bytes before returning error response in Socks4 loopback

    @MihaZupan
    MihaZupan committed Apr 16, 2021
    Configuration menu
    Copy the full SHA
    b06f145 View commit details
    Browse the repository at this point in the history

  2. Use named bool arguments

    @MihaZupan
    MihaZupan committed Apr 16, 2021
    Configuration menu
    Copy the full SHA
    7f20191 View commit details
    Browse the repository at this point in the history

  3. Improve exception messages

    @MihaZupan
    MihaZupan committed Apr 16, 2021
    Configuration menu
    Copy the full SHA
    2ff779a View commit details
    Browse the repository at this point in the history

  4. !IsEmpty => Length != 0

    @MihaZupan
    MihaZupan committed Apr 16, 2021
    Configuration menu
    Copy the full SHA
    c08e717 View commit details
    Browse the repository at this point in the history

  5. Improve exception messages 2

    @MihaZupan
    MihaZupan committed Apr 16, 2021
    Configuration menu
    Copy the full SHA
    52df362 View commit details
    Browse the repository at this point in the history

  6. Avoid enforing Socks4 VN value

    @MihaZupan
    MihaZupan committed Apr 16, 2021
    Configuration menu
    Copy the full SHA
    95400e2 View commit details
    Browse the repository at this point in the history