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

Removed obsolete actor ID v.s. actor dict code, refs #2570

Browse source
This commit is contained in:
Simon Willison 2025-11-01 19:30:56 -07:00
commit 7e09e1bf1b
1 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
datasette/default_permissions.py
View file

@ -131,21 +131,13 @@ async def config_permissions_sql(datasette, actor, action):
"""Apply config-based permission rules from datasette.yaml.""" """Apply config-based permission rules from datasette.yaml."""
config = datasette.config or {} config = datasette.config or {}
if actor is None:
actor_dict: dict | None = None
elif isinstance(actor, dict):
actor_dict = actor
else:
actor_lookup = await datasette.actors_from_ids([actor])
actor_dict = actor_lookup.get(actor) or {"id": actor}
def evaluate(allow_block): def evaluate(allow_block):
if allow_block is None: if allow_block is None:
return None return None
return actor_matches_allow(actor_dict, allow_block) return actor_matches_allow(actor, allow_block)
has_restrictions = actor_dict and "_r" in actor_dict if actor_dict else False has_restrictions = actor and "_r" in actor if actor else False
restrictions = actor_dict.get("_r", {}) if actor_dict else {} restrictions = actor.get("_r", {}) if actor else {}
action_obj = datasette.actions.get(action) action_obj = datasette.actions.get(action)
action_checks = {action} action_checks = {action}