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

Merge pull request #245 from alphagov/permission_check_fix

Browse Source 
Exact permissions added.
This commit is contained in:
Chris Hill-Scott
2016-03-08 17:17:18 +00:00
parent dcdc9cd412 a1c4600b29
commit aa842875fc
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/notify_client/models.py
View File

@@ -88,7 +88,7 @@ class User(UserMixin):
if service_id in self._permissions: if service_id in self._permissions:
if or_: if or_:
return any([x in self._permissions[service_id] for x in permissions]) return any([x in self._permissions[service_id] for x in permissions])
return set(self._permissions[service_id]) > set(permissions) return set(self._permissions[service_id]) >= set(permissions)
return False return False
@property @property

12
tests/app/main/test_utils.py
View File

@@ -58,6 +58,18 @@ def test_user_has_permissions_multiple(app_,
response = decorated_index() response = decorated_index()
def test_exact_permissions(app_,
api_user_active,
mock_login,
mock_get_user_with_permissions):
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
decorator = user_has_permissions('manage_users', 'manage_templates', 'manage_settings')
decorated_index = decorator(index)
response = decorated_index()
def test_validate_header_row(): def test_validate_header_row():
row = {'bad': '+44 7700 900981'} row = {'bad': '+44 7700 900981'}
try: try: