Use Data Source ID only to check for rule type references (#5121)

The project ID belongs to the rule type, so we only check for the data source ID when checking for references before attempting to delete. This should be fairly safe as we have already checked the project ID beforehand. Signed-off-by: Juan Antonio Osorio <[email protected]>
mindersec · Dec 3, 2024 · fe30177 · fe30177
1 parent c7e8d6d
commit fe30177
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 38 deletions.
diff --git a/database/mock/store.go b/database/mock/store.go
diff --git a/database/query/datasources.sql b/database/query/datasources.sql
@@ -84,7 +84,7 @@ WHERE data_source_id = $1 AND project_id = $2;
 --
 -- name: ListRuleTypesReferencesByDataSource :many
 SELECT * FROM rule_type_data_sources
-WHERE data_sources_id = $1 AND project_id = $2;
+WHERE data_sources_id = $1;
 
 -- AddRuleTypeDataSourceReference adds a link between one rule type
 -- and one data source it uses.

diff --git a/internal/datasources/service/service.go b/internal/datasources/service/service.go
@@ -328,10 +328,7 @@ func (d *dataSourceService) Delete(
 	tx := stx.Q()
 
 	// List rule types referencing the data source
-	ret, err := tx.ListRuleTypesReferencesByDataSource(ctx, db.ListRuleTypesReferencesByDataSourceParams{
-		DataSourcesID: id,
-		ProjectID:     project,
-	})
+	ret, err := tx.ListRuleTypesReferencesByDataSource(ctx, id)
 	if err != nil {
 		return fmt.Errorf("failed to list rule types referencing data source %s: %w", id, err)
 	}

diff --git a/internal/datasources/service/service_test.go b/internal/datasources/service/service_test.go
@@ -898,10 +898,7 @@ func TestDelete(t *testing.T) {
 			setup: func(args args, mockDB *mockdb.MockStore) {
 				// Mock ListRuleTypesReferencesByDataSource to return empty list
 				mockDB.EXPECT().
-					ListRuleTypesReferencesByDataSource(gomock.Any(), gomock.Eq(db.ListRuleTypesReferencesByDataSourceParams{
-						DataSourcesID: args.id,
-						ProjectID:     args.project,
-					})).
+					ListRuleTypesReferencesByDataSource(gomock.Any(), args.id).
 					Return([]db.RuleTypeDataSource{}, nil)
 
 				// Mock DeleteDataSource to succeed
@@ -924,10 +921,7 @@ func TestDelete(t *testing.T) {
 			setup: func(args args, mockDB *mockdb.MockStore) {
 				// Mock ListRuleTypesReferencesByDataSource to return empty list
 				mockDB.EXPECT().
-					ListRuleTypesReferencesByDataSource(gomock.Any(), gomock.Eq(db.ListRuleTypesReferencesByDataSourceParams{
-						DataSourcesID: args.id,
-						ProjectID:     args.project,
-					})).
+					ListRuleTypesReferencesByDataSource(gomock.Any(), args.id).
 					Return([]db.RuleTypeDataSource{}, nil)
 
 				// Mock DeleteDataSource to return sql.ErrNoRows
@@ -950,10 +944,7 @@ func TestDelete(t *testing.T) {
 			setup: func(args args, mockDB *mockdb.MockStore) {
 				// Mock ListRuleTypesReferencesByDataSource to return non-empty list
 				mockDB.EXPECT().
-					ListRuleTypesReferencesByDataSource(gomock.Any(), gomock.Eq(db.ListRuleTypesReferencesByDataSourceParams{
-						DataSourcesID: args.id,
-						ProjectID:     args.project,
-					})).
+					ListRuleTypesReferencesByDataSource(gomock.Any(), args.id).
 					Return([]db.RuleTypeDataSource{
 						{RuleTypeID: uuid.New()},
 					}, nil)
@@ -970,10 +961,7 @@ func TestDelete(t *testing.T) {
 			setup: func(args args, mockDB *mockdb.MockStore) {
 				// Mock ListRuleTypesReferencesByDataSource to return an error
 				mockDB.EXPECT().
-					ListRuleTypesReferencesByDataSource(gomock.Any(), gomock.Eq(db.ListRuleTypesReferencesByDataSourceParams{
-						DataSourcesID: args.id,
-						ProjectID:     args.project,
-					})).
+					ListRuleTypesReferencesByDataSource(gomock.Any(), args.id).
 					Return(nil, fmt.Errorf("database error"))
 			},
 			wantErr: true,
@@ -988,10 +976,7 @@ func TestDelete(t *testing.T) {
 			setup: func(args args, mockDB *mockdb.MockStore) {
 				// Mock ListRuleTypesReferencesByDataSource to return empty list
 				mockDB.EXPECT().
-					ListRuleTypesReferencesByDataSource(gomock.Any(), gomock.Eq(db.ListRuleTypesReferencesByDataSourceParams{
-						DataSourcesID: args.id,
-						ProjectID:     args.project,
-					})).
+					ListRuleTypesReferencesByDataSource(gomock.Any(), args.id).
 					Return([]db.RuleTypeDataSource{}, nil)
 
 				// Mock DeleteDataSource to return an error

diff --git a/internal/db/datasources.sql.go b/internal/db/datasources.sql.go
diff --git a/internal/db/querier.go b/internal/db/querier.go