darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-03 09:51:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3304 from alphagov/switch-to-per-app-api-keys-179039225

Browse Source 
Switch to per-app secrets from internal APIs
This commit is contained in:
Ben Thorner
2021-08-11 11:22:10 +01:00
committed by GitHub
parent 5a1636e41f e1dec3f9b8
commit e8ad12f016
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/config.py
View File

@@ -84,16 +84,13 @@ class Config(object):
# URL of api app (on AWS this is the internal api endpoint) # URL of api app (on AWS this is the internal api endpoint)
API_HOST_NAME = os.getenv('API_HOST_NAME') API_HOST_NAME = os.getenv('API_HOST_NAME')
# LEGACY: replacing with INTERNAL_CLIENT_API_KEYS
API_INTERNAL_SECRETS = json.loads(os.environ.get('API_INTERNAL_SECRETS', '[]'))
# secrets that internal apps, such as the admin app or document download, must use to authenticate with the API # secrets that internal apps, such as the admin app or document download, must use to authenticate with the API
ADMIN_CLIENT_ID = 'notify-admin' ADMIN_CLIENT_ID = 'notify-admin'
GOVUK_ALERTS_CLIENT_ID = 'govuk-alerts' GOVUK_ALERTS_CLIENT_ID = 'govuk-alerts'
INTERNAL_CLIENT_API_KEYS = { INTERNAL_CLIENT_API_KEYS = json.loads(
ADMIN_CLIENT_ID: API_INTERNAL_SECRETS os.environ.get('INTERNAL_CLIENT_API_KEYS', '{}')
} )
# encyption secret/salt # encyption secret/salt
SECRET_KEY = os.getenv('SECRET_KEY') SECRET_KEY = os.getenv('SECRET_KEY')

2
manifest.yml.j2
View File

@@ -113,7 +113,7 @@ applications:
# Credentials variables # Credentials variables
ADMIN_BASE_URL: '{{ ADMIN_BASE_URL }}' ADMIN_BASE_URL: '{{ ADMIN_BASE_URL }}'
API_INTERNAL_SECRETS: '{{ API_INTERNAL_SECRETS | tojson }}' INTERNAL_CLIENT_API_KEYS: '{{ INTERNAL_CLIENT_API_KEYS | tojson }}'
API_HOST_NAME: '{{ API_HOST_NAME }}' API_HOST_NAME: '{{ API_HOST_NAME }}'
DANGEROUS_SALT: '{{ DANGEROUS_SALT }}' DANGEROUS_SALT: '{{ DANGEROUS_SALT }}'
SECRET_KEY: '{{ SECRET_KEY }}' SECRET_KEY: '{{ SECRET_KEY }}'