darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-23 15:56:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1081 from alphagov/ip-fix

Browse Source 
don't store non-strings to os.environ
This commit is contained in:
Leo Hemsted
2017-07-11 16:10:17 +01:00
committed by GitHub
parent 2fde4b2c80 7f883f1355
commit 19481cda02
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/cloudfoundry_config.py
View File

@@ -43,7 +43,7 @@ def extract_notify_config(notify_config):
os.environ['SECRET_KEY'] = notify_config['credentials']['secret_key'] os.environ['SECRET_KEY'] = notify_config['credentials']['secret_key']
os.environ['DANGEROUS_SALT'] = notify_config['credentials']['dangerous_salt'] os.environ['DANGEROUS_SALT'] = notify_config['credentials']['dangerous_salt']
os.environ['PERFORMANCE_PLATFORM_TOKEN'] = notify_config['credentials'].get('performance_platform_token', '') os.environ['PERFORMANCE_PLATFORM_TOKEN'] = notify_config['credentials'].get('performance_platform_token', '')
os.environ['SMS_INBOUND_WHITELIST'] = notify_config['credentials']['allow_ip_inbound_sms'] os.environ['SMS_INBOUND_WHITELIST'] = json.dumps(notify_config['credentials']['allow_ip_inbound_sms'])
def extract_notify_aws_config(aws_config): def extract_notify_aws_config(aws_config):

3
app/config.py
View File

@@ -1,5 +1,6 @@
from datetime import timedelta from datetime import timedelta
import os import os
import json
from celery.schedules import crontab from celery.schedules import crontab
from kombu import Exchange, Queue from kombu import Exchange, Queue
@@ -262,7 +263,7 @@ class Config(object):
FREE_SMS_TIER_FRAGMENT_COUNT = 250000 FREE_SMS_TIER_FRAGMENT_COUNT = 250000
SMS_INBOUND_WHITELIST = os.environ.get('SMS_INBOUND_WHITELIST', []) SMS_INBOUND_WHITELIST = json.loads(os.environ.get('SMS_INBOUND_WHITELIST', '[]'))
###################### ######################

2
tests/app/test_cloudfoundry_config.py
View File

@@ -204,4 +204,4 @@ def test_redis_config():
def test_sms_inbound_config(): def test_sms_inbound_config():
extract_cloudfoundry_config() extract_cloudfoundry_config()
assert os.environ['SMS_INBOUND_WHITELIST'] == ['111.111.111.111', '100.100.100.100'] assert os.environ['SMS_INBOUND_WHITELIST'] == json.dumps(['111.111.111.111', '100.100.100.100'])

8
tests/conftest.py
View File

@@ -90,7 +90,13 @@ def os_environ():
""" """
# for use whenever you expect code to edit environment variables # for use whenever you expect code to edit environment variables
old_env = os.environ.copy() old_env = os.environ.copy()
os.environ = {}
class EnvironDict(dict):
def __setitem__(self, key, value):
assert type(value) == str
super().__setitem__(key, value)
os.environ = EnvironDict()
yield yield
os.environ = old_env os.environ = old_env