Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
fix(tidb): guard cyclic view expansion in query span extractor (#20495)
Vincent Huanga90462ef3580
diff --git a/backend/plugin/parser/tidb/query_span_extractor.go b/backend/plugin/parser/tidb/query_span_extractor.goindex f7c1e35699..dc19acf5cf 100644--- a/backend/plugin/parser/tidb/query_span_extractor.go+++ b/backend/plugin/parser/tidb/query_span_extractor.go@@ -22,6 +22,11 @@ type querySpanExtractor struct {ctes []*base.PseudoTableouterTableSources []base.TableSourcetableSourcesFrom []base.TableSource++ // viewResolutionStack tracks the views currently being expanded so a+ // cyclic view reference (a view that transitively references itself) is+ // reported as an error instead of recursing until the stack overflows.+ viewResolutionStack map[string]bool}func newQuerySpanExtractor(defaultDatabase string, gCtx base.GetQuerySpanContext) *querySpanExtractor {@@ -557,13 +562,14 @@ func (q *querySpanExtractor) extractSourceColumnSetFromExpression(in tidbast.Exp// So that the subquery can access the outer schema.// The reason for new q is that we still need the current fromFieldList, overriding it is not expected.subqueryExtractor := &querySpanExtractor{- ctx: q.ctx,- defaultDatabase: q.defaultDatabase,- metaCache: q.metaCache,- gCtx: q.gCtx,- ctes: q.ctes,- outerTableSources: append(q.outerTableSources, q.tableSourcesFrom...),- tableSourcesFrom: []base.TableSource{},+ ctx: q.ctx,+ defaultDatabase: q.defaultDatabase,+ metaCache: q.metaCache,+ gCtx: q.gCtx,+ ctes: q.ctes,+ outerTableSources: append(q.outerTableSources, q.tableSourcesFrom...),+ tableSourcesFrom: []base.TableSource{},+ viewResolutionStack: cloneViewResolutionStack(q.viewResolutionStack),}tableSource, err := subqueryExtractor.extractTableSourceFromNode(node.Query)if err != nil {@@ -874,7 +880,7 @@ func (q *querySpanExtractor) findTableSchema(databaseName string, tableName striif lowerTableName == strings.ToLower(view) {viewMeta := schema.GetView(view)if viewMeta != nil {- columns, err := q.getColumnsForView(viewMeta.Definition)+ columns, err := q.getColumnsForView(databaseName, viewMeta.Name, viewMeta.Definition)if err != nil {return nil, err}@@ -894,8 +900,14 @@ func (q *querySpanExtractor) findTableSchema(databaseName string, tableName stri}}-func (q *querySpanExtractor) getColumnsForView(definition string) ([]base.QuerySpanResult, error) {+func (q *querySpanExtractor) getColumnsForView(databaseName, viewName, definition string) ([]base.QuerySpanResult, error) {+ key := viewResolutionKey(databaseName, viewName)+ if q.viewResolutionStack[key] {+ return nil, errors.Errorf("cyclic view reference detected while resolving %q", viewName)+ }newQ := newQuerySpanExtractor(q.defaultDatabase, q.gCtx)+ newQ.viewResolutionStack = cloneViewResolutionStack(q.viewResolutionStack)+ newQ.viewResolutionStack[key] = truespan, err := newQ.getQuerySpan(q.ctx, definition)if err != nil {return nil, err@@ -906,6 +918,18 @@ func (q *querySpanExtractor) getColumnsForView(definition string) ([]base.QuerySreturn span.Results, nil}+func viewResolutionKey(databaseName, viewName string) string {+ return databaseName + "\x00" + viewName+}++func cloneViewResolutionStack(in map[string]bool) map[string]bool {+ out := make(map[string]bool, len(in))+ for k, v := range in {+ out[k] = v+ }+ return out+}+func (q *querySpanExtractor) getDatabaseMetadata(databaseName string) (*model.DatabaseMetadata, error) {if meta, ok := q.metaCache[databaseName]; ok {return meta, nildiff --git a/backend/plugin/parser/tidb/query_span_test.go b/backend/plugin/parser/tidb/query_span_test.goindex 61b6c30758..fa82c4c936 100644--- a/backend/plugin/parser/tidb/query_span_test.go+++ b/backend/plugin/parser/tidb/query_span_test.go@@ -231,6 +231,39 @@ func TestGetQuerySpanMissingTableUnionedWithAccessTables(t *testing.T) {a.True(foundUnknown, "not-found table must be unioned into SourceColumns so the pre-execute ACL check sees it")}+// TestGetQuerySpanCyclicViewReference pins that a cyclic view reference is+// reported as an error rather than recursing until the stack overflows.+// Ported from the MySQL guard (#20153).+func TestGetQuerySpanCyclicViewReference(t *testing.T) {+ metadata := &storepb.DatabaseSchemaMetadata{+ Name: "db",+ Schemas: []*storepb.SchemaMetadata{+ {+ Name: "",+ Views: []*storepb.ViewMetadata{+ {Name: "v1", Definition: "SELECT * FROM v2"},+ {Name: "v2", Definition: "SELECT * FROM v1"},+ },+ },+ },+ }+ databaseMetadataGetter, databaseNamesLister := buildMockDatabaseMetadataGetter([]*storepb.DatabaseSchemaMetadata{metadata})++ _, err := GetQuerySpan(+ context.TODO(),+ base.GetQuerySpanContext{+ GetDatabaseMetadataFunc: databaseMetadataGetter,+ ListDatabaseNamesFunc: databaseNamesLister,+ },+ base.Statement{Text: "SELECT * FROM v1"},+ "db",+ "",+ false,+ )+ require.Error(t, err)+ require.ErrorContains(t, err, "cyclic view reference")+}+func buildMockDatabaseMetadataGetter(databaseMetadata []*storepb.DatabaseSchemaMetadata) (base.GetDatabaseMetadataFunc, base.ListDatabaseNamesFunc) {return func(_ context.Context, _, databaseName string) (string, *model.DatabaseMetadata, error) {m := make(map[string]*model.DatabaseMetadata)