RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.
Go agent-harnessagent-native-databaseagentic-aiagentic-retrievalagentic-searchaiai-agentscontext-enginecontext-engineeringcontext-managementharness-engineeringknowledge-compilationragretrieval-augmented-generationretrieval-harnesssearch-harness
fix(dataset): return accessible datasets for ids filter (#19984)
adws70bf40bbf4b9
diff --git a/internal/handler/dataset_list_test.go b/internal/handler/dataset_list_test.goindex a627e8cfd1..f7a6978f15 100644--- a/internal/handler/dataset_list_test.go+++ b/internal/handler/dataset_list_test.go@@ -21,6 +21,7 @@ import (const (listDatasetsTestKBID = "123e4567e89b12d3a456426614174000"listDatasetsTestKBIDDashed = "123e4567-e89b-12d3-a456-426614174000"+ listDatasetsMissingKBID = "223e4567e89b12d3a456426614174000")func setupListDatasetsTestDB(t *testing.T) *gorm.DB {@@ -118,6 +119,24 @@ func TestDatasetsHandlerListDatasetsFiltersByIDs(t *testing.T) {}}+func TestDatasetsHandlerListDatasetsFiltersMissingIDs(t *testing.T) {+ setupListDatasetsTestDB(t)+ insertListDatasetsTestKB(t, listDatasetsTestKBID, "user-1", "Alpha")++ body := getListDatasets(t, newListDatasetsTestRouter(),+ fmt.Sprintf("ids=%s,%s&page_size=2", listDatasetsTestKBID, listDatasetsMissingKBID))++ if body.Code != int(common.CodeSuccess) {+ t.Fatalf("code=%d message=%q", body.Code, body.Message)+ }+ if body.TotalDatasets != 1 || len(body.Data) != 1 {+ t.Fatalf("expected exactly one dataset, got total=%d len=%d", body.TotalDatasets, len(body.Data))+ }+ if body.Data[0]["id"] != listDatasetsTestKBID {+ t.Fatalf("expected dataset id %q, got %#v", listDatasetsTestKBID, body.Data[0]["id"])+ }+}+func TestDatasetsHandlerListDatasetsRejectsInvalidIDInIDs(t *testing.T) {setupListDatasetsTestDB(t)diff --git a/internal/service/dataset/crud.go b/internal/service/dataset/crud.goindex 3ac413435f..88aa4375b9 100644--- a/internal/service/dataset/crud.go+++ b/internal/service/dataset/crud.go@@ -485,14 +485,24 @@ func (d *DatasetService) ListDatasets(ctx context.Context, id, name string, pagefor _, accessibleID := range accessibleIDs {accessible[accessibleID] = struct{}{}}+ filteredIDs := make([]string, 0, len(ids))deniedIDs := make([]string, 0, len(ids))for _, datasetID := range ids {- if _, ok := accessible[datasetID]; !ok {+ if _, ok := accessible[datasetID]; ok {+ filteredIDs = append(filteredIDs, datasetID)+ } else {deniedIDs = append(deniedIDs, datasetID)}}if len(deniedIDs) > 0 {- return nil, 0, common.CodeDataError, fmt.Errorf("user '%s' lacks permission for datasets: '%s'", userID, strings.Join(deniedIDs, ", "))+ common.Warn("User lacks permission for datasets",+ zap.String("user_id", userID),+ zap.Strings("dataset_ids", deniedIDs),+ )+ }+ ids = filteredIDs+ if len(ids) == 0 {+ return []map[string]interface{}{}, 0, common.CodeSuccess, nil}}diff --git a/internal/service/dataset/list_test.go b/internal/service/dataset/list_test.goindex 46ce3265d1..6b3bf3de2d 100644--- a/internal/service/dataset/list_test.go+++ b/internal/service/dataset/list_test.go@@ -1,7 +1,6 @@package datasetimport (- "strings""testing""ragflow/internal/common"@@ -96,24 +95,45 @@ func TestDatasetServiceListDatasetsRejectsIDAndIDsTogether(t *testing.T) {}}-func TestDatasetServiceListDatasetsRejectsDeniedIDs(t *testing.T) {+func TestDatasetServiceListDatasetsFiltersInaccessibleIDs(t *testing.T) {db := setupDatasetUpdateTestDB(t)pushServiceDB(t, db)+ insertDatasetUpdateKB(t, "kb-valid", "user-1", "Valid")insertDatasetUpdateKB(t, "kb-private", "owner-1", "Private")ctx := t.Context()- _, _, code, err := testDatasetListService(t).ListDatasets(ctx,+ data, total, code, err := testDatasetListService(t).ListDatasets(ctx,"", "", 1, 30, []dao.OrderTerm{{Column: "create_time", Desc: true}},- "", nil, "", "user-1", []string{"kb-private"},+ "", nil, "", "user-1", []string{"kb-valid", "kb-private", "kb-missing"},)- if err == nil {- t.Fatal("expected permission error")+ if err != nil {+ t.Fatalf("ListDatasets failed: %v", err)}- if code != common.CodeDataError {- t.Fatalf("expected data error code, got %d", code)+ if code != common.CodeSuccess {+ t.Fatalf("expected success code, got %d", code)}- expected := "user 'user-1' lacks permission for datasets: 'kb-private'"- if !strings.Contains(err.Error(), expected) {- t.Fatalf("unexpected error: %v", err)+ if total != 1 || len(data) != 1 || data[0]["id"] != "kb-valid" {+ t.Fatalf("expected only the valid dataset, got total=%d data=%#v", total, data)+ }+}++func TestDatasetServiceListDatasetsReturnsEmptyForAllInaccessibleIDs(t *testing.T) {+ db := setupDatasetUpdateTestDB(t)+ pushServiceDB(t, db)+ insertDatasetUpdateKB(t, "kb-private", "owner-1", "Private")++ ctx := t.Context()+ data, total, code, err := testDatasetListService(t).ListDatasets(ctx,+ "", "", 1, 30, []dao.OrderTerm{{Column: "create_time", Desc: true}},+ "", nil, "", "user-1", []string{"kb-private", "kb-missing"},+ )+ if err != nil {+ t.Fatalf("ListDatasets failed: %v", err)+ }+ if code != common.CodeSuccess {+ t.Fatalf("expected success code, got %d", code)+ }+ if data == nil || len(data) != 0 || total != 0 {+ t.Fatalf("expected a non-nil empty result, got total=%d data=%#v", total, data)}}