pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Specify Flask SERVER_NAME value for Celery worker.

Browse Source 
The Celery worker cannot render URLs for the app without having a
SERVER_NAME value set. AT-AT's ability to send notifications when an
environment is ready is broken as a result.

This commit sets a null default value for SERVER_NAME in the default
config file. A setting must exist in the INI file in order to be
over-written by an environment variable, which is why we declare it as
null here. There is an additional kwarg, "allow_no_value", that must be
passed to ConfigParser to allow null values.

This also applies the correct domains as SERVER_NAME environment
variables in the Kubernetes ConfigMaps for the AWS and Azure Celery
workers.
This commit is contained in:
dandds 2019-10-16 10:46:21 -04:00
parent ff68c640de
commit fc637e933d
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
atst/app.py
View File

@ -193,7 +193,7 @@ def make_config(direct_config=None):
) )
OVERRIDE_CONFIG_FILENAME = os.getenv("OVERRIDE_CONFIG_FULLPATH") OVERRIDE_CONFIG_FILENAME = os.getenv("OVERRIDE_CONFIG_FULLPATH")
config = ConfigParser() config = ConfigParser(allow_no_value=True)
config.optionxform = str config.optionxform = str
config_files = [BASE_CONFIG_FILENAME, ENV_CONFIG_FILENAME] config_files = [BASE_CONFIG_FILENAME, ENV_CONFIG_FILENAME]

1
config/base.ini
View File

@ -25,6 +25,7 @@ REDIS_URI = redis://localhost:6379
RQ_QUEUES = atat_%(ENVIRONMENT)s RQ_QUEUES = atat_%(ENVIRONMENT)s
SECRET = change_me_into_something_secret SECRET = change_me_into_something_secret
SECRET_KEY = change_me_into_something_secret SECRET_KEY = change_me_into_something_secret
SERVER_NAME
SESSION_COOKIE_NAME=atat SESSION_COOKIE_NAME=atat
SESSION_TYPE = redis SESSION_TYPE = redis
SESSION_USE_SIGNER = True SESSION_USE_SIGNER = True

2
deploy/aws/atst-worker-envvars-configmap.yml
View File

@ -7,4 +7,4 @@ metadata:
data: data:
TZ: UTC TZ: UTC
DISABLE_CRL_CHECK: "True" DISABLE_CRL_CHECK: "True"
CRL_STORAGE_PROVIDER: CLOUDFILES SERVER_NAME: aws.atat.code.mil

2
deploy/azure/atst-worker-envvars-configmap.yml
View File

@ -7,4 +7,4 @@ metadata:
data: data:
TZ: UTC TZ: UTC
DISABLE_CRL_CHECK: "True" DISABLE_CRL_CHECK: "True"
CRL_STORAGE_PROVIDER: CLOUDFILES SERVER_NAME: azure.atat.code.mil

5
tests/test_auth.py
View File

@ -89,16 +89,17 @@ def protected_routes(app):
def test_protected_routes_redirect_to_login(client, app): def test_protected_routes_redirect_to_login(client, app):
server_name = app.config.get("SERVER_NAME") or "localhost"
for rule, protected_route in protected_routes(app): for rule, protected_route in protected_routes(app):
if "GET" in rule.methods: if "GET" in rule.methods:
resp = client.get(protected_route) resp = client.get(protected_route)
assert resp.status_code == 302 assert resp.status_code == 302
assert "http://localhost/" in resp.headers["Location"] assert server_name in resp.headers["Location"]
if "POST" in rule.methods: if "POST" in rule.methods:
resp = client.post(protected_route) resp = client.post(protected_route)
assert resp.status_code == 302 assert resp.status_code == 302
assert "http://localhost/" in resp.headers["Location"] assert server_name in resp.headers["Location"]
def test_get_protected_route_encodes_redirect(client): def test_get_protected_route_encodes_redirect(client):