darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-03-17 08:40:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

retrieve sms ip whitelist from credentials on paas

Browse Source
This commit is contained in:
venusbb
2017-07-10 17:03:43 +01:00
parent c0af82ebcb
commit 5089a4d53b
5 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/authentication/auth.py
View File

@@ -49,7 +49,7 @@ def restrict_ip_sms():
# X-Forwarded-For looks like "203.0.113.195, 70.41.3.18, 150.172.238.178"
ip_list = request.headers.get("X-Forwarded-For")
ip = ip_list.split(',')[0].strip()
current_app.logger.info("Inbound sms ip list {}".format(ip_list))
current_app.logger.info("Inbound sms ip route list {}".format(ip_list))
if ip in current_app.config.get('ALLOW_IP_INBOUND_SMS'):
current_app.logger.info("Inbound sms ip addresses {} passed ".format(ip))

1
app/cloudfoundry_config.py
View File

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

2
app/config.py
View File

@@ -262,7 +262,7 @@ class Config(object):
FREE_SMS_TIER_FRAGMENT_COUNT = 250000
ALLOW_IP_INBOUND_SMS = []
ALLOW_IP_INBOUND_SMS = os.environ.get('SMS_INBOUND_WHITELIST', [])
######################

8
tests/app/authentication/test_authentication.py
View File

@@ -313,8 +313,8 @@ def __create_token(service_id):
def restrict_ip_sms_app():
app = flask.Flask(__name__)
app.config['TESTING'] = True
app.config['ALLOW_IP_INBOUND_SMS'] = ['134.213.243.188']
app.config['ALLOW_IP_INBOUND_SMS'] = ['111.111.111.111', '100.100.100.100']
# app.config['ALLOW_IP_INBOUND_SMS'] = os.environ['SMS_INBOUND_WHITELIST']
blueprint = flask.Blueprint('restrict_ip_sms_app', __name__)
@blueprint.route('/')
@@ -332,7 +332,7 @@ def test_allow_valid_ips(restrict_ip_sms_app):
response = restrict_ip_sms_app.get(
path='/',
headers=[
('X-Forwarded-For', '134.213.243.188, 222.222.222.222, 127.0.0.1'),
('X-Forwarded-For', '111.111.111.111, 222.222.222.222, 127.0.0.1'),
]
)
@@ -345,7 +345,7 @@ def test_reject_invalid_ips(restrict_ip_sms_app):
restrict_ip_sms_app.get(
path='/',
headers=[
('X-Forwarded-For', '222.222.222.222, 111.111.111.111, 127.0.0.1')
('X-Forwarded-For', '222.222.222.222, 333.333.333.333, 127.0.0.1')
]
)

10
tests/app/test_cloudfoundry_config.py
View File

@@ -16,7 +16,8 @@ def notify_config():
'admin_client_secret': 'admin client secret',
'secret_key': 'secret key',
'dangerous_salt': 'dangerous salt',
'performance_platform_token': 'performance platform token'
'performance_platform_token': 'performance platform token',
'allow_ip_inbound_sms': ['111.111.111.111', '100.100.100.100']
}
}
@@ -197,3 +198,10 @@ def test_redis_config():
assert os.environ['REDIS_ENABLED'] == '1'
assert os.environ['REDIS_URL'] == 'redis url'
@pytest.mark.usefixtures('os_environ', 'cloudfoundry_environ')
def test_sms_config():
extract_cloudfoundry_config()
assert os.environ['SMS_INBOUND_WHITELIST'] == ['111.111.111.111', '100.100.100.100']