Skip to content

Commit 08c70f7

Browse files
committed
test: add sslcrl and sslcrldir to sensitive key test coverage
Add sslcrl and sslcrldir to mock server connection_params and to all test assertions that verify sensitive key stripping. Previously only 4 of 6 SENSITIVE_CONN_KEYS were tested.
1 parent 801d287 commit 08c70f7

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

web/pgadmin/browser/server_groups/servers/tests/test_shared_server_unit.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ def _make_server(**overrides):
4343
'sslcert': '/home/owner/.ssl/cert.pem',
4444
'sslkey': '/home/owner/.ssl/key.pem',
4545
'sslrootcert': '/home/owner/.ssl/ca.pem',
46+
'sslcrl': '/home/owner/.ssl/crl.pem',
47+
'sslcrldir': '/home/owner/.ssl/crl.d',
4648
'passfile': '/home/owner/.pgpass',
4749
'connect_timeout': '10',
4850
},
@@ -138,9 +140,11 @@ def test_suppresses_post_sql(self):
138140
def test_strips_owner_ssl_paths(self):
139141
result = self._merge()
140142
cp = result.connection_params
141-
# Owner had sslkey, sslrootcert, passfile
142-
# SharedServer did not -- should be removed.
143+
# Owner had sslkey, sslrootcert, sslcrl, sslcrldir,
144+
# passfile — SharedServer did not should be removed.
143145
self.assertNotIn('sslkey', cp)
146+
self.assertNotIn('sslcrl', cp)
147+
self.assertNotIn('sslcrldir', cp)
144148
self.assertNotIn('sslrootcert', cp)
145149
self.assertNotIn('passfile', cp)
146150

@@ -223,7 +227,7 @@ def test_sanitizes_conn_params(self):
223227
cp = self.captured_kwargs.get('connection_params', {})
224228
# Sensitive keys must be stripped
225229
for key in ('sslcert', 'sslkey', 'sslrootcert',
226-
'passfile'):
230+
'sslcrl', 'sslcrldir', 'passfile'):
227231
self.assertNotIn(
228232
key, cp,
229233
'Sensitive key "{0}" should be stripped '

0 commit comments

Comments
 (0)