Commit 1953123

committed

Merge branch 'dump-available-databases' into 'master'

fix(engine): by default, dump only databases to which user have access See merge request postgres-ai/database-lab!501

2 parents 18cfa5a + 71aa34f commit 1953123Copy full SHA for 1953123

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ type dumper interface {`
`117`	`117`	`SetConnectionOptions(context.Context, *Connection) error`
`118`	`118`
`119`	`119`	`// GetDatabaseListQuery provides the query to get the list of databases for dumping.`
`120`		`- GetDatabaseListQuery() string`
	`120`	`+ GetDatabaseListQuery(usernamestring) string`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`// Connection provides connection options.`
`@@ -379,7 +379,7 @@ func (d *DumpJob) getDBList(ctx context.Context) (map[string]DumpDefinition, err`
`379`	`379`	`return nil, fmt.Errorf("failed to connect to DB: %w", err)`
`380`	`380`	`}`
`381`	`381`
`382`		`- rows, err := querier.Query(ctx, d.dumper.GetDatabaseListQuery())`
	`382`	`+ rows, err := querier.Query(ctx, d.dumper.GetDatabaseListQuery(d.config.db.Username))`
`383`	`383`	`if err != nil {`
`384`	`384`	`return nil, fmt.Errorf("failed to perform query listing databases: %w", err)`
`385`	`385`	`}`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ package logical`
`6`	`6`
`7`	`7`	`import (`
`8`	`8`	`"context"`
	`9`	`+ "fmt"`
`9`	`10`	`)`
`10`	`11`
`11`	`12`	`type defaultDumper struct {`
`@@ -25,6 +26,7 @@ func (d defaultDumper) SetConnectionOptions(_ context.Context, c Connection) e`
`25`	`26`	`return nil`
`26`	`27`	`}`
`27`	`28`
`28`		`-func (d *defaultDumper) GetDatabaseListQuery() string {`
`29`		`- return "select datname from pg_catalog.pg_database where not datistemplate"`
	`29`	`+func (d *defaultDumper) GetDatabaseListQuery(username string) string {`
	`30`	+ return fmt.Sprintf(`select datname from pg_catalog.pg_database
	`31`	+ where not datistemplate and has_database_privilege('%s', datname, 'CONNECT')`, username)
`30`	`32`	`}`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,7 @@ func (r rdsDumper) SetConnectionOptions(ctx context.Context, c Connection) err`
`108`	`108`	`return nil`
`109`	`109`	`}`
`110`	`110`
`111`		`-func (r *rdsDumper) GetDatabaseListQuery() string {`
`112`		`- return "select datname from pg_catalog.pg_database where not datistemplate"`
	`111`	`+func (r *rdsDumper) GetDatabaseListQuery(username string) string {`
	`112`	+ return fmt.Sprintf(`select datname from pg_catalog.pg_database
	`113`	+ where not datistemplate and has_database_privilege('%s', datname, 'CONNECT')`, username)
`113`	`114`	`}`

Comments

(0)