add support for sslcert, sslkey and sslrootcert parameters #768
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
elprans
reviewed
Jun 8, 2021
asyncpg/connect_utils.py
Outdated
| @@ -442,6 +458,21 @@ def _parse_connect_dsn_and_args(*, dsn, host, port, user, | |||
| else: | |||
| sslmode = SSLMode.disable | |||
|
|
|||
| if sslcert is None: | |||
There was a problem hiding this comment.
An explicit SSLContext passed to connect() is considered to be of higher priority than the environment, so let's move this block inside if isinstance(ssl, (str, SSLMode)): above.
asyncpg/connect_utils.py
Outdated
| if sslcert: | ||
| ssl.load_cert_chain(sslcert, keyfile=sslkey) | ||
| if sslrootcert: | ||
| ssl.load_verify_locations(cafile=sslrootcert) |
There was a problem hiding this comment.
load_verify_locations also supports CRL (just call it again), so let's add that while we are here.
|
You are a hero! This works great. |
|
Can this PR be approved and merged please ? Most deployments use SSL settings. |
elprans
reviewed
Jul 27, 2021
asyncpg/connection.py
Outdated
| @@ -1755,6 +1755,10 @@ async def connect(dsn=None, *, | |||
| max_cacheable_statement_size=1024 * 15, | |||
| command_timeout=None, | |||
| ssl=None, | |||
| sslcert=None, | |||
There was a problem hiding this comment.
There's no need for all the extra arguments in connect(). If you need to customize the certs, you are supposed to pass an appropriate SSLContext in the ssl argument.
|
I removed the redundant |
fantix
approved these changes
Aug 9, 2021
elprans
added a commit
that referenced
this pull request
Aug 10, 2021
Changes ------- * Drop support for Python 3.5 (#777) (by @and-semakin in da58cd2 for #777) * Add support for Python 3.10 (#795) (by @elprans in abf5569 for #795) * Add support for asynchronous iterables to copy_records_to_table() (#713) (by @elprans in 1d33ff6 for #713) * Add support for coroutine functions as listener callbacks (#802) (by @elprans in 41da093 for #802) * Add support for sslcert, sslkey and sslrootcert parameters to DSN (#768) (by @jdobes and @elprans in c674e86 for #768) * Add copy_ wrappers to Pool (#661) (by @elprans in a6b0f28 for #661) * Add issubset and issuperset methods to the Range type (#563) (by @kdorsel in de07d0a for #563) Fixes ----- * Break connection internal circular reference (#774) (by @fantix in d08a9b8 for #774) * Make Server Version Extraction More Flexible (#778) (by @Natrinicle in d076169 for #778)
Merged
elprans
added a commit
that referenced
this pull request
Aug 10, 2021
Changes ------- * Drop support for Python 3.5 (#777) (by @and-semakin in da58cd2 for #777) * Add support for Python 3.10 (#795) (by @elprans in abf5569 for #795) * Add support for asynchronous iterables to copy_records_to_table() (#713) (by @elprans in 1d33ff6 for #713) * Add support for coroutine functions as listener callbacks (#802) (by @elprans in 41da093 for #802) * Add support for sslcert, sslkey and sslrootcert parameters to DSN (#768) (by @jdobes and @elprans in c674e86 for #768) * Add copy_ wrappers to Pool (#661) (by @elprans in a6b0f28 for #661) * Add issubset and issuperset methods to the Range type (#563) (by @kdorsel in de07d0a for #563) Fixes ----- * Break connection internal circular reference (#774) (by @fantix in d08a9b8 for #774) * Make Server Version Extraction More Flexible (#778) (by @Natrinicle in d076169 for #778)
elprans
added a commit
that referenced
this pull request
Aug 10, 2021
Changes ------- * Drop support for Python 3.5 (#777) (by @and-semakin in da58cd2 for #777) * Add support for Python 3.10 (#795) (by @elprans in abf5569 for #795) * Add support for asynchronous iterables to copy_records_to_table() (#713) (by @elprans in 1d33ff6 for #713) * Add support for coroutine functions as listener callbacks (#802) (by @elprans in 41da093 for #802) * Add support for sslcert, sslkey and sslrootcert parameters to DSN (#768) (by @jdobes and @elprans in c674e86 for #768) * Add copy_ wrappers to Pool (#661) (by @elprans in a6b0f28 for #661) * Add issubset and issuperset methods to the Range type (#563) (by @kdorsel in de07d0a for #563) Fixes ----- * Break connection internal circular reference (#774) (by @fantix in d08a9b8 for #774) * Make Server Version Extraction More Flexible (#778) (by @Natrinicle in d076169 for #778)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Allows to set
sslcert,sslkeyandsslrootcertconnection parameters. Fixes #238 as it's not possible to set customSSLContextobject with loaded CA certificate in current version.Example: