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

Add more logging to find cause of KeyError

Browse Source 
There can be a KeyError accessing permission['methods'], but our current
logging doesn't provide enough information as to determine when this
happens. Rather than bluntly fixing the issue, I added logging to try and
find out how we get a 'methods'-less permission dict in the first place.
This commit is contained in:
Sybren A. Stüvel 2017-09-15 11:02:31 +02:00
parent 8377dc63c0
commit dc50d6e941
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pillar/api/utils/authorization.py
View File

@ -216,6 +216,8 @@ def merge_permissions(*args):
:returns: combined list of permissions.
"""
from pillar.auth import current_user
if not args:
return {}
@ -237,8 +239,18 @@ def merge_permissions(*args):
from0 = args[0].get(plural_name, [])
from1 = args[1].get(plural_name, [])
asdict0 = {permission[field_name]: permission['methods'] for permission in from0}
asdict1 = {permission[field_name]: permission['methods'] for permission in from1}
try:
asdict0 = {permission[field_name]: permission['methods'] for permission in from0}
except KeyError:
log.exception('KeyError creating asdict0 for %r permissions; user=%s; args[0]=%r',
field_name, current_user.user_id, args[0])
asdict0 = {}
try:
asdict1 = {permission[field_name]: permission['methods'] for permission in from1}
except KeyError:
log.exception('KeyError creating asdict1 for %r permissions; user=%s; args[1]=%r',
field_name, current_user.user_id, args[1])
asdict1 = {}
keys = set(asdict0.keys()).union(set(asdict1.keys()))
for key in maybe_sorted(keys):