Skip to content

Commit 6d9068c

Browse files
committed
fix: validate folder_id in list method and use request.user.id for user_id
1 parent 11739f1 commit 6d9068c

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

apps/knowledge/serializers/knowledge.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,10 @@ def page(self, current_page: int, page_size: int):
188188

189189
def list(self):
190190
self.is_valid(raise_exception=True)
191+
folder_id = self.data.get('folder_id', self.data.get("workspace_id"))
192+
root = KnowledgeFolder.objects.filter(id=folder_id).first()
193+
if not root:
194+
raise serializers.ValidationError(_('Folder not found'))
191195
workspace_manage = is_workspace_manage(self.data.get('user_id'), self.data.get('workspace_id'))
192196

193197
return native_search(
@@ -200,7 +204,8 @@ def list(self):
200204
'list_knowledge.sql' if workspace_manage else (
201205
'list_knowledge_user_ee.sql' if self.is_x_pack_ee() else 'list_knowledge_user.sql'
202206
)
203-
))
207+
)
208+
),
204209
)
205210

206211
class Operate(serializers.Serializer):

apps/knowledge/views/knowledge.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def get(self, request: Request, workspace_id: str):
4141
'name': request.query_params.get('name'),
4242
'desc': request.query_params.get("desc"),
4343
'scope': KnowledgeScope.WORKSPACE,
44-
'user_id': request.query_params.get('user_id')
44+
'user_id': request.user.id
4545
}
4646
).list())
4747

0 commit comments

Comments
 (0)