Merge pull request #24229 from msteed/issue-24147

Fix auth failure on syndic with external_auth
This commit is contained in:
Thomas S Hatch 2015-05-29 09:04:06 -06:00
commit 9bfb066c2c

View file

@ -2379,6 +2379,8 @@ class ClearFuncs(object):
'Authentication failure of type "user" occurred.'
)
return ''
elif clear_load.get('key', 'invalid') == self.key.get('root'):
clear_load.pop('key')
else:
if clear_load['user'] in self.key:
# User is authorised, check key and check perms