Skip to content

fix: apply connect timeout to SOCKS5 handshake reads #1100

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
ltsyk wants to merge 2 commits into
base: master
Choose a base branch
from
+10 −6
Open

fix: apply connect timeout to SOCKS5 handshake reads #1100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3996021
fix: apply connect timeout to SOCKS5 handshake reads
ltsyk Jul 30, 2026
18346fb
fix: apply SOCKS5 handshake timeout in async path too
ltsyk Aug 1, 2026
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: 5 additions & 3 deletions httpcore/_async/socks_proxy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ async def _init_socks5_connection(
host: bytes,
port: int,
auth: tuple[bytes, bytes] | None = None,
timeout: float | None = None,
) -> None:
conn = socksio.socks5.SOCKS5Connection()

Expand All @@ -59,7 +60,7 @@ async def _init_socks5_connection(
await stream.write(outgoing_bytes)

# Auth method response
incoming_bytes = await stream.read(max_bytes=4096)
incoming_bytes = await stream.read(max_bytes=4096, timeout=timeout)
response = conn.receive_data(incoming_bytes)
assert isinstance(response, socksio.socks5.SOCKS5AuthReply)
if response.method != auth_method:
Expand All @@ -78,7 +79,7 @@ async def _init_socks5_connection(
await stream.write(outgoing_bytes)

# Username/password response
incoming_bytes = await stream.read(max_bytes=4096)
incoming_bytes = await stream.read(max_bytes=4096, timeout=timeout)
response = conn.receive_data(incoming_bytes)
assert isinstance(response, socksio.socks5.SOCKS5UsernamePasswordReply)
if not response.success:
Expand All @@ -94,7 +95,7 @@ async def _init_socks5_connection(
await stream.write(outgoing_bytes)

# Connect response
incoming_bytes = await stream.read(max_bytes=4096)
incoming_bytes = await stream.read(max_bytes=4096, timeout=timeout)
response = conn.receive_data(incoming_bytes)
assert isinstance(response, socksio.socks5.SOCKS5Reply)
if response.reply_code != socksio.socks5.SOCKS5ReplyCode.SUCCEEDED:
Expand Down Expand Up @@ -237,6 +238,7 @@ async def handle_async_request(self, request: Request) -> Response:
"host": self._remote_origin.host.decode("ascii"),
"port": self._remote_origin.port,
"auth": self._proxy_auth,
"timeout": timeout,
}
async with Trace(
"setup_socks5_connection", logger, request, kwargs
Expand Down
8 changes: 5 additions & 3 deletions httpcore/_sync/socks_proxy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ def _init_socks5_connection(
host: bytes,
port: int,
auth: tuple[bytes, bytes] | None = None,
timeout: float | None = None,
) -> None:
conn = socksio.socks5.SOCKS5Connection()

Expand All @@ -59,7 +60,7 @@ def _init_socks5_connection(
stream.write(outgoing_bytes)

# Auth method response
incoming_bytes = stream.read(max_bytes=4096)
incoming_bytes = stream.read(max_bytes=4096, timeout=timeout)
response = conn.receive_data(incoming_bytes)
assert isinstance(response, socksio.socks5.SOCKS5AuthReply)
if response.method != auth_method:
Expand All @@ -78,7 +79,7 @@ def _init_socks5_connection(
stream.write(outgoing_bytes)

# Username/password response
incoming_bytes = stream.read(max_bytes=4096)
incoming_bytes = stream.read(max_bytes=4096, timeout=timeout)
response = conn.receive_data(incoming_bytes)
assert isinstance(response, socksio.socks5.SOCKS5UsernamePasswordReply)
if not response.success:
Expand All @@ -94,7 +95,7 @@ def _init_socks5_connection(
stream.write(outgoing_bytes)

# Connect response
incoming_bytes = stream.read(max_bytes=4096)
incoming_bytes = stream.read(max_bytes=4096, timeout=timeout)
response = conn.receive_data(incoming_bytes)
assert isinstance(response, socksio.socks5.SOCKS5Reply)
if response.reply_code != socksio.socks5.SOCKS5ReplyCode.SUCCEEDED:
Expand Down Expand Up @@ -237,6 +238,7 @@ def handle_request(self, request: Request) -> Response:
"host": self._remote_origin.host.decode("ascii"),
"port": self._remote_origin.port,
"auth": self._proxy_auth,
"timeout": timeout,
}
with Trace(
"setup_socks5_connection", logger, request, kwargs
Expand Down
Loading