Skip to content

added timeouts to socks5 connection initialization #1017

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 5 commits into
base: master
Choose a base branch
from
Open

added timeouts to socks5 connection initialization #1017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
553e3e6
Update socks_proxy.py
Brranton Jun 6, 2025
fb0b478
Update socks_proxy.py
Brranton Jun 6, 2025
aec7644
Update socks_proxy.py
Brranton Jun 6, 2025
b92d663
Update socks_proxy.py
Brranton Jun 6, 2025
8407d7a
Update socks_proxy.py
Brranton Jun 6, 2025
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
16 changes: 10 additions & 6 deletions httpcore/_async/socks_proxy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ async def _init_socks5_connection(
host: bytes,
port: int,
auth: tuple[bytes, bytes] | None = None,
init_timeouts: tuple[float, float] | None = None,
) -> None:
read_timeout, write_timeout = init_timeouts or (None, None)
conn = socksio.socks5.SOCKS5Connection()

# Auth method request
Expand All @@ -56,10 +58,10 @@ async def _init_socks5_connection(
)
conn.send(socksio.socks5.SOCKS5AuthMethodsRequest([auth_method]))
outgoing_bytes = conn.data_to_send()
await stream.write(outgoing_bytes)
await stream.write(outgoing_bytes, timeout=write_timeout)

# Auth method response
incoming_bytes = await stream.read(max_bytes=4096)
incoming_bytes = await stream.read(max_bytes=4096, timeout=read_timeout)
response = conn.receive_data(incoming_bytes)
assert isinstance(response, socksio.socks5.SOCKS5AuthReply)
if response.method != auth_method:
Expand All @@ -75,10 +77,10 @@ async def _init_socks5_connection(
username, password = auth
conn.send(socksio.socks5.SOCKS5UsernamePasswordRequest(username, password))
outgoing_bytes = conn.data_to_send()
await stream.write(outgoing_bytes)
await stream.write(outgoing_bytes, timeout=write_timeout)

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

# Connect response
incoming_bytes = await stream.read(max_bytes=4096)
incoming_bytes = await stream.read(max_bytes=4096, timeout=read_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 @@ -217,6 +219,7 @@ async def handle_async_request(self, request: Request) -> Response:
timeouts = request.extensions.get("timeout", {})
sni_hostname = request.extensions.get("sni_hostname", None)
timeout = timeouts.get("connect", None)
init_timeouts = timeouts.get("read", None), timeouts.get("write", None)

async with self._connect_lock:
if self._connection is None:
Expand All @@ -237,6 +240,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,
"init_timeouts": init_timeouts,
}
async with Trace(
"setup_socks5_connection", logger, request, kwargs
Expand Down
16 changes: 10 additions & 6 deletions httpcore/_sync/socks_proxy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ def _init_socks5_connection(
host: bytes,
port: int,
auth: tuple[bytes, bytes] | None = None,
init_timeouts: tuple[float, float] | None = None,
) -> None:
read_timeout, write_timeout = init_timeouts or (None, None)
conn = socksio.socks5.SOCKS5Connection()

# Auth method request
Expand All @@ -56,10 +58,10 @@ def _init_socks5_connection(
)
conn.send(socksio.socks5.SOCKS5AuthMethodsRequest([auth_method]))
outgoing_bytes = conn.data_to_send()
stream.write(outgoing_bytes)
stream.write(outgoing_bytes, timeout=write_timeout)

# Auth method response
incoming_bytes = stream.read(max_bytes=4096)
incoming_bytes = stream.read(max_bytes=4096, timeout=read_timeout)
response = conn.receive_data(incoming_bytes)
assert isinstance(response, socksio.socks5.SOCKS5AuthReply)
if response.method != auth_method:
Expand All @@ -75,10 +77,10 @@ def _init_socks5_connection(
username, password = auth
conn.send(socksio.socks5.SOCKS5UsernamePasswordRequest(username, password))
outgoing_bytes = conn.data_to_send()
stream.write(outgoing_bytes)
stream.write(outgoing_bytes, timeout=write_timeout)

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

# Connect response
incoming_bytes = stream.read(max_bytes=4096)
incoming_bytes = stream.read(max_bytes=4096, timeout=read_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 @@ -217,6 +219,7 @@ def handle_request(self, request: Request) -> Response:
timeouts = request.extensions.get("timeout", {})
sni_hostname = request.extensions.get("sni_hostname", None)
timeout = timeouts.get("connect", None)
init_timeouts = timeouts.get("read", None), timeouts.get("write", None)

with self._connect_lock:
if self._connection is None:
Expand All @@ -237,6 +240,7 @@ def handle_request(self, request: Request) -> Response:
"host": self._remote_origin.host.decode("ascii"),
"port": self._remote_origin.port,
"auth": self._proxy_auth,
"init_timeouts": init_timeouts,
}
with Trace(
"setup_socks5_connection", logger, request, kwargs
Expand Down