fix(api-keys): close KB scope gaps in handlers and CloneContext

Enforce per-key knowledge base restrictions on batch/search read paths,
centralize scope checks in shared KB access validators, and propagate
TenantAPIKeyScope through logger.CloneContext so async QA cannot bypass it.
This commit is contained in:
wizardchen
2026-07-05 10:55:00 +08:00
committed by lyingbug
parent 3f516d7f31
commit 94d18ea15a
5 changed files with 262 additions and 12 deletions
+13 -1
View File
@@ -395,7 +395,8 @@ func (h *KnowledgeBaseHandler) CreateKnowledgeBase(c *gin.Context) {
})
}
// validateAndGetKnowledgeBase validates request parameters and retrieves the knowledge base
// validateAndGetKnowledgeBase validates request parameters and retrieves the knowledge base.
// Enforces per-API-key KB scope before tenant/share/agent resolution.
// Returns the knowledge base, knowledge base ID, effective tenant ID for embedding, permission level, and any errors encountered
// For owned KBs, effectiveTenantID is the caller's tenant ID
// For shared KBs, effectiveTenantID is the source tenant ID (owner's tenant)
@@ -419,6 +420,9 @@ func (h *KnowledgeBaseHandler) validateAndGetKnowledgeBase(c *gin.Context) (*typ
logger.Error(ctx, "Knowledge base ID is empty")
return nil, "", 0, "", apperrors.NewBadRequestError("Knowledge base ID cannot be empty")
}
if err := requireTenantAPIKeyKnowledgeBase(ctx, id); err != nil {
return nil, id, 0, "", err
}
// Verify tenant has permission to access this knowledge base
kb, err := h.service.GetKnowledgeBaseByID(ctx, id)
@@ -960,6 +964,14 @@ func (h *KnowledgeBaseHandler) CopyKnowledgeBase(c *gin.Context) {
c.Error(apperrors.NewUnauthorizedError("Unauthorized"))
return
}
kbIDs := []string{req.SourceID}
if req.TargetID != "" {
kbIDs = append(kbIDs, req.TargetID)
}
if err := requireTenantAPIKeyKnowledgeBases(ctx, kbIDs...); err != nil {
c.Error(err)
return
}
// Validate source knowledge base exists and belongs to caller's tenant (prevent cross-tenant clone)
sourceKB, err := h.service.GetKnowledgeBaseByID(ctx, req.SourceID)