Skip to content

fix: add shared tool read permission functionality #7340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wxg0103 merged 1 commit into from
Oct 15, 2026
Merged

fix: add shared tool read permission functionality #7340

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions apps/tools/views/tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from common.auth import TokenAuth
from common.auth.authentication import check_batch_permissions, has_permissions
from common.constants.permission_constants import CompareConstants, PermissionConstants, RoleConstants, ViewPermission
from common.database_model_manage.database_model_manage import DatabaseModelManage
from common.log.log import log
from django.db.models import QuerySet
from django.utils.translation import gettext_lazy as _
Expand Down Expand Up @@ -29,6 +30,20 @@
from tools.serializers.tool import ToolBatchOperateSerializer, ToolSerializer, ToolTreeSerializer


def get_shared_tool_read_permission(request, kwargs):
get_authorized_tool = DatabaseModelManage.get_model("get_authorized_tool")
if get_authorized_tool is None:
return None
shared_tool_query_set = QuerySet(Tool).filter(id=kwargs.get("tool_id"), scope=ToolScope.SHARED)
if get_authorized_tool(shared_tool_query_set, kwargs.get("workspace_id")).exists():
return ViewPermission(
[RoleConstants.USER.get_workspace_role(), RoleConstants.WORKSPACE_MANAGE.get_workspace_role()],
[PermissionConstants.TOOL_READ.get_workspace_permission()],
CompareConstants.OR,
)
return None


def get_tool_operation_object(tool_id):
tool_model = QuerySet(model=Tool).filter(id=tool_id).first()
if tool_model is not None:
Expand Down Expand Up @@ -176,6 +191,7 @@ def put(self, request: Request, workspace_id: str, tool_id: str):
tags=[_("Tool")], # type: ignore
)
@has_permissions(
get_shared_tool_read_permission,
PermissionConstants.TOOL_READ.get_workspace_tool_permission(),
PermissionConstants.TOOL_READ.get_workspace_permission_workspace_manage_role(),
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(),
Expand Down
Loading