github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed actor_matches_allow bug, closes #836

Browse source
This commit is contained in:
Simon Willison 2020-06-11 15:47:19 -07:00
commit f39f111331
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
datasette/utils/__init__.py
View file

@ -884,7 +884,7 @@ def actor_matches_allow(actor, allow):
values = [values] values = [values]
actor_values = actor.get(key) actor_values = actor.get(key)
if actor_values is None: if actor_values is None:
return False continue
if not isinstance(actor_values, list): if not isinstance(actor_values, list):
actor_values = [actor_values] actor_values = [actor_values]
actor_values = set(actor_values) actor_values = set(actor_values)

2
tests/test_utils.py
View file

@ -497,6 +497,8 @@ def test_multi_params(data, should_raise):
({"id": "garry", "roles": ["staff", "dev"]}, {"roles": ["dev", "otter"]}, True), ({"id": "garry", "roles": ["staff", "dev"]}, {"roles": ["dev", "otter"]}, True),
({"id": "garry", "roles": []}, {"roles": ["staff"]}, False), ({"id": "garry", "roles": []}, {"roles": ["staff"]}, False),
({"id": "garry"}, {"roles": ["staff"]}, False), ({"id": "garry"}, {"roles": ["staff"]}, False),
# Any single matching key works:
({"id": "root"}, {"bot_id": "my-bot", "id": ["root"]}, True),
], ],
) )
def test_actor_matches_allow(actor, allow, expected): def test_actor_matches_allow(actor, allow, expected):