# HG changeset patch # User Ludovic Chabant # Date 1411851941 25200 # Node ID e2e809fb44d415770e51814ca7a3d240263e2cb2 # Parent c9a6c329f24e78381187c1e7238fc4a26a0715bb Make the authentication manager work with the new meta API. diff -r c9a6c329f24e -r e2e809fb44d4 wikked/auth.py --- a/wikked/auth.py Sat Sep 27 14:05:19 2014 -0700 +++ b/wikked/auth.py Sat Sep 27 14:05:41 2014 -0700 @@ -65,13 +65,16 @@ perm = page.getMeta(meta_name) if perm is not None: # Permissions are declared at the page level. - for p in perm: - allowed = [r.strip() for r in re.split(r'[ ,;]', p)] - if username is None and 'anonymous' in allowed: - return True - if username is not None and ( - '*' in allowed or username in allowed): - return True + if isinstance(perm, list): + perm = ','.join(perm) + + allowed = [r.strip() for r in re.split(r'[ ,;]', perm)] + if username is None and 'anonymous' in allowed: + return True + if username is not None and ( + '*' in allowed or username in allowed): + return True + return False perm = self._permissions.get(meta_name) @@ -84,7 +87,6 @@ return True return False - # No permissions declared anywhere. return True def _updatePermissions(self, config):