Skip to content

RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.

fix: align chat permission tests across editions (#21589)

buua43661da347a603a
diff --git a/internal/service/chat_pipeline_test.go b/internal/service/chat_pipeline_test.go
index ea8fd04d2f..24ff237659 100644
--- a/internal/service/chat_pipeline_test.go
+++ b/internal/service/chat_pipeline_test.go
@@ -19,7 +19,6 @@ package service
import (
"context"
"encoding/json"
- "errors"
"fmt"
"reflect"
"sort"
@@ -34,7 +33,6 @@ import (
"ragflow/internal/engine"
"ragflow/internal/entity"
modelModule "ragflow/internal/entity/models"
- "ragflow/internal/permission"
)
// dialForTest builds a minimal *entity.Chat suitable for the
@@ -127,8 +125,8 @@ func TestAsyncChatRejectsUnauthorizedDatasetsBeforeStartingPipeline(t *testing.T
}
t.Fatal("AsyncChat accepted another user's private dataset")
}
- if !errors.Is(err, permission.ErrPermissionDenied) {
- t.Fatalf("AsyncChat error = %v, want permission denied", err)
+ if !isAccessDeniedOrHidden(err) {
+ t.Fatalf("AsyncChat error = %v, want access denied or hidden resource", err)
}
}
@@ -1712,7 +1710,7 @@ func TestAsyncChatEmptyResponseQuoteDisabled(t *testing.T) {
if err := db.AutoMigrate(&entity.Knowledgebase{}); err != nil {
t.Fatal(err)
}
- if err := db.Create(&entity.Knowledgebase{ID: "kb-1", TenantID: "tenant-1", Name: "Knowledge"}).Error; err != nil {
+ if err := db.Create(&entity.Knowledgebase{ID: "kb-1", TenantID: "tenant-1", CreatedBy: "user-1", Name: "Knowledge"}).Error; err != nil {
t.Fatal(err)
}
@@ -1720,7 +1718,8 @@ func TestAsyncChatEmptyResponseQuoteDisabled(t *testing.T) {
chat.KBIDs = entity.JSONSlice{"kb-1"}
chat.PromptConfig["system"] = "Answer using {knowledge}"
chat.PromptConfig["empty_response"] = "Nothing found."
- results, err := NewChatPipelineService().AsyncChat(t.Context(), "user-1", chat,
+ ctx := serviceTestContext(t, "user-1", "tenant-1")
+ results, err := NewChatPipelineService().AsyncChat(ctx, "user-1", chat,
[]map[string]interface{}{{"role": "user", "content": "Question"}}, true,
map[string]interface{}{"quote": false})
if err != nil {
diff --git a/internal/service/chat_rest_update_test.go b/internal/service/chat_rest_update_test.go
index a3f65c2289..836c1fef52 100644
--- a/internal/service/chat_rest_update_test.go
+++ b/internal/service/chat_rest_update_test.go
@@ -2,7 +2,6 @@ package service
import (
"encoding/json"
- "errors"
"math"
"strings"
"testing"
@@ -13,7 +12,6 @@ import (
"ragflow/internal/common"
"ragflow/internal/dao"
"ragflow/internal/entity"
- "ragflow/internal/permission"
)
func setupChatRESTUpdateServiceTestDB(t *testing.T) *gorm.DB {
@@ -137,8 +135,8 @@ func TestChatServiceCreateRejectsForeignKBIDs(t *testing.T) {
"name": "chat with foreign dataset",
"kb_ids": []interface{}{"kb-private"},
})
- if !errors.Is(err, permission.ErrPermissionDenied) {
- t.Fatalf("Create error = %v, want permission denied", err)
+ if !isAccessDeniedOrHidden(err) {
+ t.Fatalf("Create error = %v, want access denied or hidden resource", err)
}
}
@@ -150,8 +148,8 @@ func TestChatServicePatchRejectsForeignKBIDs(t *testing.T) {
_, err := NewChatService().PatchChat(serviceTestContext(t, "user-1", "user-1"), "user-1", "chat-1", map[string]interface{}{
"kb_ids": []interface{}{"kb-private"},
})
- if !errors.Is(err, permission.ErrPermissionDenied) {
- t.Fatalf("PatchChat error = %v, want permission denied", err)
+ if !isAccessDeniedOrHidden(err) {
+ t.Fatalf("PatchChat error = %v, want access denied or hidden resource", err)
}
chat, loadErr := dao.NewChatDAO().GetByID(t.Context(), db, "chat-1")
if loadErr != nil {
diff --git a/internal/service/test_helpers_test.go b/internal/service/test_helpers_test.go
index 4d636d3935..8900e5d25f 100644
--- a/internal/service/test_helpers_test.go
+++ b/internal/service/test_helpers_test.go
@@ -18,6 +18,7 @@ package service
import (
"context"
+ "errors"
"testing"
"github.com/glebarez/sqlite"
@@ -41,6 +42,10 @@ const (
// sptr returns a pointer to the given string.
func sptr(s string) *string { return &s }
+func isAccessDeniedOrHidden(err error) bool {
+ return errors.Is(err, permission.ErrPermissionDenied) || errors.Is(err, permission.ErrResourceNotFound)
+}
+
// setupServiceTestDB initializes an in-memory SQLite database for service tests.
func setupServiceTestDB(t *testing.T) *gorm.DB {
t.Helper()