diff options
Diffstat (limited to 'server/store/sqldb.go')
| -rw-r--r-- | server/store/sqldb.go | 98 |
1 files changed, 25 insertions, 73 deletions
diff --git a/server/store/sqldb.go b/server/store/sqldb.go index a51678e..2efca0e 100644 --- a/server/store/sqldb.go +++ b/server/store/sqldb.go @@ -1,8 +1,6 @@ package store import ( - "database/sql" - "encoding/json" "fmt" "net" "time" @@ -10,6 +8,7 @@ import ( "golang.org/x/crypto/ssh" "github.com/go-sql-driver/mysql" + "github.com/jmoiron/sqlx" "github.com/nsheridan/cashier/server/config" ) @@ -17,14 +16,14 @@ var _ CertStorer = (*SQLStore)(nil) // SQLStore is an sql-based CertStorer type SQLStore struct { - conn *sql.DB - - get *sql.Stmt - set *sql.Stmt - listAll *sql.Stmt - listCurrent *sql.Stmt - revoke *sql.Stmt - revoked *sql.Stmt + conn *sqlx.DB + + get *sqlx.Stmt + set *sqlx.Stmt + listAll *sqlx.Stmt + listCurrent *sqlx.Stmt + revoke *sqlx.Stmt + revoked *sqlx.Stmt } // NewSQLStore returns a *sql.DB CertStorer. @@ -52,7 +51,7 @@ func NewSQLStore(c config.Database) (*SQLStore, error) { driver = "sqlite3" dsn = c["filename"] } - conn, err := sql.Open(driver, dsn) + conn, err := sqlx.Open(driver, dsn) if err != nil { return nil, fmt.Errorf("SQLStore: could not get a connection: %v", err) } @@ -65,22 +64,22 @@ func NewSQLStore(c config.Database) (*SQLStore, error) { conn: conn, } - if db.set, err = conn.Prepare("INSERT INTO issued_certs (key_id, principals, created_at, expires_at, raw_key) VALUES (?, ?, ?, ?, ?)"); err != nil { + if db.set, err = conn.Preparex("INSERT INTO issued_certs (key_id, principals, created_at, expires_at, raw_key) VALUES (?, ?, ?, ?, ?)"); err != nil { return nil, fmt.Errorf("SQLStore: prepare set: %v", err) } - if db.get, err = conn.Prepare("SELECT * FROM issued_certs WHERE key_id = ?"); err != nil { + if db.get, err = conn.Preparex("SELECT * FROM issued_certs WHERE key_id = ?"); err != nil { return nil, fmt.Errorf("SQLStore: prepare get: %v", err) } - if db.listAll, err = conn.Prepare("SELECT * FROM issued_certs"); err != nil { + if db.listAll, err = conn.Preparex("SELECT * FROM issued_certs"); err != nil { return nil, fmt.Errorf("SQLStore: prepare listAll: %v", err) } - if db.listCurrent, err = conn.Prepare("SELECT * FROM issued_certs WHERE ? <= expires_at"); err != nil { + if db.listCurrent, err = conn.Preparex("SELECT * FROM issued_certs WHERE ? <= expires_at"); err != nil { return nil, fmt.Errorf("SQLStore: prepare listCurrent: %v", err) } - if db.revoke, err = conn.Prepare("UPDATE issued_certs SET revoked = 1 WHERE key_id = ?"); err != nil { + if db.revoke, err = conn.Preparex("UPDATE issued_certs SET revoked = 1 WHERE key_id = ?"); err != nil { return nil, fmt.Errorf("SQLStore: prepare revoke: %v", err) } - if db.revoked, err = conn.Prepare("SELECT * FROM issued_certs WHERE revoked = 1 AND ? <= expires_at"); err != nil { + if db.revoked, err = conn.Preparex("SELECT * FROM issued_certs WHERE revoked = 1 AND ? <= expires_at"); err != nil { return nil, fmt.Errorf("SQLStore: prepare revoked: %v", err) } return db, nil @@ -91,38 +90,13 @@ type rowScanner interface { Scan(dest ...interface{}) error } -func scanCert(s rowScanner) (*CertRecord, error) { - var ( - keyID sql.NullString - principals sql.NullString - createdAt time.Time - expires time.Time - revoked sql.NullBool - raw sql.NullString - ) - if err := s.Scan(&keyID, &principals, &createdAt, &expires, &revoked, &raw); err != nil { - return nil, err - } - var p []string - if err := json.Unmarshal([]byte(principals.String), &p); err != nil { - return nil, err - } - return &CertRecord{ - KeyID: keyID.String, - Principals: p, - CreatedAt: createdAt, - Expires: expires, - Revoked: revoked.Bool, - Raw: raw.String, - }, nil -} - // Get a single *CertRecord func (db *SQLStore) Get(id string) (*CertRecord, error) { if err := db.conn.Ping(); err != nil { return nil, err } - return scanCert(db.get.QueryRow(id)) + r := &CertRecord{} + return r, db.get.Get(r, id) } // SetCert parses a *ssh.Certificate and records it @@ -132,14 +106,10 @@ func (db *SQLStore) SetCert(cert *ssh.Certificate) error { // SetRecord records a *CertRecord func (db *SQLStore) SetRecord(rec *CertRecord) error { - principals, err := json.Marshal(rec.Principals) - if err != nil { - return err - } if err := db.conn.Ping(); err != nil { return err } - _, err = db.set.Exec(rec.KeyID, principals, rec.CreatedAt, rec.Expires, rec.Raw) + _, err := db.set.Exec(rec.KeyID, rec.Principals, rec.CreatedAt, rec.Expires, rec.Raw) return err } @@ -149,20 +119,9 @@ func (db *SQLStore) List(includeExpired bool) ([]*CertRecord, error) { if err := db.conn.Ping(); err != nil { return nil, err } - var recs []*CertRecord - var rows *sql.Rows - if includeExpired { - rows, _ = db.listAll.Query() - } else { - rows, _ = db.listCurrent.Query(time.Now().UTC()) - } - defer rows.Close() - for rows.Next() { - cert, err := scanCert(rows) - if err != nil { - return nil, err - } - recs = append(recs, cert) + recs := []*CertRecord{} + if err := db.listAll.Select(&recs); err != nil { + return nil, err } return recs, nil } @@ -172,8 +131,7 @@ func (db *SQLStore) Revoke(id string) error { if err := db.conn.Ping(); err != nil { return err } - _, err := db.revoke.Exec(id) - if err != nil { + if _, err := db.revoke.Exec(id); err != nil { return err } return nil @@ -185,14 +143,8 @@ func (db *SQLStore) GetRevoked() ([]*CertRecord, error) { return nil, err } var recs []*CertRecord - rows, _ := db.revoked.Query(time.Now().UTC()) - defer rows.Close() - for rows.Next() { - cert, err := scanCert(rows) - if err != nil { - return nil, err - } - recs = append(recs, cert) + if err := db.revoked.Select(&recs, time.Now().UTC()); err != nil { + return nil, err } return recs, nil } |