Skip to content

Surface server errors during SSL negotiation #1348

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

Draft
aryansk wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −0
Draft

Surface server errors during SSL negotiation #1348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions asyncpg/connect_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,6 +934,12 @@ def data_received(self, data: bytes) -> None:
# sslmode=prefer. But be extra sure to disallow insecure
# connections when the ssl context asks for real security.
self.on_data.set_result(False)
elif data.startswith(b'E'):
message = data[1:].rstrip(b'\x00\r\n').decode(
'utf-8', errors='replace')
self.on_data.set_exception(
exceptions.InterfaceError(
message or 'server error during SSL negotiation'))
else:
self.on_data.set_exception(
ConnectionError(
Expand Down
13 changes: 13 additions & 0 deletions tests/test_connect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,19 @@ def mock_dev_null_home_dir():
yield


class TestTLSUpgradeProto(tb.TestCase):

async def test_error_response_preserves_server_message(self):
context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
proto = connect_utils.TLSUpgradeProto(
self.loop, 'localhost', 5432, context, False)

proto.data_received(b'Etoo many connections\n\x00')
with self.assertRaisesRegex(
exceptions.InterfaceError, 'too many connections'):
await proto.on_data


class TestSettings(tb.ConnectedTestCase):

async def test_get_settings_01(self):
Expand Down