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

PluginSQL renamed to PermissionSQL, closes #2524

Browse source
This commit is contained in:
Simon Willison 2025-10-23 09:34:19 -07:00
commit b9c6e7a0f6
11 changed files with 84 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

10
datasette/default_permissions.py
View file

@ -1,5 +1,5 @@
from datasette import hookimpl, Permission
from datasette.utils.permissions import PluginSQL
from datasette.permissions import PermissionSQL
from datasette.utils import actor_matches_allow
import itsdangerous
import time
@ -174,7 +174,7 @@ def permission_allowed_default(datasette, actor, action, resource):
@hookimpl
async def permission_resources_sql(datasette, actor, action):
rules: list[PluginSQL] = []
rules: list[PermissionSQL] = []
config_rules = await _config_permission_rules(datasette, actor, action)
rules.extend(config_rules)
@ -191,7 +191,7 @@ async def permission_resources_sql(datasette, actor, action):
"SELECT NULL AS parent, NULL AS child, 1 AS allow, " f"'{reason}' AS reason"
)
rules.append(
PluginSQL(
PermissionSQL(
source="default_permissions",
sql=sql,
params={},
@ -205,7 +205,7 @@ async def permission_resources_sql(datasette, actor, action):
return rules
async def _config_permission_rules(datasette, actor, action) -> list[PluginSQL]:
async def _config_permission_rules(datasette, actor, action) -> list[PermissionSQL]:
config = datasette.config or {}
if actor is None:
@ -332,7 +332,7 @@ async def _config_permission_rules(datasette, actor, action) -> list[PluginSQL]:
params[f"{key}_reason"] = reason
sql = "\nUNION ALL\n".join(parts)
return [PluginSQL(source="config_permissions", sql=sql, params=params)]
return [PermissionSQL(source="config_permissions", sql=sql, params=params)]
async def _resolve_config_permissions_blocks(datasette, actor, action, resource):