Skip to content

Commit 42d6923

Browse files
committed
Revert "Fix verify_in_ssl log statement which no longer has access to SSL params"
This reverts commit 7ff0b44.
1 parent 7ff0b44 commit 42d6923

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

app/src/adapters/db/clients/postgres_client.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,12 @@ def generate_iam_auth_token(aws_region: str, host: str, port: int, user: str) ->
121121
def verify_ssl(connection_info: Any) -> None:
122122
"""Verify that the database connection is encrypted and log a warning if not."""
123123
if connection_info.pgconn.ssl_in_use:
124-
logger.info("database connection is using SSL")
124+
logger.info(
125+
"database connection is using SSL: %s",
126+
", ".join(
127+
name + " " + connection_info.ssl_attribute(name)
128+
for name in connection_info.ssl_attribute_names
129+
),
130+
)
125131
else:
126132
logger.warning("database connection is not using SSL")

app/tests/src/adapters/db/clients/test_postgres_client.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,31 @@ class DummyPgConn:
1313

1414

1515
class DummyConnectionInfo:
16-
def __init__(self, ssl_in_use):
16+
def __init__(self, ssl_in_use, attributes):
17+
self.attributes = attributes
18+
self.ssl_attribute_names = tuple(attributes.keys())
1719
self.pgconn = DummyPgConn(ssl_in_use)
1820

21+
def ssl_attribute(self, name):
22+
return self.attributes[name]
23+
1924

2025
def test_verify_ssl(caplog):
2126
caplog.set_level(logging.INFO) # noqa: B1
2227

23-
conn_info = DummyConnectionInfo(True)
28+
conn_info = DummyConnectionInfo(True, {"protocol": "ABCv3", "key_bits": "64", "cipher": "XYZ"})
2429
verify_ssl(conn_info)
2530

26-
assert caplog.messages == ["database connection is using SSL"]
31+
assert caplog.messages == [
32+
"database connection is using SSL: protocol ABCv3, key_bits 64, cipher XYZ"
33+
]
2734
assert caplog.records[0].levelname == "INFO"
2835

2936

3037
def test_verify_ssl_not_in_use(caplog):
3138
caplog.set_level(logging.INFO) # noqa: B1
3239

33-
conn_info = DummyConnectionInfo(False)
40+
conn_info = DummyConnectionInfo(False, {})
3441
verify_ssl(conn_info)
3542

3643
assert caplog.messages == ["database connection is not using SSL"]

0 commit comments

Comments
 (0)