Skip to content

Adds user permissions when updating group permissions to projects without the user #933

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
merged 3 commits into from
Sep 29, 2017
Merged

Adds user permissions when updating group permissions to projects without the user #933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e9706d
group perm update prop will add perm to projects
hkethi002 Sep 13, 2017
2d5d761
Test for prop group perm update to project w/o permission
hkethi002 Sep 13, 2017
a2b419c
deleted project causing usage report errors
hkethi002 Sep 20, 2017
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
1 change: 1 addition & 0 deletions api/handlers/listhandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ def put(self, cont_name, list_name, **kwargs):
payload['_id'] = kwargs.get('_id')
if cont_name == 'groups' and self.request.params.get('propagate') =='true':
self._propagate_permissions(cont_name, _id, query={'permissions._id' : payload['_id']}, update={'$set': {'permissions.$.access': payload['access']}})
self._propagate_permissions(cont_name, _id, query={'permissions._id': {'$ne': payload['_id']}}, update={'$addToSet': {'permissions': payload}})
elif cont_name != 'groups':
self._propagate_permissions(cont_name, _id)
return result
Expand Down
15 changes: 15 additions & 0 deletions test/integration_tests/python/test_propagation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,12 @@ def get_user_in_perms(perms, uid):
r = as_admin.post('/groups/' + group + '/permissions', json=payload, params={'propagate': 'true'})
assert r.ok

# Add project without default group perms
r = as_admin.post('/projects', params={'inherit': 'false'}, json={'label': 'project2', 'group': group})
assert r.ok
project2 = r.json()['_id']


r = as_admin.get('/groups/' + group)
perms = r.json()['permissions']
user = get_user_in_perms(perms, user_id)
Expand Down Expand Up @@ -248,6 +254,11 @@ def get_user_in_perms(perms, uid):
user = get_user_in_perms(perms, user_id)
assert r.ok and user and user['access'] == 'rw'

r = as_admin.get('/projects/' + project2)
perms = r.json()['permissions']
user = get_user_in_perms(perms, user_id)
assert r.ok and user and user['access'] == 'rw'

r = as_admin.get('/sessions/' + session)
perms = r.json()['permissions']
user = get_user_in_perms(perms, user_id)
Expand Down Expand Up @@ -282,6 +293,10 @@ def get_user_in_perms(perms, uid):
user = get_user_in_perms(perms, user_id)
assert r.ok and user is None

# Delete empty project 2
r= as_admin.delete('/projects/' + project2)
assert r.ok

# Test tag pool renaming and deletion
def test_add_rename_remove_group_tag(data_builder, as_admin):
"""
Expand Down