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

feat: add socket_callback to connect #1109

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat: add socket_callback to connect #1109

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
0b0eaf2
feat: add socket_callback to connect
jackwotherspoon Nov 30, 2023
ff82aab
chore: add option for `ssl` with `socket_callback` (#2)
jackwotherspoon Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 17 additions & 4 deletions asyncpg/connect_utils.py
View file
Open in desktop
Expand Up @@ -56,6 +56,7 @@ def parse(cls, sslmode):
'direct_tls',
'server_settings',
'target_session_attrs',
'socket_callback',
])


Expand Down Expand Up @@ -261,7 +262,7 @@ def _dot_postgresql_path(filename) -> typing.Optional[pathlib.Path]:
def _parse_connect_dsn_and_args(*, dsn, host, port, user,
password, passfile, database, ssl,
direct_tls, server_settings,
target_session_attrs):
target_session_attrs, socket_callback):
# `auth_hosts` is the version of host information for the purposes
# of reading the pgpass file.
auth_hosts = None
Expand Down Expand Up @@ -654,7 +655,8 @@ def _parse_connect_dsn_and_args(*, dsn, host, port, user,
user=user, password=password, database=database, ssl=ssl,
sslmode=sslmode, direct_tls=direct_tls,
server_settings=server_settings,
target_session_attrs=target_session_attrs)
target_session_attrs=target_session_attrs,
socket_callback=socket_callback)

return addrs, params

Expand All @@ -665,7 +667,7 @@ def _parse_connect_arguments(*, dsn, host, port, user, password, passfile,
max_cached_statement_lifetime,
max_cacheable_statement_size,
ssl, direct_tls, server_settings,
target_session_attrs):
target_session_attrs, socket_callback):
local_vars = locals()
for var_name in {'max_cacheable_statement_size',
'max_cached_statement_lifetime',
Expand Down Expand Up @@ -694,7 +696,8 @@ def _parse_connect_arguments(*, dsn, host, port, user, password, passfile,
password=password, passfile=passfile, ssl=ssl,
direct_tls=direct_tls, database=database,
server_settings=server_settings,
target_session_attrs=target_session_attrs)
target_session_attrs=target_session_attrs,
socket_callback=socket_callback)

config = _ClientConfiguration(
command_timeout=command_timeout,
Expand Down Expand Up @@ -863,6 +866,16 @@ async def __connect_addr(
proto_factory, *addr, ssl=params.ssl
)

elif params.socket_callback:
# if socket factory callback is given, create socket and use
# for connection
sock = await params.socket_callback()
if params.ssl:
host, _ = sock.getpeername()
connector = loop.create_connection(proto_factory, sock=sock, ssl=params.ssl, server_hostname=host)
else:
connector = loop.create_connection(proto_factory, sock=sock)

elif params.ssl:
connector = _create_ssl_connection(
proto_factory, *addr, loop=loop, ssl_context=params.ssl,
Expand Down
6 changes: 4 additions & 2 deletions asyncpg/connection.py
View file
Open in desktop
Expand Up @@ -2007,7 +2007,8 @@ async def connect(dsn=None, *,
connection_class=Connection,
record_class=protocol.Record,
server_settings=None,
target_session_attrs=None):
target_session_attrs=None,
socket_callback=None):
r"""A coroutine to establish a connection to a PostgreSQL server.

The connection parameters may be specified either as a connection
Expand Down Expand Up @@ -2344,7 +2345,8 @@ async def connect(dsn=None, *,
statement_cache_size=statement_cache_size,
max_cached_statement_lifetime=max_cached_statement_lifetime,
max_cacheable_statement_size=max_cacheable_statement_size,
target_session_attrs=target_session_attrs
target_session_attrs=target_session_attrs,
socket_callback=socket_callback
)


Expand Down