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(query-span): guard cyclic view expansion (#20153)
rebelice4e2720da0579
diff --git a/backend/plugin/parser/mysql/query_span_extractor.go b/backend/plugin/parser/mysql/query_span_extractor.goindex 25e7e09003..19a4abbf72 100644--- a/backend/plugin/parser/mysql/query_span_extractor.go+++ b/backend/plugin/parser/mysql/query_span_extractor.go@@ -40,6 +40,8 @@ type querySpanExtractor struct {// priorTableInFrom is the table sources from the from clause before the current table source.// It's used to resolve the column name in JSON_TABLE functions.priorTableInFrom []base.TableSource++ viewResolutionStack map[string]bool}// newQuerySpanExtractor creates a new query span extractor, the databaseMetadata and the ast are in the read guard.@@ -451,11 +453,12 @@ func (q *querySpanExtractor) extractSourceColumnSetFromExpr(ctx antlr.ParserRulesubqueryExtractor := &querySpanExtractor{ctx: q.ctx,// The defaultDatabase is the same as the outer query.- defaultDatabase: q.defaultDatabase,- gCtx: q.gCtx,- ctes: q.ctes,- outerTableSources: append(q.outerTableSources, q.tableSourceFrom...),- tableSourceFrom: []base.TableSource{},+ defaultDatabase: q.defaultDatabase,+ gCtx: q.gCtx,+ ctes: q.ctes,+ outerTableSources: append(q.outerTableSources, q.tableSourceFrom...),+ tableSourceFrom: []base.TableSource{},+ viewResolutionStack: cloneViewResolutionStack(q.viewResolutionStack),}tableSource, err := subqueryExtractor.extractSubquery(ctx)if err != nil {@@ -1400,7 +1403,7 @@ func (q *querySpanExtractor) findTableSchema(databaseName, tableName string) (baviewSchema = schema.GetView(tableName)}if viewSchema != nil {- columns, err := q.getColumnsForView(viewSchema.Definition)+ columns, err := q.getColumnsForView(dbMetadata.GetProto().GetName(), viewSchema.Name, viewSchema.Definition)if err != nil {return nil, errors.Wrapf(err, "failed to get columns for view %q", tableName)}@@ -1420,8 +1423,15 @@ func (q *querySpanExtractor) findTableSchema(databaseName, tableName string) (ba}}-func (q *querySpanExtractor) getColumnsForView(definition string) ([]base.QuerySpanResult, error) {+func (q *querySpanExtractor) getColumnsForView(databaseName, viewName, definition string) ([]base.QuerySpanResult, error) {+ key := mysqlViewResolutionKey(databaseName, viewName)+ if q.viewResolutionStack[key] {+ return nil, errors.Errorf("cyclic view reference detected while resolving %q", viewName)+ }+newQ := newQuerySpanExtractor(q.defaultDatabase, q.gCtx, q.ignoreCaseSensitive)+ newQ.viewResolutionStack = cloneViewResolutionStack(q.viewResolutionStack)+ newQ.viewResolutionStack[key] = truespan, err := newQ.getQuerySpan(q.ctx, definition)if err != nil {return nil, errors.Wrap(err, "failed to get query span for view")@@ -1432,6 +1442,18 @@ func (q *querySpanExtractor) getColumnsForView(definition string) ([]base.QuerySreturn span.Results, nil}+func mysqlViewResolutionKey(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+}+// selectOnlyListener is the listener to listen the top level select statement only.type selectOnlyListener struct {*parser.BaseMySQLParserListenerdiff --git a/backend/plugin/parser/mysql/query_span_test.go b/backend/plugin/parser/mysql/query_span_test.goindex e9175edb57..ba2bd77891 100644--- a/backend/plugin/parser/mysql/query_span_test.go+++ b/backend/plugin/parser/mysql/query_span_test.go@@ -104,6 +104,30 @@ func buildMockDatabaseMetadataGetter(databaseMetadata []*storepb.DatabaseSchemaM}}+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"},+ },+ },+ },+ }+ getter, lister := buildMockDatabaseMetadataGetter([]*storepb.DatabaseSchemaMetadata{metadata})++ _, err := GetQuerySpan(context.Background(), base.GetQuerySpanContext{+ GetDatabaseMetadataFunc: getter,+ ListDatabaseNamesFunc: lister,+ Engine: storepb.Engine_MYSQL,+ }, base.Statement{Text: "SELECT * FROM v1"}, "db", "", false)+ require.Error(t, err)+ require.ErrorContains(t, err, "cyclic view reference")+}+func TestExtractTableRefs(t *testing.T) {tests := []struct {statement stringdiff --git a/backend/plugin/parser/tsql/query_span_extractor.go b/backend/plugin/parser/tsql/query_span_extractor.goindex b05d02392c..fb2630d976 100644--- a/backend/plugin/parser/tsql/query_span_extractor.go+++ b/backend/plugin/parser/tsql/query_span_extractor.go@@ -37,6 +37,8 @@ type querySpanExtractor struct {tableSourcesFrom []base.TableSourcepredicateColumns base.SourceColumnSet++ viewResolutionStack map[string]bool}func newQuerySpanExtractor(defaultDatabase string, defaultSchema string, gCtx base.GetQuerySpanContext, ignoreCaseSensitive bool) *querySpanExtractor {@@ -127,7 +129,7 @@ func (q *querySpanExtractor) tsqlFindTableSchemaByParts(linkedServer, rawDatabascontinue}view := schemaSchema.GetView(viewName)- viewColumns, err := q.getColumnsFromCreateView(view.Definition, databaseName, schemaName)+ viewColumns, err := q.getColumnsFromCreateView(view.Definition, databaseName, schemaName, viewName)if err != nil {return nil, errors.Wrapf(err, "failed to get columns for view %s.%s.%s", databaseName, schemaName, viewName)}@@ -149,7 +151,12 @@ func (q *querySpanExtractor) tsqlFindTableSchemaByParts(linkedServer, rawDatabas// getColumnsFromCreateView parses a CREATE VIEW definition with omni, extracts// the body's result columns, and applies the optional column alias list.-func (q *querySpanExtractor) getColumnsFromCreateView(definition string, viewDatabaseName string, viewSchemaName string) ([]base.QuerySpanResult, error) {+func (q *querySpanExtractor) getColumnsFromCreateView(definition string, viewDatabaseName string, viewSchemaName string, viewName string) ([]base.QuerySpanResult, error) {+ key := tsqlViewResolutionKey(viewDatabaseName, viewSchemaName, viewName)+ if q.viewResolutionStack[key] {+ return nil, errors.Errorf("cyclic view reference detected while resolving %q", viewName)+ }+stmts, err := ParseTSQLOmni(definition)if err != nil {return nil, errors.Wrapf(err, "failed to parse CREATE VIEW definition")@@ -180,6 +187,8 @@ func (q *querySpanExtractor) getColumnsFromCreateView(definition string, viewDatnewQ := newOmniQuerySpanExtractor(viewDatabaseName, viewSchemaName, q.gCtx, q.ignoreCaseSensitive)newQ.ctx = q.ctxnewQ.source = definition+ newQ.viewResolutionStack = cloneViewResolutionStack(q.viewResolutionStack)+ newQ.viewResolutionStack[key] = truepseudo, err := newQ.extractFromSelectStmt(body)if err != nil {var resourceNotFound *base.ResourceNotFoundError@@ -198,6 +207,18 @@ func (q *querySpanExtractor) getColumnsFromCreateView(definition string, viewDatreturn results, nil}+func tsqlViewResolutionKey(databaseName, schemaName, viewName string) string {+ return databaseName + "\x00" + schemaName + "\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+}+// tsqlGetAllFieldsOfTableInFromOrOuterCTE expands `table.*` to the column set// of the matching table source in scope.func (q *querySpanExtractor) tsqlGetAllFieldsOfTableInFromOrOuterCTE(normalizedDatabaseName, normalizedSchemaName, normalizedTableName string) ([]base.QuerySpanResult, error) {diff --git a/backend/plugin/parser/tsql/query_span_extractor_omni.go b/backend/plugin/parser/tsql/query_span_extractor_omni.goindex fc7af59fd2..32fc2ec951 100644--- a/backend/plugin/parser/tsql/query_span_extractor_omni.go+++ b/backend/plugin/parser/tsql/query_span_extractor_omni.go@@ -448,6 +448,7 @@ func (q *omniQuerySpanExtractor) extractCTEBody(cteName string, body *ast.Selectctes: append([]*base.PseudoTable{}, q.ctes...),outerTableSources: nil,predicateColumns: make(base.SourceColumnSet),+ viewResolutionStack: cloneViewResolutionStack(q.viewResolutionStack),},source: q.source,}@@ -793,6 +794,7 @@ func (q *omniQuerySpanExtractor) cloneForSubquery() *omniQuerySpanExtractor {ctes: append([]*base.PseudoTable{}, q.ctes...),outerTableSources: append(append([]base.TableSource{}, q.outerTableSources...), q.tableSourcesFrom...),predicateColumns: make(base.SourceColumnSet),+ viewResolutionStack: cloneViewResolutionStack(q.viewResolutionStack),},source: q.source,}diff --git a/backend/plugin/parser/tsql/query_span_test.go b/backend/plugin/parser/tsql/query_span_test.goindex 76baf9918c..d44a53033a 100644--- a/backend/plugin/parser/tsql/query_span_test.go+++ b/backend/plugin/parser/tsql/query_span_test.go@@ -100,3 +100,27 @@ func buildMockDatabaseMetadataGetter(databaseMetadata []*storepb.DatabaseSchemaMreturn names, nil}}++func TestGetQuerySpanCyclicViewReference(t *testing.T) {+ metadata := &storepb.DatabaseSchemaMetadata{+ Name: "db",+ Schemas: []*storepb.SchemaMetadata{+ {+ Name: "dbo",+ Views: []*storepb.ViewMetadata{+ {Name: "v1", Definition: "CREATE VIEW [dbo].[v1] AS SELECT * FROM v2"},+ {Name: "v2", Definition: "CREATE VIEW [dbo].[v2] AS SELECT * FROM v1"},+ },+ },+ },+ }+ getter, lister := buildMockDatabaseMetadataGetter([]*storepb.DatabaseSchemaMetadata{metadata})++ _, err := GetQuerySpan(context.Background(), base.GetQuerySpanContext{+ GetDatabaseMetadataFunc: getter,+ ListDatabaseNamesFunc: lister,+ TempTables: make(map[string]*base.PhysicalTable),+ }, base.Statement{Text: "SELECT * FROM v1"}, "db", "dbo", true)+ require.Error(t, err)+ require.ErrorContains(t, err, "cyclic view reference")+}