From 3e6a208ba3bd2faf18e553182b1fd8c52782644f Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Mon, 12 Dec 2022 19:27:34 -0800 Subject: [PATCH] Rename 't' to 'r' in '_r' actor format, refs #1855 --- datasette/default_permissions.py | 2 +- tests/test_permissions.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/datasette/default_permissions.py b/datasette/default_permissions.py index 9c274c93..406dae40 100644 --- a/datasette/default_permissions.py +++ b/datasette/default_permissions.py @@ -202,7 +202,7 @@ def permission_allowed_actor_restrictions(actor, action, resource): # Or the current table? That's any time the resource is (database, table) if resource is not None and not isinstance(resource, str) and len(resource) == 2: database, table = resource - table_allowed = _r.get("t", {}).get(database, {}).get(table) + table_allowed = _r.get("r", {}).get(database, {}).get(table) # TODO: What should this do for canned queries? if table_allowed is not None: assert isinstance(table_allowed, list) diff --git a/tests/test_permissions.py b/tests/test_permissions.py index 8ee80889..9f83ef29 100644 --- a/tests/test_permissions.py +++ b/tests/test_permissions.py @@ -592,16 +592,16 @@ DEF = "USE_DEFAULT" DEF, ), ({"id": "t", "_r": {"d": {"one": ["es"]}}}, "execute-sql", "one", None, DEF), - # Works at the "t" for table level: + # Works at the "r" for table level: ( - {"id": "t", "_r": {"t": {"one": {"t1": ["vt"]}}}}, + {"id": "t", "_r": {"r": {"one": {"t1": ["vt"]}}}}, "view-table", "one", "t1", DEF, ), ( - {"id": "t", "_r": {"t": {"one": {"t1": ["vt"]}}}}, + {"id": "t", "_r": {"r": {"one": {"t1": ["vt"]}}}}, "view-table", "one", "t2",