Skip to content

fix: enhance resource permission checks by including user group access for VIEW role #7535

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 29, 2026
+27 −8
Merged

fix: enhance resource permission checks by including user group access for VIEW role #7535

Show file tree
Hide file tree
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: 13 additions & 3 deletions apps/knowledge/sql/list_knowledge_user.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,19 @@ FROM (SELECT "temp_knowledge".id::text, "temp_knowledge".name,
"document_temp".image_count
FROM (SELECT knowledge.*
FROM knowledge knowledge ${knowledge_custom_sql}
AND id::text in (select target
from workspace_user_resource_permission ${workspace_user_resource_permission_query_set}
and 'VIEW' = any (permission_list))) temp_knowledge
AND id::text IN (
SELECT target
FROM workspace_user_resource_permission
${workspace_user_resource_permission_query_set}
AND 'VIEW' = ANY (permission_list)
UNION
SELECT DISTINCT target
FROM workspace_user_group_resource_permission
INNER JOIN system_user_group_relation
ON system_user_group_relation.group_id = workspace_user_group_resource_permission.user_group_id
${workspace_user_group_resource_permission_query_set}
AND 'VIEW' = ANY (permission_list)
)) temp_knowledge
LEFT JOIN (SELECT "count"("id") FILTER (WHERE "resource_type" = 'document') AS document_count,
"count"("id") FILTER (WHERE "resource_type" = 'image') AS image_count,
"sum"("char_length") "char_length",
Expand Down
19 changes: 14 additions & 5 deletions apps/tools/sql/list_tool_user.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,19 @@ FROM (SELECT tool."id"::text,
tool."is_active"
FROM (SELECT tool.*
FROM tool tool ${tool_query_set}
AND tool.id::text IN (SELECT target
FROM workspace_user_resource_permission
${workspace_user_resource_permission_query_set}
AND 'VIEW' = ANY (permission_list))) AS tool
AND tool.id::text IN (
SELECT target
FROM workspace_user_resource_permission
${workspace_user_resource_permission_query_set}
AND 'VIEW' = ANY (permission_list)
UNION
SELECT DISTINCT target
FROM workspace_user_group_resource_permission
INNER JOIN system_user_group_relation
ON system_user_group_relation.group_id = workspace_user_group_resource_permission.user_group_id
${workspace_user_group_resource_permission_query_set}
AND 'VIEW' = ANY (permission_list)
)) AS tool
LEFT JOIN "user" ON "user".id = user_id
) temp
${default_query_set}
${default_query_set}
Loading