From d41f8afe552934e8b1ed8d3927c0f42c36e7e849 Mon Sep 17 00:00:00 2001 From: wizardchen Date: Wed, 26 Nov 2025 17:58:31 +0800 Subject: [PATCH] feat: Add JWT_SECRET configuration to .env.example and enhance pagination validation in chunk handler --- .env.example | 4 ++++ internal/handler/chunk.go | 9 +++++++++ internal/handler/faq.go | 6 ++++-- internal/handler/session/qa.go | 3 ++- internal/utils/security.go | 23 ++++++++++++++++++----- 5 files changed, 37 insertions(+), 8 deletions(-) diff --git a/.env.example b/.env.example index e6c239ed..848e61a4 100644 --- a/.env.example +++ b/.env.example @@ -59,6 +59,10 @@ TENANT_AES_KEY=weknorarag-api-key-secret-secret # 是否开启知识图谱构建和检索(构建阶段需调用大模型,耗时较长) ENABLE_GRAPH_RAG=false + +# 配置 JWT_SECRET 用于前端登录刷新Token +JWT_SECRET=weknora-jwt-secret + # MinIO端口 # MINIO_PORT=9000 diff --git a/internal/handler/chunk.go b/internal/handler/chunk.go index 262519f2..474c4fa0 100644 --- a/internal/handler/chunk.go +++ b/internal/handler/chunk.go @@ -98,6 +98,15 @@ func (h *ChunkHandler) ListKnowledgeChunks(c *gin.Context) { c.Error(errors.NewBadRequestError(err.Error())) return } + if pagination.Page < 1 { + pagination.Page = 1 + } + if pagination.PageSize < 1 { + pagination.PageSize = 10 + } + if pagination.PageSize > 100 { + pagination.PageSize = 100 + } chunkType := []types.ChunkType{types.ChunkTypeText} diff --git a/internal/handler/faq.go b/internal/handler/faq.go index 70de46f8..cebbfcc3 100644 --- a/internal/handler/faq.go +++ b/internal/handler/faq.go @@ -149,12 +149,14 @@ func (h *FAQHandler) DeleteEntries(c *gin.Context) { ctx := c.Request.Context() var req faqDeleteRequest if err := c.ShouldBindJSON(&req); err != nil { - logger.Error(ctx, "Failed to bind FAQ delete payload", err) + logger.Errorf(ctx, "Failed to bind FAQ delete payload: %s", secutils.SanitizeForLog(err.Error())) c.Error(errors.NewBadRequestError("请求参数不合法").WithDetails(err.Error())) return } - if err := h.knowledgeService.DeleteFAQEntries(ctx, secutils.SanitizeForLog(c.Param("id")), req.IDs); err != nil { + if err := h.knowledgeService.DeleteFAQEntries(ctx, + secutils.SanitizeForLog(c.Param("id")), + secutils.SanitizeForLogArray(req.IDs)); err != nil { logger.ErrorWithFields(ctx, err, nil) c.Error(err) return diff --git a/internal/handler/session/qa.go b/internal/handler/session/qa.go index 488a8ccb..4110a8b7 100644 --- a/internal/handler/session/qa.go +++ b/internal/handler/session/qa.go @@ -123,7 +123,8 @@ func (h *Handler) KnowledgeQA(c *gin.Context) { // Use shared function to handle KnowledgeQA request h.handleKnowledgeQARequest(ctx, c, session, secutils.SanitizeForLog(request.Query), - knowledgeBaseIDs, assistantMessage, true, secutils.SanitizeForLog(request.SummaryModelID), request.WebSearchEnabled) + secutils.SanitizeForLogArray(knowledgeBaseIDs), + assistantMessage, true, secutils.SanitizeForLog(request.SummaryModelID), request.WebSearchEnabled) } // AgentQA handles agent-based question answering with conversation history and streaming diff --git a/internal/utils/security.go b/internal/utils/security.go index 3cef5ff4..4322bc67 100644 --- a/internal/utils/security.go +++ b/internal/utils/security.go @@ -181,10 +181,10 @@ func SanitizeForLog(input string) string { // 替换换行符(LF, CR, CRLF)为空格,防止日志注入 sanitized := strings.ReplaceAll(input, "\n", " ") sanitized = strings.ReplaceAll(sanitized, "\r", " ") - + // 替换制表符为空格 sanitized = strings.ReplaceAll(sanitized, "\t", " ") - + // 移除其他控制字符(ASCII 0-31,除了空格已处理的) var builder strings.Builder for _, r := range sanitized { @@ -193,13 +193,26 @@ func SanitizeForLog(input string) string { builder.WriteRune(r) } } - + sanitized = builder.String() - + // 限制长度,防止日志溢出 if len(sanitized) > 1000 { sanitized = sanitized[:1000] + "...[truncated]" } - + return sanitized } + +// SanitizeForLogArray 清理日志输入数组,防止日志注入攻击 +func SanitizeForLogArray(input []string) []string { + if len(input) == 0 { + return []string{} + } + + for _, item := range input { + input = append(input, SanitizeForLog(item)) + } + + return input +}