Skip to content

Allow operation with less privileged user #46

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

Open
dopey wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Allow operation with less privileged user #46

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
087774b
add check for db and table
clayrosenthal Jun 1, 2023
d8b114d
fixing check
clayrosenthal Jun 2, 2023
3bd2ab0
Add Close() and error check for returned rows from check queries
dopey Aug 3, 2023
b1a5ab9
Replace backticks with single quotes in `SHOW ...` queries
dopey Aug 4, 2023
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
1 change: 1 addition & 0 deletions database/notsupported.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//nolint:revive // ignore unused parameters because these are stubs
package database

// NotSupportedDB is a db implementation used on database drivers when the
Expand Down
35 changes: 31 additions & 4 deletions mysql/mysql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,22 @@ func (db *DB) Open(dataSourceName string, opt ...database.Option) error {
if err != nil {
return errors.Wrap(err, "error connecting to mysql")
}
_, err = _db.Exec(fmt.Sprintf("CREATE DATABASE IF NOT EXISTS `%s`", opts.Database))
rows, err := _db.Query(fmt.Sprintf("SHOW DATABASES LIKE '%s'", opts.Database))
if err != nil {
return errors.Wrapf(err, "error creating database %s (if not exists)", opts.Database)
return errors.Wrapf(err, "error checking if database %s exists", opts.Database)
}
defer rows.Close()
// db doesn't exist, create it
if !rows.Next() {
_, err = _db.Exec(fmt.Sprintf("CREATE DATABASE IF NOT EXISTS `%s`", opts.Database))
if err != nil {
return errors.Wrapf(err, "error creating database %s (if not exists)", opts.Database)
}
}
if err = rows.Err(); err != nil {
return fmt.Errorf("error accessing databases: %w", err)
}

parsedDSN.DBName = opts.Database
db.db, err = sql.Open("mysql", parsedDSN.FormatDSN())
if err != nil {
Expand Down Expand Up @@ -82,6 +94,10 @@ func createTableQry(bucket []byte) string {
return fmt.Sprintf("CREATE TABLE IF NOT EXISTS `%s`(nkey VARBINARY(255), nvalue BLOB, PRIMARY KEY (nkey));", bucket)
}

func checkTableQry(bucket []byte) string {
return fmt.Sprintf("SHOW TABLES LIKE '%s';", bucket)
}

func deleteTableQry(bucket []byte) string {
return fmt.Sprintf("DROP TABLE `%s`", bucket)
}
Expand Down Expand Up @@ -261,9 +277,20 @@ func (db *DB) Update(tx *database.Tx) error {

// CreateTable creates a table in the database.
func (db *DB) CreateTable(bucket []byte) error {
_, err := db.db.Exec(createTableQry(bucket))
rows, err := db.db.Query(checkTableQry(bucket))
if err != nil {
return errors.Wrapf(err, "failed to create table %s", bucket)
return errors.Wrapf(err, "failed to check table %s", bucket)
}
defer rows.Close()
// Table doesn't exist, create it.
if !rows.Next() {
_, err := db.db.Exec(createTableQry(bucket))
if err != nil {
return errors.Wrapf(err, "failed to create table %s", bucket)
}
}
if err = rows.Err(); err != nil {
return errors.Wrap(err, "error accessing row")
}
return nil
}
Expand Down