Skip to content

fix for bad config check on sensitive keys #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkakavas merged 1 commit into from
Jun 29, 2017
Merged

fix for bad config check on sensitive keys #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/satosa/satosa_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class SATOSAConfig(object):
"""
sensitive_dict_keys = ["STATE_ENCRYPTION_KEY", "USER_ID_HASH_SALT"]
mandatory_dict_keys = ["BASE", "BACKEND_MODULES", "FRONTEND_MODULES",
"INTERNAL_ATTRIBUTES", "COOKIE_STATE_NAME"] + sensitive_dict_keys
"INTERNAL_ATTRIBUTES", "COOKIE_STATE_NAME"]

def __init__(self, config):
"""
Expand Down Expand Up @@ -83,6 +83,10 @@ def _verify_dict(self, conf):
if key not in conf:
raise SATOSAConfigurationError("Missing key '%s' in config" % key)

for key in SATOSAConfig.sensitive_dict_keys:
if key not in conf and "SATOSA_{key}".format(key=key) not in os.environ:
raise SATOSAConfigurationError("Missing key '%s' from config and ENVIRONMENT" % key)

def __getitem__(self, item):
"""
Returns data bound to the key 'item'.
Expand Down
2 changes: 1 addition & 1 deletion tests/satosa/test_satosa_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@ def test_can_read_endpoint_configs_from_file(self, satosa_config_dict, modules_k
satosa_config_dict[modules_key] = ["/fake_file_path"]

with pytest.raises(SATOSAConfigurationError):
SATOSAConfig(satosa_config_dict)
SATOSAConfig(satosa_config_dict)