Skip to content

Open-source LLM knowledge platform: turn raw documents into a queryable RAG, an autonomous reasoning agent, and a self-maintaining Wiki.

fix(security): reject traversal in local prefixes, task IDs, and wiki sort

wizardchen316db899d824
diff --git a/internal/application/repository/wiki_page.go b/internal/application/repository/wiki_page.go
index b5df908e2..126e790f3 100644
--- a/internal/application/repository/wiki_page.go
+++ b/internal/application/repository/wiki_page.go
@@ -37,6 +37,42 @@ func (r *wikiPageRepository) wikiCategoryRankOrder() string {
return "CASE WHEN COALESCE(jsonb_array_length(category_path), 0) > 0 THEN 0 ELSE 1 END ASC"
}
+// wikiPageListSortColumn maps a caller-supplied sort_by to a quoted identifier.
+// Each Name is a string literal so user input never enters the ORDER BY text
+// (GORM quotes the column; direction is clause.OrderByColumn.Desc, not sprintf).
+func wikiPageListSortColumn(sortBy string) clause.Column {
+ switch sortBy {
+ case "title":
+ return clause.Column{Name: "title"}
+ case "created_at":
+ return clause.Column{Name: "created_at"}
+ case "updated_at":
+ return clause.Column{Name: "updated_at"}
+ case "page_type":
+ return clause.Column{Name: "page_type"}
+ case "wiki_path":
+ return clause.Column{Name: "wiki_path"}
+ case "sort_order":
+ return clause.Column{Name: "sort_order"}
+ case "depth":
+ return clause.Column{Name: "depth"}
+ default:
+ return clause.Column{Name: "updated_at"}
+ }
+}
+
+func (r *wikiPageRepository) applyWikiPageListOrder(query *gorm.DB, sortBy, sortOrder string) *gorm.DB {
+ col := wikiPageListSortColumn(sortBy)
+ desc := sortOrder != "asc"
+ if col.Name == "wiki_path" {
+ return query.Order(r.wikiCategoryRankOrder()).
+ Order(clause.OrderByColumn{Column: col, Desc: desc}).
+ Order(clause.OrderByColumn{Column: clause.Column{Name: "sort_order"}}).
+ Order(clause.OrderByColumn{Column: clause.Column{Name: "title"}})
+ }
+ return query.Order(clause.OrderByColumn{Column: col, Desc: desc})
+}
+
func (r *wikiPageRepository) wikiEmptyInLinksPredicate() string {
if r.db != nil && r.db.Dialector != nil && r.db.Dialector.Name() == "sqlite" {
return "(in_links IS NULL OR json_array_length(in_links) = 0)"
@@ -353,26 +389,7 @@ func (r *wikiPageRepository) List(ctx context.Context, req *types.WikiPageListRe
return nil, 0, err
}
- // Sort
- sortBy := "updated_at"
- if req.SortBy != "" {
- switch req.SortBy {
- case "title", "created_at", "updated_at", "page_type", "wiki_path", "sort_order", "depth":
- sortBy = req.SortBy
- }
- }
- sortOrder := "DESC"
- if req.SortOrder == "asc" {
- sortOrder = "ASC"
- }
- if sortBy == "wiki_path" {
- query = query.Order(r.wikiCategoryRankOrder()).
- Order(fmt.Sprintf("wiki_path %s", sortOrder)).
- Order("sort_order ASC").
- Order("title ASC")
- } else {
- query = query.Order(fmt.Sprintf("%s %s", sortBy, sortOrder))
- }
+ query = r.applyWikiPageListOrder(query, req.SortBy, req.SortOrder)
page := req.Page
if page < 1 {
diff --git a/internal/application/service/file/factory.go b/internal/application/service/file/factory.go
index 5e1898454..2b53aa9b8 100644
--- a/internal/application/service/file/factory.go
+++ b/internal/application/service/file/factory.go
@@ -3,7 +3,6 @@ package file
import (
"fmt"
"os"
- "path/filepath"
"strings"
"github.com/Tencent/WeKnora/internal/types"
@@ -38,13 +37,8 @@ func NewFileServiceFromStorageConfig(
case "local":
baseDir := localBaseDir
if sec != nil && sec.Local != nil {
- rawPrefix := strings.TrimSpace(sec.Local.PathPrefix)
- prefix := strings.Trim(rawPrefix, "/\\")
- if prefix != "" {
- candidate := filepath.Join(baseDir, prefix)
- if safeBaseDir, err := secutils.SafePathUnderBase(baseDir, candidate); err == nil {
- baseDir = safeBaseDir
- }
+ if safeBaseDir, err := secutils.SafeJoinUnderBase(baseDir, sec.Local.PathPrefix); err == nil {
+ baseDir = safeBaseDir
}
}
externalURL := strings.TrimSpace(os.Getenv("APP_EXTERNAL_URL"))
diff --git a/internal/application/service/knowledge_faq_import.go b/internal/application/service/knowledge_faq_import.go
index c253d0110..7bd6770f8 100644
--- a/internal/application/service/knowledge_faq_import.go
+++ b/internal/application/service/knowledge_faq_import.go
@@ -46,10 +46,13 @@ func (s *knowledgeService) UpsertFAQEntries(ctx context.Context,
tenantID := ctx.Value(types.TenantIDContextKey).(uint64)
- // 使用传入的TaskID,如果没传则生成增强的TaskID
- taskID := payload.TaskID
+ // 使用传入的TaskID,如果没传则生成增强的TaskID。
+ // 客户端传入的 task_id 会进文件名和 Redis key,必须是无路径分隔符的标识符。
+ taskID := strings.TrimSpace(payload.TaskID)
if taskID == "" {
taskID = secutils.GenerateTaskID("faq_import", tenantID, kbID)
+ } else if err := secutils.ValidateTaskID(taskID); err != nil {
+ return "", werrors.NewBadRequestError("task_id 格式不合法")
}
var knowledgeID string
@@ -156,7 +159,10 @@ func (s *knowledgeService) UpsertFAQEntries(ctx context.Context,
logger.Infof(ctx, "FAQ entries size: %d bytes, uploading to object storage", len(entriesData))
// 上传到私有桶(主桶),任务处理完成后清理
- fileName := fmt.Sprintf("faq_import_entries_%s_%d.json", taskID, enqueuedAt)
+ fileName, err := faqImportEntriesFileName(taskID, enqueuedAt)
+ if err != nil {
+ return "", fmt.Errorf("invalid task id for object name: %w", err)
+ }
entriesURL, err := s.fileSvc.SaveBytes(ctx, entriesData, tenantID, fileName, false)
if err != nil {
logger.Errorf(ctx, "Failed to upload FAQ entries to object storage: %v", err)
@@ -182,7 +188,10 @@ func (s *knowledgeService) UpsertFAQEntries(ctx context.Context,
if len(payloadBytes) > payloadSizeThreshold && taskPayload.EntriesURL == "" {
// payload 太大但还没上传,现在上传
entriesData, _ := json.Marshal(payload.Entries)
- fileName := fmt.Sprintf("faq_import_entries_%s_%d.json", taskID, enqueuedAt)
+ fileName, nameErr := faqImportEntriesFileName(taskID, enqueuedAt)
+ if nameErr != nil {
+ return "", fmt.Errorf("invalid task id for object name: %w", nameErr)
+ }
entriesURL, err := s.fileSvc.SaveBytes(ctx, entriesData, tenantID, fileName, false)
if err != nil {
logger.Errorf(ctx, "Failed to upload FAQ entries to object storage: %v", err)
@@ -235,6 +244,10 @@ func (s *knowledgeService) UpsertFAQEntries(ctx context.Context,
return taskID, nil
}
+func faqImportEntriesFileName(taskID string, enqueuedAt int64) (string, error) {
+ return secutils.SafeFileName(fmt.Sprintf("faq_import_entries_%s_%d.json", taskID, enqueuedAt))
+}
+
// generateFailedEntriesCSV 生成失败条目的 CSV 文件并上传
func (s *knowledgeService) generateFailedEntriesCSV(ctx context.Context,
tenantID uint64, taskID string, failedEntries []types.FAQFailedEntry,
@@ -280,7 +293,10 @@ func (s *knowledgeService) generateFailedEntriesCSV(ctx context.Context,
}
// 上传 CSV 文件到临时存储(会自动过期)
- fileName := fmt.Sprintf("faq_dryrun_failed_%s.csv", taskID)
+ fileName, err := secutils.SafeFileName(fmt.Sprintf("faq_dryrun_failed_%s.csv", taskID))
+ if err != nil {
+ return "", fmt.Errorf("invalid task id for object name: %w", err)
+ }
filePath, err := s.fileSvc.SaveBytes(ctx, []byte(buf.String()), tenantID, fileName, true)
if err != nil {
return "", fmt.Errorf("failed to save CSV file: %w", err)
diff --git a/internal/application/service/storagebackend.go b/internal/application/service/storagebackend.go
index 6f1831f46..08cce4600 100644
--- a/internal/application/service/storagebackend.go
+++ b/internal/application/service/storagebackend.go
@@ -5,7 +5,6 @@ import (
"errors"
"fmt"
"os"
- "path/filepath"
"strings"
"time"
@@ -206,8 +205,7 @@ func (s *StorageBackendService) Test(ctx context.Context, backend *types.Storage
if baseDir == "" {
baseDir = "/data/files"
}
- candidate := filepath.Join(baseDir, strings.Trim(strings.TrimSpace(backend.Config.PathPrefix), "/\\"))
- safeDir, err := secutils.SafePathUnderBase(baseDir, candidate)
+ safeDir, err := secutils.SafeJoinUnderBase(baseDir, backend.Config.PathPrefix)
if err != nil {
return err
}
diff --git a/internal/utils/security.go b/internal/utils/security.go
index 51ad061ab..d70c81032 100644
--- a/internal/utils/security.go
+++ b/internal/utils/security.go
@@ -9,6 +9,7 @@ import (
"net/http"
"net/url"
"os"
+ "path"
"path/filepath"
"regexp"
"strings"
@@ -125,6 +126,25 @@ func SafePathUnderBase(baseDir, filePath string) (string, error) {
return absPath, nil
}
+// SafeJoinUnderBase 把调用方提供的相对后缀拼到 baseDir 下,并返回仍落在
+// baseDir 内的绝对路径。首尾分隔符会被去掉,避免 "/etc" 一类输入覆盖根目录;
+// ".." 经 path.Clean 后若仍指向父级则拒绝。空后缀表示 baseDir 本身。
+func SafeJoinUnderBase(baseDir, relPath string) (string, error) {
+ if strings.TrimSpace(baseDir) == "" {
+ return "", fmt.Errorf("baseDir cannot be empty")
+ }
+ rel := strings.Trim(strings.TrimSpace(relPath), `/\`)
+ if rel == "" {
+ return SafePathUnderBase(baseDir, baseDir)
+ }
+ slashRel := filepath.ToSlash(rel)
+ cleaned := path.Clean(slashRel)
+ if path.IsAbs(slashRel) || path.IsAbs(cleaned) || cleaned == ".." || strings.HasPrefix(cleaned, "../") {
+ return "", fmt.Errorf("path traversal denied: path is outside base directory")
+ }
+ return SafePathUnderBase(baseDir, filepath.Join(baseDir, filepath.FromSlash(cleaned)))
+}
+
// SafeFileName 校验并返回安全的“仅文件名”部分,防止路径遍历。
// 仅保留最后一个路径成分,禁止 ".."、空名或仅含点,用于 SaveBytes 等场景。
func SafeFileName(fileName string) (string, error) {
diff --git a/internal/utils/security_path_test.go b/internal/utils/security_path_test.go
new file mode 100644
index 000000000..29c679d52
--- /dev/null
+++ b/internal/utils/security_path_test.go
@@ -0,0 +1,55 @@
+package utils
+
+import (
+ "path/filepath"
+ "testing"
+)
+
+func TestSafeJoinUnderBase(t *testing.T) {
+ base := t.TempDir()
+ absBase, err := filepath.Abs(base)
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ got, err := SafeJoinUnderBase(base, "a/b")
+ if err != nil {
+ t.Fatal(err)
+ }
+ if want := filepath.Join(absBase, "a", "b"); got != want {
+ t.Fatalf("nested prefix: got %q want %q", got, want)
+ }
+
+ got, err = SafeJoinUnderBase(base, "foo/bar/..")
+ if err != nil {
+ t.Fatal(err)
+ }
+ if want := filepath.Join(absBase, "foo"); got != want {
+ t.Fatalf("cleaned suffix: got %q want %q", got, want)
+ }
+
+ got, err = SafeJoinUnderBase(base, "")
+ if err != nil {
+ t.Fatal(err)
+ }
+ if got != absBase {
+ t.Fatalf("empty suffix: got %q want %q", got, absBase)
+ }
+
+ got, err = SafeJoinUnderBase(base, "/abs")
+ if err != nil {
+ t.Fatal(err)
+ }
+ if want := filepath.Join(absBase, "abs"); got != want {
+ t.Fatalf("leading slash stripped: got %q want %q", got, want)
+ }
+
+ for _, rel := range []string{"../outside", "a/../../outside", ".."} {
+ if _, err := SafeJoinUnderBase(base, rel); err == nil {
+ t.Fatalf("expected traversal error for %q", rel)
+ }
+ }
+ if _, err := SafeJoinUnderBase(" ", "a"); err == nil {
+ t.Fatal("expected error for empty baseDir")
+ }
+}
diff --git a/internal/utils/taskid.go b/internal/utils/taskid.go
index 89f7cc0eb..f1de9df7f 100644
--- a/internal/utils/taskid.go
+++ b/internal/utils/taskid.go
@@ -61,6 +61,27 @@ func GenerateTaskIDWithPrefix(prefix string, tenantID uint64, businessID ...stri
return strings.Join(components, "_")
}
+const maxTaskIDLen = 128
+
+// ValidateTaskID reports whether taskID is safe to embed in file names and
+// Redis keys: non-empty, bounded, and only [A-Za-z0-9_-] (no separators or "..").
+func ValidateTaskID(taskID string) error {
+ if taskID == "" {
+ return fmt.Errorf("task ID cannot be empty")
+ }
+ if len(taskID) > maxTaskIDLen {
+ return fmt.Errorf("task ID too long")
+ }
+ for i := 0; i < len(taskID); i++ {
+ c := taskID[i]
+ if (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '_' || c == '-' {
+ continue
+ }
+ return fmt.Errorf("task ID contains invalid character")
+ }
+ return nil
+}
+
// ParseTaskID parses a task ID generated by GenerateTaskID and returns its components.
// Returns taskType, tenantID, timestamp, uuid, businessID, and error.
//
diff --git a/internal/utils/taskid_test.go b/internal/utils/taskid_test.go
index 5f885d8aa..9e0efe12e 100644
--- a/internal/utils/taskid_test.go
+++ b/internal/utils/taskid_test.go
@@ -1,6 +1,9 @@
package utils
-import "testing"
+import (
+ "strings"
+ "testing"
+)
func TestParseTaskID_CompoundTaskType(t *testing.T) {
taskID := GenerateTaskID("faq_import", 42, "kb-abc-123")
@@ -32,3 +35,25 @@ func TestTaskTenantID(t *testing.T) {
t.Fatalf("TaskTenantID = %d, want 7", got)
}
}
+
+func TestValidateTaskID(t *testing.T) {
+ if err := ValidateTaskID(GenerateTaskID("faq_import", 42, "kb-abc-123")); err != nil {
+ t.Fatalf("generated task ID should be valid: %v", err)
+ }
+ if err := ValidateTaskID("550e8400-e29b-41d4-a716-446655440000"); err != nil {
+ t.Fatalf("UUID task ID should be valid: %v", err)
+ }
+ invalid := []string{
+ "",
+ "../outside",
+ "a/../../etc",
+ "foo\\bar",
+ "id with space",
+ strings.Repeat("a", 129),
+ }
+ for _, id := range invalid {
+ if err := ValidateTaskID(id); err == nil {
+ t.Fatalf("expected error for %q", id)
+ }
+ }
+}