Implemented view-instance permission, refs #811

This commit is contained in:
Simon Willison 2020-06-07 14:30:39 -07:00
commit 8571ce388a
2 changed files with 24 additions and 0 deletions

View file

@ -7,6 +7,10 @@ def permission_allowed(datasette, actor, action, resource_type, resource_identif
if action == "permissions-debug":
if actor and actor.get("id") == "root":
return True
elif action == "view-instance":
allow = datasette.metadata("allow")
if allow is not None:
return actor_matches_allow(actor, allow)
elif action == "view-query":
# Check if this query has a "allow" block in metadata
assert resource_type == "query"

View file

@ -20,3 +20,23 @@ def test_execute_sql(allow, expected_anon, expected_auth):
"/fixtures/q", cookies={"ds_actor": client.ds.sign({"id": "root"}, "actor")}
)
assert expected_auth == auth_response.status
@pytest.mark.parametrize(
"allow,expected_anon,expected_auth",
[(None, 200, 200), ({}, 403, 403), ({"id": "root"}, 403, 200),],
)
def test_view_instance(allow, expected_anon, expected_auth):
with make_app_client(metadata={"allow": allow}) as client:
for path in (
"/",
"/fixtures",
"/fixtures/compound_three_primary_keys",
"/fixtures/compound_three_primary_keys/a,a,a",
):
anon_response = client.get(path)
assert expected_anon == anon_response.status
auth_response = client.get(
path, cookies={"ds_actor": client.ds.sign({"id": "root"}, "actor")},
)
assert expected_auth == auth_response.status