Skip to content

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

fix: honor STORAGE_IMPL and enforce chat dataset access (#21548)

buua436e7bf77e1da22
diff --git a/docs/administrator/setup/configuration.md b/docs/administrator/setup/configuration.md
index 83bbaec3e5..b9f8ab5de5 100644
--- a/docs/administrator/setup/configuration.md
+++ b/docs/administrator/setup/configuration.md
@@ -183,9 +183,12 @@ If you cannot download the RAGFlow Docker image, try the following mirrors.
### `S3` (Tigris)
-To use [Tigris](https://www.tigrisdata.com) as an S3-compatible storage backend, set `STORAGE_IMPL=AWS_S3` in `.env` and configure the `s3:` section:
+To use [Tigris](https://www.tigrisdata.com) as an S3-compatible storage backend, set `general.storage_engine: s3` in `service_conf.yaml`, set `STORAGE_IMPL=AWS_S3` in `.env`, and configure the `s3:` section:
```yaml
+general:
+ storage_engine: s3
+
s3:
access_key: 'tid_YOUR_ACCESS_KEY'
secret_key: 'tsec_YOUR_SECRET_KEY'
@@ -203,6 +206,8 @@ s3:
- `addressing_style`: Must be `virtual`.
- `bucket` / `prefix_path`: Optional. Enables single-bucket mode. Before changing the storage layout, create a recovery point by following [Backup and Restore (v1.x)](../upgrade_and_migration/backup_and_restore_v1.md).
+`STORAGE_IMPL` must match `general.storage_engine`. Go refuses a mismatch because selecting another backend does not migrate existing object keys. For an existing deployment, copy and verify its stored objects in the target backend before changing `general.storage_engine`.
+
When using an external storage backend, you can remove the `minio` service from `docker-compose-base.yml`.
For other S3-compatible backends (AWS S3, Alibaba Cloud OSS, Azure Blob, Google Cloud Storage), see the commented examples in [service_conf.yaml.template](https://github.com/infiniflow/ragflow/blob/main/docker/service_conf.yaml.template).
diff --git a/internal/admin/service.go b/internal/admin/service.go
index 15c136fbc8..b6171b440c 100644
--- a/internal/admin/service.go
+++ b/internal/admin/service.go
@@ -1187,7 +1187,7 @@ func (s *Service) ListEnvironments() ([]map[string]interface{}, error) {
storageImpl = "minio"
}
result = append(result, map[string]interface{}{
- "env": "STORAGE",
+ "env": "STORAGE_IMPL",
"value": storageImpl,
})
diff --git a/internal/server/config.go b/internal/server/config.go
index eb80e14c81..a610d96b09 100644
--- a/internal/server/config.go
+++ b/internal/server/config.go
@@ -86,11 +86,6 @@ func Init(configPath string) error {
return fmt.Errorf("parse doc engine config error: %w", err)
}
- err = globalConfig.ParseStorageEngineConfig(v)
- if err != nil {
- return fmt.Errorf("parse storage engine config error: %w", err)
- }
-
err = globalConfig.ParseCacheEngineConfig(v)
if err != nil {
return fmt.Errorf("parse cache engine config error: %w", err)
@@ -146,6 +141,11 @@ func Init(configPath string) error {
return fmt.Errorf("get environments error: %w", err)
}
+ err = globalConfig.ParseStorageEngineConfig(v)
+ if err != nil {
+ return fmt.Errorf("parse storage engine config error: %w", err)
+ }
+
err = globalConfig.ParseBillingConfig(v)
if err != nil {
return fmt.Errorf("parse billing config error: %w", err)
diff --git a/internal/server/config/base.go b/internal/server/config/base.go
index dfbb624240..1ffacd2164 100644
--- a/internal/server/config/base.go
+++ b/internal/server/config/base.go
@@ -19,14 +19,15 @@ package config
import "ragflow/internal/common"
type Config struct {
- general GeneralConfig
- database DatabaseConfig
- docEngine DocEngineConfig
- storageEngine StorageConfig
- cacheEngine CacheEngineConfig
- queueEngine QueueEngineConfig
- analyticEngine AnalyticEngineConfig
- oTel OpenTelemetryConfig
+ general GeneralConfig
+ generalStorageEngineSet bool
+ database DatabaseConfig
+ docEngine DocEngineConfig
+ storageEngine StorageConfig
+ cacheEngine CacheEngineConfig
+ queueEngine QueueEngineConfig
+ analyticEngine AnalyticEngineConfig
+ oTel OpenTelemetryConfig
admin AdminConfig
apiServer APIServerConfig
diff --git a/internal/server/config/environments.go b/internal/server/config/environments.go
index 8cff358f5b..94baae6b7e 100644
--- a/internal/server/config/environments.go
+++ b/internal/server/config/environments.go
@@ -186,6 +186,8 @@ func (c *Config) GetEnvironments() error {
switch storageType {
case "minio", "s3", "oss", "gcs":
c.environments.StorageType = storageType
+ case "aws_s3":
+ c.environments.StorageType = "s3"
default:
return fmt.Errorf("invalid storage type: %s", storageType)
}
diff --git a/internal/server/config/general_config.go b/internal/server/config/general_config.go
index d8fe8d3c10..804fea6489 100644
--- a/internal/server/config/general_config.go
+++ b/internal/server/config/general_config.go
@@ -70,6 +70,7 @@ func (c *Config) ParseGeneralConfig(v *viper.Viper) error {
}
if sub.IsSet("storage_engine") {
c.general.StorageEngine = sub.GetString("storage_engine")
+ c.generalStorageEngineSet = true
}
if sub.IsSet("cache_engine") {
c.general.CacheEngine = sub.GetString("cache_engine")
@@ -109,6 +110,9 @@ func (c *Config) DocEngineType() string {
}
func (c *Config) StorageEngineType() string {
+ if c.environments.StorageType != "" {
+ return c.environments.StorageType
+ }
return c.general.StorageEngine
}
diff --git a/internal/server/config/storage_engine_config.go b/internal/server/config/storage_engine_config.go
index 21b514e3b5..60837a1faa 100644
--- a/internal/server/config/storage_engine_config.go
+++ b/internal/server/config/storage_engine_config.go
@@ -18,6 +18,7 @@ package config
import (
"fmt"
+ "strings"
"github.com/spf13/viper"
)
@@ -31,7 +32,21 @@ type StorageConfig struct {
}
func (c *Config) ParseStorageEngineConfig(v *viper.Viper) error {
- switch c.general.StorageEngine {
+ if envStorage := c.environments.StorageType; envStorage != "" {
+ configuredStorage := strings.ToLower(strings.TrimSpace(c.general.StorageEngine))
+ if configuredStorage == "aws_s3" {
+ configuredStorage = "s3"
+ }
+ if configuredStorage != envStorage {
+ if !c.generalStorageEngineSet {
+ return fmt.Errorf("STORAGE_IMPL selects %q, but general.storage_engine must be set explicitly; changing storage backends does not migrate existing object keys", envStorage)
+ }
+ return fmt.Errorf("STORAGE_IMPL selects %q but general.storage_engine is %q; set both to the same backend after migrating existing object data", envStorage, c.general.StorageEngine)
+ }
+ }
+
+ storageEngine := c.StorageEngineType()
+ switch storageEngine {
case "minio":
c.parseMinioConfig(v)
case "s3":
@@ -41,7 +56,7 @@ func (c *Config) ParseStorageEngineConfig(v *viper.Viper) error {
case "gcs":
c.parseGCSConfig(v)
default:
- return fmt.Errorf("invalid storage type: %s", c.general.StorageEngine)
+ return fmt.Errorf("invalid storage type: %s", storageEngine)
}
return nil
diff --git a/internal/server/config/storage_environment_test.go b/internal/server/config/storage_environment_test.go
new file mode 100644
index 0000000000..9e7bfc01d8
--- /dev/null
+++ b/internal/server/config/storage_environment_test.go
@@ -0,0 +1,55 @@
+//
+// Copyright 2026 The InfiniFlow Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package config
+
+import (
+ "testing"
+
+ "github.com/spf13/viper"
+ "ragflow/internal/common"
+)
+
+func TestStorageImplEnvironmentSelectsStorageEngine(t *testing.T) {
+ for _, tc := range []struct {
+ name string
+ value string
+ want string
+ }{
+ {name: "documented AWS S3 value", value: "AWS_S3", want: "s3"},
+ {name: "S3 alias", value: "s3", want: "s3"},
+ {name: "OSS", value: "OSS", want: "oss"},
+ {name: "GCS", value: "GCS", want: "gcs"},
+ } {
+ t.Run(tc.name, func(t *testing.T) {
+ t.Setenv(common.EnvStorageImpl, tc.value)
+ v := viper.New()
+ v.Set("general.storage_engine", tc.want)
+ cfg := &Config{}
+ if err := cfg.ParseGeneralConfig(v); err != nil {
+ t.Fatalf("ParseGeneralConfig: %v", err)
+ }
+ if err := cfg.GetEnvironments(); err != nil {
+ t.Fatalf("GetEnvironments: %v", err)
+ }
+ if err := cfg.ParseStorageEngineConfig(v); err != nil {
+ t.Fatalf("ParseStorageEngineConfig: %v", err)
+ }
+ if got := cfg.StorageEngineType(); got != tc.want {
+ t.Fatalf("StorageEngineType() = %q, want %q", got, tc.want)
+ }
+ })
+ }
+}
diff --git a/internal/service/chat.go b/internal/service/chat.go
index 9fd2d32716..47541307de 100644
--- a/internal/service/chat.go
+++ b/internal/service/chat.go
@@ -213,7 +213,11 @@ func (s *ChatService) Create(ctx context.Context, userID string, req map[string]
return nil, common.CodeDataError, err
}
- if datasetIDsValue, ok := req["dataset_ids"]; ok {
+ datasetIDsValue, hasDatasetIDs := req["dataset_ids"]
+ if !hasDatasetIDs {
+ datasetIDsValue, hasDatasetIDs = req["kb_ids"]
+ }
+ if hasDatasetIDs {
kbIDs, err := s.validateCreateDatasetIDs(ctx, datasetIDsValue, userID)
if err != nil {
return nil, common.CodeDataError, err
@@ -407,6 +411,20 @@ func (s *ChatService) validateCreateDatasetIDs(ctx context.Context, value interf
return normalizedIDs, nil
}
+func validateChatDatasetAccess(ctx context.Context, userID string, kbIDs entity.JSONSlice) error {
+ for _, rawID := range kbIDs {
+ datasetID, ok := rawID.(string)
+ if !ok || strings.TrimSpace(datasetID) == "" {
+ continue
+ }
+ if err := CheckDatasetAccess(ctx, permission.Subject{UserID: userID}, datasetID, permission.OperationUse); err != nil {
+ _, permissionErr := permissionresponse.Normalize(err)
+ return permissionErr
+ }
+ }
+ return nil
+}
+
func resolveCreateLLMID(ctx context.Context, llmID, tenantID string, llmSetting map[string]interface{}) (string, error) {
if llmID == "" {
return "", nil
@@ -862,7 +880,11 @@ func (s *ChatService) updateChatREST(ctx context.Context, userID, chatID string,
}
}
- if value, ok := req["dataset_ids"]; ok {
+ value, hasDatasetIDs := req["dataset_ids"]
+ if !hasDatasetIDs {
+ value, hasDatasetIDs = req["kb_ids"]
+ }
+ if hasDatasetIDs {
kbIDs, err := s.validateRESTDatasetIDs(ctx, value, userID)
if err != nil {
return nil, err
@@ -1046,7 +1068,7 @@ func (s *ChatService) validateRESTDatasetIDs(ctx context.Context, value interfac
if value == nil {
return entity.JSONSlice{}, nil
}
- items, ok := value.([]interface{})
+ items, ok := listFromValue(value)
if !ok {
return nil, errors.New("`dataset_ids` should be a list")
}
diff --git a/internal/service/chat_pipeline.go b/internal/service/chat_pipeline.go
index 25c435f7e6..b1dc975df9 100644
--- a/internal/service/chat_pipeline.go
+++ b/internal/service/chat_pipeline.go
@@ -240,6 +240,9 @@ func (s *ChatPipelineService) AsyncChat(
if role, _ := lastMsg["role"].(string); role != "user" {
return nil, fmt.Errorf("the last content of this conversation is not from user")
}
+ if err := validateChatDatasetAccess(ctx, userID, chat.KBIDs); err != nil {
+ return nil, err
+ }
// Resolve what this conversation can reach BEFORE dispatching: whether it
// has knowledge bases, and whether web search is enabled.
diff --git a/internal/service/chat_pipeline_test.go b/internal/service/chat_pipeline_test.go
index 081943598e..ea8fd04d2f 100644
--- a/internal/service/chat_pipeline_test.go
+++ b/internal/service/chat_pipeline_test.go
@@ -19,6 +19,7 @@ package service
import (
"context"
"encoding/json"
+ "errors"
"fmt"
"reflect"
"sort"
@@ -33,6 +34,7 @@ import (
"ragflow/internal/engine"
"ragflow/internal/entity"
modelModule "ragflow/internal/entity/models"
+ "ragflow/internal/permission"
)
// dialForTest builds a minimal *entity.Chat suitable for the
@@ -106,6 +108,30 @@ func TestAsyncChat_EmptyMessages(t *testing.T) {
}
}
+func TestAsyncChatRejectsUnauthorizedDatasetsBeforeStartingPipeline(t *testing.T) {
+ db := setupChatRESTUpdateServiceTestDB(t)
+ insertForeignPrivateDatasetForChatTest(t, db)
+
+ chat := dialForTest("")
+ chat.KBIDs = []interface{}{"kb-private"}
+ results, err := (&ChatPipelineService{}).AsyncChat(
+ serviceTestContext(t, "user-1", "user-1"),
+ "user-1",
+ chat,
+ []map[string]interface{}{{"role": "user", "content": "show me the private dataset"}},
+ false,
+ nil,
+ )
+ if err == nil {
+ for range results {
+ }
+ t.Fatal("AsyncChat accepted another user's private dataset")
+ }
+ if !errors.Is(err, permission.ErrPermissionDenied) {
+ t.Fatalf("AsyncChat error = %v, want permission denied", err)
+ }
+}
+
// TestBuildChatConfig_GenerationConfigReachesModel pins that the dialog's LLM
// setting and per-request overrides (temperature, top_p, max_tokens, thinking,
// stop) reach the model driver, and that request-level overrides win.
diff --git a/internal/service/chat_rest_update_test.go b/internal/service/chat_rest_update_test.go
index 9d16f4378f..a3f65c2289 100644
--- a/internal/service/chat_rest_update_test.go
+++ b/internal/service/chat_rest_update_test.go
@@ -2,6 +2,7 @@ package service
import (
"encoding/json"
+ "errors"
"math"
"strings"
"testing"
@@ -12,6 +13,7 @@ import (
"ragflow/internal/common"
"ragflow/internal/dao"
"ragflow/internal/entity"
+ "ragflow/internal/permission"
)
func setupChatRESTUpdateServiceTestDB(t *testing.T) *gorm.DB {
@@ -107,6 +109,59 @@ func createChatRESTUpdateServiceTestChat(t *testing.T, db *gorm.DB, id, tenantID
}
}
+func insertForeignPrivateDatasetForChatTest(t *testing.T, db *gorm.DB) {
+ t.Helper()
+
+ status := string(entity.StatusValid)
+ if err := db.Create(&entity.Tenant{ID: "user-2", Status: &status}).Error; err != nil {
+ t.Fatalf("failed to create foreign tenant: %v", err)
+ }
+ if err := db.Create(&entity.UserTenant{
+ ID: "owner-user-2", UserID: "user-2", TenantID: "user-2", Role: "owner", Status: &status,
+ }).Error; err != nil {
+ t.Fatalf("failed to create foreign tenant owner: %v", err)
+ }
+ if err := db.Create(&entity.Knowledgebase{
+ ID: "kb-private", TenantID: "user-2", CreatedBy: "user-2", Name: "private dataset",
+ ChunkNum: 1, Permission: string(entity.TenantPermissionMe), Status: &status,
+ }).Error; err != nil {
+ t.Fatalf("failed to create private dataset: %v", err)
+ }
+}
+
+func TestChatServiceCreateRejectsForeignKBIDs(t *testing.T) {
+ db := setupChatRESTUpdateServiceTestDB(t)
+ insertForeignPrivateDatasetForChatTest(t, db)
+
+ _, _, err := NewChatService().Create(serviceTestContext(t, "user-1", "user-1"), "user-1", map[string]interface{}{
+ "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)
+ }
+}
+
+func TestChatServicePatchRejectsForeignKBIDs(t *testing.T) {
+ db := setupChatRESTUpdateServiceTestDB(t)
+ insertForeignPrivateDatasetForChatTest(t, db)
+ createChatRESTUpdateServiceTestChat(t, db, "chat-1", "user-1")
+
+ _, 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)
+ }
+ chat, loadErr := dao.NewChatDAO().GetByID(t.Context(), db, "chat-1")
+ if loadErr != nil {
+ t.Fatalf("failed to reload chat: %v", loadErr)
+ }
+ if len(chat.KBIDs) != 0 {
+ t.Fatalf("PatchChat persisted unauthorized dataset IDs: %v", chat.KBIDs)
+ }
+}
+
func assertEmptyMetaDataFilter(t *testing.T, value interface{}) {
t.Helper()
@@ -619,7 +674,14 @@ func TestChatServiceCreatePromptDefaultsContract(t *testing.T) {
}
func TestChatServiceCreateWithDatasetSeedsDatasetSystemPrompt(t *testing.T) {
- setupChatRESTUpdateServiceTestDB(t)
+ db := setupChatRESTUpdateServiceTestDB(t)
+ status := string(entity.StatusValid)
+ if err := db.Create(&entity.Knowledgebase{
+ ID: "kb-1", TenantID: "user-1", CreatedBy: "user-1", Name: "dataset",
+ ChunkNum: 1, Permission: string(entity.TenantPermissionMe), Status: &status,
+ }).Error; err != nil {
+ t.Fatalf("failed to create dataset: %v", err)
+ }
svc := NewChatService()
ctx := serviceTestContext(t, "user-1", "user-1")
diff --git a/internal/service/openai_chat.go b/internal/service/openai_chat.go
index 937e2629fd..54547c8780 100644
--- a/internal/service/openai_chat.go
+++ b/internal/service/openai_chat.go
@@ -249,6 +249,11 @@ func (s *OpenAIChatService) OpenAIChatCompletions(c *gin.Context, userID, chatID
return
}
dialog := dialogResp.Chat
+ if err := validateChatDatasetAccess(ctx, userID, dialog.KBIDs); err != nil {
+ code, permissionErr := permissionresponse.NormalizeHidden(err)
+ common.ResponseWithCodeData(c, code, nil, permissionErr.Error())
+ return
+ }
resolvedModel := req.Model
if req.Model == "model" {
resolvedModel = dialog.LLMID