Skip to content

fix: enhance resource permission handling by adding support for user group permissions in knowledge and tool queries #7526

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 28, 2026
Merged

fix: enhance resource permission handling by adding support for user group permissions in knowledge and tool queries #7526

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: 15 additions & 1 deletion apps/knowledge/serializers/knowledge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
from models_provider.models import Model
from openpyxl.cell.cell import ILLEGAL_CHARACTERS_RE
from rest_framework import serializers
from system_manage.models import AuthTargetType, WorkspaceUserResourcePermission
from system_manage.models import AuthTargetType, WorkspaceUserResourcePermission, WorkspaceUserGroupResourcePermission
from system_manage.models.resource_mapping import ResourceMapping
from system_manage.serializers.resource_mapping_serializers import ResourceMappingSerializer
from system_manage.serializers.user_resource_permission import UserResourcePermissionSerializer
Expand Down Expand Up @@ -312,6 +312,13 @@ def get_query_set(self, workspace_manage, is_x_pack_ee):
query_set_dict["workspace_user_resource_permission_query_set"] = QuerySet(
WorkspaceUserResourcePermission
).filter(auth_target_type="KNOWLEDGE", workspace_id=workspace_id, user_id=self.data.get("user_id"))
query_set_dict["workspace_user_group_resource_permission_query_set"] = QuerySet(
WorkspaceUserGroupResourcePermission
).filter(
auth_target_type="KNOWLEDGE",
workspace_id=workspace_id,
user_group__user_relations__user_id=self.data.get("user_id"),
)
return query_set_dict

def page(self, current_page: int, page_size: int):
Expand Down Expand Up @@ -496,6 +503,13 @@ def one(self):
workspace_id=self.data.get("workspace_id"),
user_id=self.data.get("user_id"),
)
query_set_dict["workspace_user_group_resource_permission_query_set"] = QuerySet(
WorkspaceUserGroupResourcePermission
).filter(
auth_target_type="KNOWLEDGE",
workspace_id=self.data.get("workspace_id"),
user_group__user_relations__user_id=self.data.get("user_id"),
)
all_application_list = [str(adm.get("id")) for adm in self.list_application(with_valid=False)]
knowledge_dict = native_search(
query_set_dict,
Expand Down
82 changes: 52 additions & 30 deletions apps/knowledge/sql/list_knowledge_user_ee.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,54 +2,76 @@ SELECT *
FROM (SELECT "temp_knowledge".id::text, "temp_knowledge".name,
"temp_knowledge".desc,
"temp_knowledge".type,
'knowledge' as resource_type,
'knowledge' as resource_type,
"temp_knowledge".workspace_id,
"temp_knowledge".folder_id,
"temp_knowledge".user_id,
"user"."nick_name" as nick_name,
"user"."nick_name" as nick_name,
"temp_knowledge".create_time,
"temp_knowledge".update_time,
"temp_knowledge".file_size_limit,
"temp_knowledge".file_count_limit,
"temp_knowledge"."scope",
"temp_knowledge"."embedding_model_id"::text,
"document_temp"."char_length",
to_json("temp_knowledge".meta)::jsonb as meta,
CASE
WHEN
"app_knowledge_temp"."count" IS NULL THEN 0
ELSE "app_knowledge_temp"."count" END AS application_mapping_count,
"temp_knowledge"."embedding_model_id"::text, "document_temp"."char_length",
to_json("temp_knowledge".meta)::jsonb as meta, CASE
WHEN
"app_knowledge_temp"."count" IS NULL THEN 0
ELSE "app_knowledge_temp"."count" END AS application_mapping_count,
"document_temp".document_count,
"document_temp".image_count
FROM (SELECT knowledge.*
FROM knowledge knowledge ${knowledge_custom_sql}
AND "knowledge".id::text in (select target
from workspace_user_resource_permission
${workspace_user_resource_permission_query_set}
and case
when auth_type = 'ROLE' then
'ROLE' = any (permission_list)
and
'KNOWLEDGE:READ' in (select (case when user_role_relation.role_id = any (array ['USER']) THEN 'KNOWLEDGE:READ' else role_permission.permission_id END)
from role_permission role_permission
right join user_role_relation user_role_relation
on user_role_relation.role_id=role_permission.role_id
where user_role_relation.user_id=workspace_user_resource_permission.user_id
and user_role_relation.workspace_id=workspace_user_resource_permission.workspace_id)
else
'VIEW' = any (permission_list)
end
)) 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",
from workspace_user_resource_permission ${workspace_user_resource_permission_query_set}
and case
when auth_type = 'ROLE' then
'ROLE' = any (permission_list)
and
'KNOWLEDGE:READ' in (select (case when user_role_relation.role_id = any (array ['USER']) THEN 'KNOWLEDGE:READ' else role_permission.permission_id END)
from role_permission role_permission
right join user_role_relation user_role_relation
on user_role_relation.role_id=role_permission.role_id
where user_role_relation.user_id=workspace_user_resource_permission.user_id
and user_role_relation.workspace_id=workspace_user_resource_permission.workspace_id)
else
'VIEW' = any (permission_list)
end
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)
or (
auth_type = 'ROLE'
and 'ROLE' = any (permission_list)
and 'KNOWLEDGE:READ' in (select (case
when user_role_relation.role_id =
any (array ['USER'])
then 'KNOWLEDGE:READ'
else
role_permission.permission_id end)
from role_permission role_permission
right join user_role_relation user_role_relation
on user_role_relation.role_id =
role_permission.role_id
where user_role_relation.user_id =
system_user_group_relation.user_id
and user_role_relation.workspace_id =
workspace_user_group_resource_permission.workspace_id)
)
)
)) 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",
knowledge_id
FROM "document"
GROUP BY knowledge_id) "document_temp" ON temp_knowledge."id" = "document_temp".knowledge_id
LEFT JOIN (SELECT "count"("id"), knowledge_id
FROM application_knowledge_mapping
GROUP BY knowledge_id) app_knowledge_temp
ON temp_knowledge."id" = "app_knowledge_temp".knowledge_id
left join "user" on "user".id = temp_knowledge.user_id
) temp
left join "user" on "user".id = temp_knowledge.user_id) temp
${default_sql}
16 changes: 15 additions & 1 deletion apps/tools/serializers/tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
from maxkb.const import CONFIG, PROJECT_DIR
from models_provider.models import Model
from rest_framework import serializers, status
from system_manage.models import AuthTargetType, WorkspaceUserResourcePermission
from system_manage.models import AuthTargetType, WorkspaceUserResourcePermission, WorkspaceUserGroupResourcePermission
from system_manage.models.resource_mapping import ResourceMapping
from system_manage.serializers.resource_mapping_serializers import ResourceMappingSerializer
from system_manage.serializers.user_resource_permission import UserResourcePermissionSerializer
Expand Down Expand Up @@ -392,6 +392,13 @@ def get_query_set(self, workspace_manage, is_x_pack_ee):
query_set_dict["workspace_user_resource_permission_query_set"] = QuerySet(
WorkspaceUserResourcePermission
).filter(auth_target_type="TOOL", workspace_id=workspace_id, user_id=user_id)
query_set_dict["workspace_user_group_resource_permission_query_set"] = QuerySet(
WorkspaceUserGroupResourcePermission
).filter(
auth_target_type="TOOL",
workspace_id=workspace_id,
user_group__user_relations__user_id=user_id,
)
return query_set_dict

def get_authorized_query_set(self):
Expand Down Expand Up @@ -1812,6 +1819,13 @@ def get_query_set(self, workspace_manage, is_x_pack_ee):
query_set_dict["workspace_user_resource_permission_query_set"] = QuerySet(
WorkspaceUserResourcePermission
).filter(auth_target_type="TOOL", workspace_id=workspace_id, user_id=user_id)
query_set_dict["workspace_user_group_resource_permission_query_set"] = QuerySet(
WorkspaceUserGroupResourcePermission
).filter(
auth_target_type="TOOL",
workspace_id=workspace_id,
user_group__user_relations__user_id=user_id,
)
return query_set_dict

@staticmethod
Expand Down
29 changes: 22 additions & 7 deletions apps/tools/sql/list_tool_user_ee.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
SELECT *
FROM (SELECT tool."id"::text,
tool."name",
FROM (SELECT tool."id"::text, tool."name",
tool."desc",
tool."tool_type",
tool."scope",
Expand All @@ -11,8 +10,7 @@ FROM (SELECT tool."id"::text,
"user".nick_name AS "nick_name",
tool."icon",
tool.label,
tool."template_id"::text,
tool."create_time",
tool."template_id"::text, tool."create_time",
tool."update_time",
tool.init_field_list,
tool.input_field_list,
Expand All @@ -34,7 +32,24 @@ FROM (SELECT tool."id"::text,
ELSE
'VIEW' = ANY (permission_list)
END
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)
OR (
auth_type = 'ROLE'
AND 'ROLE' = ANY (permission_list)
AND 'TOOL:READ' IN (SELECT (CASE WHEN user_role_relation.role_id = ANY (ARRAY ['USER']) THEN 'TOOL:READ' ELSE role_permission.permission_id END)
FROM role_permission role_permission
RIGHT JOIN user_role_relation user_role_relation ON user_role_relation.role_id=role_permission.role_id
WHERE user_role_relation.user_id=system_user_group_relation.user_id
AND user_role_relation.workspace_id=workspace_user_group_resource_permission.workspace_id)
)
)
)) AS tool
LEFT JOIN "user" ON "user".id = user_id
) temp
${default_query_set}
LEFT JOIN "user" ON "user".id = user_id) temp
${default_query_set}
Loading