Skip to content

fix(knowledge): scope keyword detail/delete to the caller's tenant (cross-org IDOR) #68

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

Open
dmitrymaranik wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(knowledge): scope keyword detail/delete to the caller's tenant (cross-org IDOR) #68

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
11 changes: 11 additions & 0 deletions internal/bff-service/service/knowledge_keywords.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,17 @@ func UpdateKnowledgeKeywords(ctx *gin.Context, userId, orgId string, r *request.
}

func DeleteDocCategoryKeywords(ctx *gin.Context, userId, orgId string, r *request.DeleteKeywordsReq) error {
// 删除前校验关键词归属：detail 接口已按 (org,user) 鉴权，非本租户的关键词会返回错误，
// 以此拦截跨租户删除（DeleteKnowledgeKeywords 请求自身不携带调用方身份）。
if _, err := knowledgeBaseKeywords.GetKnowledgeKeywordsDetail(ctx.Request.Context(), &knowledgebase_keywords_service.GetKnowledgeKeywordsDetailReq{
Id: r.Id,
Identity: &knowledgebase_keywords_service.Identity{
UserId: userId,
OrgId: orgId,
},
}); err != nil {
return err
}
_, err := knowledgeBaseKeywords.DeleteKnowledgeKeywords(ctx.Request.Context(), &knowledgebase_keywords_service.DeleteKnowledgeKeywordsReq{
Id: r.Id,
})
Expand Down
7 changes: 7 additions & 0 deletions internal/knowledge-service/server/grpc/knowledge_keywords/knowledge_keywords.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,13 @@ func (s *Service) GetKnowledgeKeywordsDetail(ctx context.Context, req *knowledge
log.Errorf(fmt.Sprintf("GetKnowledgeKeywords 失败(%v) 参数(%v)", err, req))
return nil, util.ErrCode(errs.Code_KnowledgeKeywordsInfoFailed)
}
// 校验关键词归属：仅允许访问本租户(org+user)的关键词，避免按 id 跨租户越权读取。
// 列表/重复校验接口已通过 WithPermit(org,user) 做此限制，此 detail 接口此前遗漏。
if keywords.OrgId != req.Identity.OrgId || keywords.UserId != req.Identity.UserId {
log.Errorf(fmt.Sprintf("GetKnowledgeKeywordsDetail 跨租户越权: keyword(org=%v,user=%v) caller(org=%v,user=%v)",
keywords.OrgId, keywords.UserId, req.Identity.OrgId, req.Identity.UserId))
return nil, util.ErrCode(errs.Code_KnowledgeKeywordsInfoFailed)
}
// 构造返回体
keywordsInfo, err := buildKeywordsInfo(ctx, keywords)
if err != nil {
Expand Down