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

Fix to convert_properties, which was not being called properly

Browse Source
This commit is contained in:
Francesco Siddi 2015-10-10 16:27:02 +02:00
parent c2e707661b
commit 919083e0e9
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pillar/application/__init__.py
View File

@ -70,6 +70,8 @@ def validate(token):
def validate_token(): def validate_token():
if not request.authorization:
return None
token = request.authorization.username token = request.authorization.username
tokens = app.data.driver.db['tokens'] tokens = app.data.driver.db['tokens']
users = app.data.driver.db['users'] users = app.data.driver.db['users']
@ -162,14 +164,14 @@ class CustomTokenAuth(BasicsAuth):
class ValidateCustomFields(Validator): class ValidateCustomFields(Validator):
def convert_properties(properties, node_schema): def convert_properties(self, properties, node_schema):
for prop in node_schema: for prop in node_schema:
if not prop in properties: if not prop in properties:
continue continue
schema_prop = node_schema[prop] schema_prop = node_schema[prop]
prop_type = schema_prop['type'] prop_type = schema_prop['type']
if prop_type == 'dict': if prop_type == 'dict':
properties[prop] = convert_properties( properties[prop] = self.convert_properties(
properties[prop], schema_prop['schema']) properties[prop], schema_prop['schema'])
if prop_type == 'list': if prop_type == 'list':
if properties[prop] in ['', '[]']: if properties[prop] in ['', '[]']:
@ -179,7 +181,7 @@ class ValidateCustomFields(Validator):
continue continue
item_schema = {'item': schema_prop['schema']} item_schema = {'item': schema_prop['schema']}
item_prop = {'item': properties[prop][k]} item_prop = {'item': properties[prop][k]}
properties[prop][k] = convert_properties( properties[prop][k] = self.convert_properties(
item_prop, item_schema)['item'] item_prop, item_schema)['item']
# Convert datetime string to RFC1123 datetime # Convert datetime string to RFC1123 datetime
elif prop_type == 'datetime': elif prop_type == 'datetime':
@ -238,9 +240,11 @@ db = client.eve
def global_validation(): def global_validation():
setattr(g, 'token_data', validate_token()) token_data = validate_token()
setattr(g, 'validate', validate(g.get('token_data')['token'])) if token_data:
check_permissions(g.get('token_data')['user'], app.data.driver) setattr(g, 'token_data', token_data)
setattr(g, 'validate', validate(token_data['token']))
check_permissions(token_data['user'], app.data.driver)
def pre_GET_nodes(request, lookup): def pre_GET_nodes(request, lookup):