archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Removed permission keys from node type definitions.

Browse Source 
This prevents replace_pillar_node_type_schemas() from overwriting existing
permissions.
This commit is contained in:
Sybren A. Stüvel 2016-10-20 12:57:59 +02:00
parent 7f4ad85781
commit 3afeeaccd0
10 changed files with 68 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pillar/api/node_types/asset.py
View File

@ -69,6 +69,4 @@ node_type_asset = {
'tags': {'visible': False},
'categories': {'visible': False}
},
'permissions': {
}
}

8
pillar/api/node_types/blog.py
View File

@ -18,12 +18,4 @@ node_type_blog = {
'template': {},
},
'parent': ['project',],
'permissions': {
# 'groups': [{
# 'group': app.config['ADMIN_USER_GROUP'],
# 'methods': ['GET', 'PUT', 'POST']
# }],
# 'users': [],
# 'world': ['GET']
}
}

2
pillar/api/node_types/comment.py
View File

@ -65,6 +65,4 @@ node_type_comment = {
'is_reply': {}
},
'parent': ['asset', 'comment'],
'permissions': {
}
}

2
pillar/api/node_types/group.py
View File

@ -28,6 +28,4 @@ node_type_group = {
'notes': {'visible': False},
'order': {'visible': False}
},
'permissions': {
}
}

1
pillar/api/node_types/page.py
View File

@ -50,5 +50,4 @@ node_type_page = {
'attachments': {'visible': False},
},
'parent': ['project', ],
'permissions': {}
}

1
pillar/api/node_types/post.py
View File

@ -55,5 +55,4 @@ node_type_post = {
'attachments': {'visible': False},
},
'parent': ['blog', ],
'permissions': {}
}

7
pillar/api/node_types/storage.py
View File

@ -27,11 +27,4 @@ node_type_storage = {
'backend': {}
},
'parent': ['group', 'project'],
'permissions': {
# 'groups': [{
# 'group': app.config['ADMIN_USER_GROUP'],
# 'methods': ['GET', 'PUT', 'POST']
# }],
# 'users': [],
}
}

21
pillar/tests/common_test_data.py
View File

@ -56,8 +56,7 @@ EXAMPLE_PROJECT = {
u'url': {u'type': u'string'}},
u'form_schema': {u'order': {}, u'status': {}, u'url': {}},
u'name': u'group_texture',
u'parent': [u'group_texture', u'project'],
u'permissions': {}},
u'parent': [u'group_texture', u'project']},
{u'description': u'Generic group node type edited',
u'dyn_schema': {u'notes': {u'maxlength': 256, u'type': u'string'},
u'order': {u'type': u'integer'},
@ -66,8 +65,7 @@ EXAMPLE_PROJECT = {
u'url': {u'type': u'string'}},
u'form_schema': {u'notes': {}, u'order': {}, u'status': {}, u'url': {}},
u'name': u'group',
u'parent': [u'group', u'project'],
u'permissions': {}},
u'parent': [u'group', u'project']},
{u'description': u'Basic Asset Type',
u'dyn_schema': {
u'attachments': {u'schema': {u'schema': {u'field': {u'type': u'string'},
@ -107,8 +105,7 @@ EXAMPLE_PROJECT = {
u'status': {},
u'tags': {}},
u'name': u'asset',
u'parent': [u'group'],
u'permissions': {}},
u'parent': [u'group']},
{u'description': u'Entrypoint to a remote or local storage solution',
u'dyn_schema': {u'backend': {u'type': u'string'},
u'subdir': {u'type': u'string'}},
@ -145,16 +142,14 @@ EXAMPLE_PROJECT = {
u'ratings': {},
u'status': {}},
u'name': u'comment',
u'parent': [u'asset', u'comment'],
u'permissions': {}},
u'parent': [u'asset', u'comment']},
{u'description': u'Container for node_type post.',
u'dyn_schema': {u'categories': {u'schema': {u'type': u'string'},
u'type': u'list'},
u'template': {u'type': u'string'}},
u'form_schema': {u'categories': {}, u'template': {}},
u'name': u'blog',
u'parent': [u'project'],
u'permissions': {}},
u'parent': [u'project']},
{u'description': u'A blog post, for any project',
u'dyn_schema': {
u'attachments': {u'schema': {u'schema': {u'field': {u'type': u'string'},
@ -189,8 +184,7 @@ EXAMPLE_PROJECT = {
u'status': {},
u'url': {}},
u'name': u'post',
u'parent': [u'blog'],
u'permissions': {}},
u'parent': [u'blog']},
{u'description': u'Image Texture',
u'dyn_schema': {u'aspect_ratio': {u'type': u'float'},
u'categories': {u'type': u'string'},
@ -230,8 +224,7 @@ EXAMPLE_PROJECT = {
u'status': {},
u'tags': {}},
u'name': u'texture',
u'parent': [u'group'],
u'permissions': {}}],
u'parent': [u'group']}],
u'nodes_blog': [],
u'nodes_featured': [],
u'nodes_latest': [],

10
tests/test_api/test_auth.py
View File

@ -18,15 +18,17 @@ EXAMPLE_PROJECT = copy.deepcopy(ctd.EXAMPLE_PROJECT)
_texture_nt = next(nt for nt in EXAMPLE_PROJECT['node_types']
if nt['name'] == 'texture')
_texture_nt['permissions']['groups'] = [
_texture_nt['permissions'] = {'groups': [
{u'group': ObjectId('5596e975ea893b269af85c0f'), u'methods': [u'GET']},
{u'group': ObjectId('564733b56dcaf85da2faee8a'), u'methods': [u'GET']}, ]
{u'group': ObjectId('564733b56dcaf85da2faee8a'), u'methods': [u'GET']}
]}
_asset_nt = next(nt for nt in EXAMPLE_PROJECT['node_types']
if nt['name'] == 'asset')
_asset_nt['permissions']['groups'] = [
_asset_nt['permissions'] = {'groups': [
{u'group': ObjectId('5596e975ea893b269af85c0f'), u'methods': [u'DELETE', u'GET']},
{u'group': ObjectId('564733b56dcaf85da2faee8a'), u'methods': [u'GET']}]
{u'group': ObjectId('564733b56dcaf85da2faee8a'), u'methods': [u'GET']}
]}
class AuthenticationTests(AbstractPillarTest):

55
tests/test_api/test_cli.py Normal file
View File

@ -0,0 +1,55 @@
from __future__ import absolute_import
from pillar.tests import AbstractPillarTest
from pillar.tests import common_test_data as ctd
class PatchCommentTest(AbstractPillarTest):
def setUp(self, **kwargs):
AbstractPillarTest.setUp(self, **kwargs)
# Create a project that doesn't reference non-existing files, so that
# Eve can actually PUT it later without validation errors.
self.project_id, self.proj = self.ensure_project_exists(project_overrides={
'picture_square': None,
'picture_header': None,
})
def test_replace_pillar_node_type_schemas(self):
from pillar.api.node_types.group import node_type_group
from pillar.cli import replace_pillar_node_type_schemas
group_perms = {u'group': ctd.EXAMPLE_PROJECT_READONLY_GROUP_ID,
u'methods': [u'POST', u'PUT']}
# Assign some permissions to the node types, so we're sure they don't get overwritten.
with self.app.app_context():
proj_coll = self.app.db()['projects']
proj_coll.update_one(
{'_id': self.project_id,
'node_types.name': 'asset'},
{'$push': {'node_types.$.permissions.groups': group_perms}}
)
# Run the CLI command
with self.app.test_request_context():
replace_pillar_node_type_schemas(proj_url=self.proj['url'])
# Fetch the project again from MongoDB
with self.app.app_context():
proj_coll = self.app.db()['projects']
dbproj = proj_coll.find_one(self.project_id)
# Perform our tests
def nt(node_type_name):
found = [nt for nt in dbproj['node_types']
if nt['name'] == node_type_name]
return found[0]
# Test that the node types were updated
nt_group = nt('group')
self.assertEqual(node_type_group['description'], nt_group['description'])
# Test that the permissions set previously are still there.
nt_asset = nt('asset')
self.assertEqual([group_perms], nt_asset['permissions']['groups'])