db: specify sslmode in Cloud Foundry env

Refer to
https://www.postgresql.org/docs/11/libpq-connect.html#LIBPQ-CONNECT-SSLMODE

GOV.UK PaaS gives us the database URI, and we use the default mode of
postgres auth which prefers a TLS connection instead of a plain TCP
connection

We are now specifying the SSL mode in the URI when establishing our
connection to the database, so that:

* We will not connect to the database via a plaintext connection
* We will verify the database connection against a list of trusted CAs

The RDS CA from which the database's certificate is issued is added into
the Cloud Foundry app container via
925681f19b/manifests/cf-manifest/operations.d/350-diego-cell.yml (L17-L22)

Signed-off-by: Toby Lorne <toby.lornewelch-richards@digital.cabinet-office.gov.uk>
Co-authored-by: David <david.mcdonald@digital.cabinet-office.gov.uk>
This commit is contained in:
Toby Lorne
2020-11-09 10:40:58 +00:00
parent 29b6ed427d
commit cfcc3128c2
2 changed files with 38 additions and 2 deletions

View File

@@ -31,10 +31,35 @@ def cloudfoundry_environ(os_environ, cloudfoundry_config):
os.environ['VCAP_APPLICATION'] = '{"space_name": "🚀🌌"}'
@pytest.fixture
def postgres_config_with_setting():
return [
{
'credentials': {
'uri': 'postgres uri?setting=true'
}
}
]
@pytest.fixture
def cloudfoundry_config_with_setting(postgres_config_with_setting):
return {
'postgres': postgres_config_with_setting,
'user-provided': []
}
@pytest.fixture
def cloudfoundry_environ_with_setting(os_environ, cloudfoundry_config_with_setting):
os.environ['VCAP_SERVICES'] = json.dumps(cloudfoundry_config_with_setting)
os.environ['VCAP_APPLICATION'] = '{"space_name": "🚀🌌"}'
def test_extract_cloudfoundry_config_populates_other_vars(cloudfoundry_environ):
extract_cloudfoundry_config()
assert os.environ['SQLALCHEMY_DATABASE_URI'] == 'postgres uri'
assert os.environ['SQLALCHEMY_DATABASE_URI'] == 'postgres uri?sslmode=verify-full'
assert os.environ['NOTIFY_ENVIRONMENT'] == '🚀🌌'
assert os.environ['NOTIFY_LOG_PATH'] == '/home/vcap/logs/app.log'
@@ -49,3 +74,9 @@ def test_set_config_env_vars_ignores_unknown_configs(cloudfoundry_config, cloudf
assert 'foo' not in os.environ
assert 'bar' not in os.environ
def test_extract_cloudfoundry_config_populates_postgres_with_setting(cloudfoundry_environ_with_setting):
extract_cloudfoundry_config()
assert os.environ['SQLALCHEMY_DATABASE_URI'] == 'postgres uri?setting=true&sslmode=verify-full'