Skip to content

Fix Dolt table function privilege checks when current database is revision-qualified #10700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elianddb merged 4 commits into from
Mar 18, 2026
Merged

Fix Dolt table function privilege checks when current database is revision-qualified #10700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
463fae6
add revision db test for user privileges when using dolt table functions
elianddb Mar 17, 2026
aa1c032
fix table functions to resolve base database name
elianddb Mar 17, 2026
1c9eb1d
amend privileges_test name to follow tests naming convention
elianddb Mar 17, 2026
54d3a94
amend `dolt_query_diff` script test to expect database-level privileg…
elianddb Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion go/libraries/doltcore/sqle/dtablefunctions/dolt_diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,8 @@ func (dtf *DiffTableFunction) CheckAuth(ctx *sql.Context, opChecker sql.Privileg
return ExpressionIsDeferred(dtf.tableNameExpr)
}

subject := sql.PrivilegeCheckSubject{Database: dtf.database.Name(), Table: tableName}
baseDB, _ := doltdb.SplitRevisionDbName(dtf.database.Name())
subject := sql.PrivilegeCheckSubject{Database: baseDB, Table: tableName}
// TODO: Add tests for privilege checking
return opChecker.UserHasPrivileges(ctx,
sql.NewPrivilegedOperation(subject, sql.PrivilegeType_Select))
Expand Down
5 changes: 3 additions & 2 deletions go/libraries/doltcore/sqle/dtablefunctions/dolt_diff_stat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ func (ds *DiffStatTableFunction) WithChildren(children ...sql.Node) (sql.Node, e

// CheckAuth implements the interface sql.AuthorizationCheckerNode.
func (ds *DiffStatTableFunction) CheckAuth(ctx *sql.Context, opChecker sql.PrivilegedOperationChecker) bool {
baseDB, _ := doltdb.SplitRevisionDbName(ds.database.Name())
if ds.tableNameExpr != nil {
if !types.IsText(ds.tableNameExpr.Type()) {
return ExpressionIsDeferred(ds.tableNameExpr)
Expand All @@ -176,7 +177,7 @@ func (ds *DiffStatTableFunction) CheckAuth(ctx *sql.Context, opChecker sql.Privi
return false
}

subject := sql.PrivilegeCheckSubject{Database: ds.database.Name(), Table: tableName}
subject := sql.PrivilegeCheckSubject{Database: baseDB, Table: tableName}
return opChecker.UserHasPrivileges(ctx, sql.NewPrivilegedOperation(subject, sql.PrivilegeType_Select))
}

Expand All @@ -187,7 +188,7 @@ func (ds *DiffStatTableFunction) CheckAuth(ctx *sql.Context, opChecker sql.Privi

operations := make([]sql.PrivilegedOperation, 0, len(tblNames))
for _, tblName := range tblNames {
subject := sql.PrivilegeCheckSubject{Database: ds.database.Name(), Table: tblName}
subject := sql.PrivilegeCheckSubject{Database: baseDB, Table: tblName}
operations = append(operations, sql.NewPrivilegedOperation(subject, sql.PrivilegeType_Select))
}

Expand Down
5 changes: 3 additions & 2 deletions go/libraries/doltcore/sqle/dtablefunctions/dolt_diff_summary.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ func (ds *DiffSummaryTableFunction) WithChildren(children ...sql.Node) (sql.Node

// CheckAuth implements the interface sql.AuthorizationCheckerNode.
func (ds *DiffSummaryTableFunction) CheckAuth(ctx *sql.Context, opChecker sql.PrivilegedOperationChecker) bool {
baseDB, _ := doltdb.SplitRevisionDbName(ds.database.Name())
if ds.tableNameExpr != nil {
if !types.IsText(ds.tableNameExpr.Type()) {
return ExpressionIsDeferred(ds.tableNameExpr)
Expand All @@ -170,7 +171,7 @@ func (ds *DiffSummaryTableFunction) CheckAuth(ctx *sql.Context, opChecker sql.Pr
return false
}

subject := sql.PrivilegeCheckSubject{Database: ds.database.Name(), Table: tableName}
subject := sql.PrivilegeCheckSubject{Database: baseDB, Table: tableName}
// TODO: Add tests for privilege checking
return opChecker.UserHasPrivileges(ctx, sql.NewPrivilegedOperation(subject, sql.PrivilegeType_Select))
}
Expand All @@ -182,7 +183,7 @@ func (ds *DiffSummaryTableFunction) CheckAuth(ctx *sql.Context, opChecker sql.Pr

var operations []sql.PrivilegedOperation
for _, tblName := range tblNames {
subject := sql.PrivilegeCheckSubject{Database: ds.database.Name(), Table: tblName}
subject := sql.PrivilegeCheckSubject{Database: baseDB, Table: tblName}
operations = append(operations, sql.NewPrivilegedOperation(subject, sql.PrivilegeType_Select))
}

Expand Down
3 changes: 2 additions & 1 deletion go/libraries/doltcore/sqle/dtablefunctions/dolt_log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,14 +312,15 @@ func (ltf *LogTableFunction) WithChildren(children ...sql.Node) (sql.Node, error

// CheckAuth implements the interface sql.AuthorizationCheckerNode.
func (ltf *LogTableFunction) CheckAuth(ctx *sql.Context, opChecker sql.PrivilegedOperationChecker) bool {
baseDB, _ := doltdb.SplitRevisionDbName(ltf.database.Name())
tblNames, err := ltf.database.GetTableNames(ctx)
if err != nil {
return false
}

var operations []sql.PrivilegedOperation
for _, tblName := range tblNames {
subject := sql.PrivilegeCheckSubject{Database: ltf.database.Name(), Table: tblName}
subject := sql.PrivilegeCheckSubject{Database: baseDB, Table: tblName}
operations = append(operations, sql.NewPrivilegedOperation(subject, sql.PrivilegeType_Select))
}

Expand Down
5 changes: 3 additions & 2 deletions go/libraries/doltcore/sqle/dtablefunctions/dolt_patch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,7 @@ func (p *PatchTableFunction) WithChildren(children ...sql.Node) (sql.Node, error

// CheckAuth implements the interface sql.AuthorizationCheckerNode.
func (p *PatchTableFunction) CheckAuth(ctx *sql.Context, opChecker sql.PrivilegedOperationChecker) bool {
baseDB, _ := doltdb.SplitRevisionDbName(p.database.Name())
if p.tableNameExpr != nil {
if !sqltypes.IsText(p.tableNameExpr.Type()) {
return ExpressionIsDeferred(p.tableNameExpr)
Expand All @@ -322,7 +323,7 @@ func (p *PatchTableFunction) CheckAuth(ctx *sql.Context, opChecker sql.Privilege
return false
}

subject := sql.PrivilegeCheckSubject{Database: p.database.Name(), Table: tableName}
subject := sql.PrivilegeCheckSubject{Database: baseDB, Table: tableName}
return opChecker.UserHasPrivileges(ctx, sql.NewPrivilegedOperation(subject, sql.PrivilegeType_Select))
}

Expand All @@ -333,7 +334,7 @@ func (p *PatchTableFunction) CheckAuth(ctx *sql.Context, opChecker sql.Privilege

operations := make([]sql.PrivilegedOperation, 0, len(tblNames))
for _, tblName := range tblNames {
subject := sql.PrivilegeCheckSubject{Database: p.database.Name(), Table: tblName}
subject := sql.PrivilegeCheckSubject{Database: baseDB, Table: tblName}
operations = append(operations, sql.NewPrivilegedOperation(subject, sql.PrivilegeType_Select))
}

Expand Down
3 changes: 2 additions & 1 deletion go/libraries/doltcore/sqle/dtablefunctions/dolt_preview_merge_conflicts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,8 @@ func (pm *PreviewMergeConflictsTableFunction) CheckAuth(ctx *sql.Context, opChec
return false
}

subject := sql.PrivilegeCheckSubject{Database: pm.database.Name(), Table: tableName}
baseDB, _ := doltdb.SplitRevisionDbName(pm.database.Name())
subject := sql.PrivilegeCheckSubject{Database: baseDB, Table: tableName}
// TODO: Add tests for privilege checking
return opChecker.UserHasPrivileges(ctx, sql.NewPrivilegedOperation(subject, sql.PrivilegeType_Select))
}
Expand Down
3 changes: 2 additions & 1 deletion go/libraries/doltcore/sqle/dtablefunctions/dolt_preview_merge_conflicts_summary.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,15 @@ func (pm *PreviewMergeConflictsSummaryTableFunction) WithChildren(children ...sq

// CheckAuth implements the interface sql.AuthorizationCheckerNode.
func (pm *PreviewMergeConflictsSummaryTableFunction) CheckAuth(ctx *sql.Context, opChecker sql.PrivilegedOperationChecker) bool {
baseDB, _ := doltdb.SplitRevisionDbName(pm.database.Name())
tblNames, err := pm.database.GetTableNames(ctx)
if err != nil {
return false
}

var operations []sql.PrivilegedOperation
for _, tblName := range tblNames {
subject := sql.PrivilegeCheckSubject{Database: pm.database.Name(), Table: tblName}
subject := sql.PrivilegeCheckSubject{Database: baseDB, Table: tblName}
operations = append(operations, sql.NewPrivilegedOperation(subject, sql.PrivilegeType_Select))
}

Expand Down
4 changes: 3 additions & 1 deletion go/libraries/doltcore/sqle/dtablefunctions/dolt_query_diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"io"
"strings"

"github.com/dolthub/dolt/go/libraries/doltcore/doltdb"
"github.com/dolthub/dolt/go/libraries/doltcore/schema"

gms "github.com/dolthub/go-mysql-server"
Expand Down Expand Up @@ -320,7 +321,8 @@ func (tf *QueryDiffTableFunction) WithChildren(node ...sql.Node) (sql.Node, erro

// CheckAuth implements the interface sql.AuthorizationCheckerNode.
func (tf *QueryDiffTableFunction) CheckAuth(ctx *sql.Context, opChecker sql.PrivilegedOperationChecker) bool {
subject := sql.PrivilegeCheckSubject{Database: tf.database.Name()}
baseDB, _ := doltdb.SplitRevisionDbName(tf.database.Name())
subject := sql.PrivilegeCheckSubject{Database: baseDB}
return opChecker.UserHasPrivileges(ctx, sql.NewPrivilegedOperation(subject, sql.PrivilegeType_Select))
}

Expand Down
6 changes: 4 additions & 2 deletions go/libraries/doltcore/sqle/dtablefunctions/dolt_schema_diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"github.com/dolthub/go-mysql-server/sql/types"

"github.com/dolthub/dolt/go/libraries/doltcore/diff"
"github.com/dolthub/dolt/go/libraries/doltcore/doltdb"
"github.com/dolthub/dolt/go/libraries/doltcore/schema"
"github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess"
"github.com/dolthub/dolt/go/libraries/doltcore/sqle/sqlfmt"
Expand Down Expand Up @@ -171,13 +172,14 @@ func (ds *SchemaDiffTableFunction) WithChildren(children ...sql.Node) (sql.Node,

// CheckAuth implements the interface sql.AuthorizationCheckerNode.
func (ds *SchemaDiffTableFunction) CheckAuth(ctx *sql.Context, opChecker sql.PrivilegedOperationChecker) bool {
baseDB, _ := doltdb.SplitRevisionDbName(ds.Database().Name())
if ds.tableNameExpr != nil {
_, _, _, tableName, err := ds.evaluateArguments()
if err != nil {
return ExpressionIsDeferred(ds.tableNameExpr)
}

subject := sql.PrivilegeCheckSubject{Database: ds.database.Name(), Table: tableName}
subject := sql.PrivilegeCheckSubject{Database: baseDB, Table: tableName}
return opChecker.UserHasPrivileges(ctx, sql.NewPrivilegedOperation(subject, sql.PrivilegeType_Select))
}

Expand All @@ -187,7 +189,7 @@ func (ds *SchemaDiffTableFunction) CheckAuth(ctx *sql.Context, opChecker sql.Pri
}
operations := make([]sql.PrivilegedOperation, 0, len(tblNames))
for _, tblName := range tblNames {
subject := sql.PrivilegeCheckSubject{Database: ds.database.Name(), Table: tblName}
subject := sql.PrivilegeCheckSubject{Database: baseDB, Table: tblName}
operations = append(operations, sql.NewPrivilegedOperation(subject, sql.PrivilegeType_Select))
}

Expand Down
3 changes: 2 additions & 1 deletion go/libraries/doltcore/sqle/dtablefunctions/dolt_test_run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@ func (trtf *TestsRunTableFunction) WithChildren(node ...sql.Node) (sql.Node, err

// CheckAuth implements the interface sql.AuthorizationCheckerNode
func (trtf *TestsRunTableFunction) CheckAuth(ctx *sql.Context, opChecker sql.PrivilegedOperationChecker) bool {
subject := sql.PrivilegeCheckSubject{Database: trtf.database.Name()}
baseDB, _ := doltdb.SplitRevisionDbName(trtf.database.Name())
subject := sql.PrivilegeCheckSubject{Database: baseDB}
return opChecker.UserHasPrivileges(ctx, sql.NewPrivilegedOperation(subject, sql.PrivilegeType_Select))
}

Expand Down
Loading
Loading