From 44fef1c2a163bdfd781ef08a06e3cf5cf9b7d5da Mon Sep 17 00:00:00 2001
From: Niall Sheridan <nsheridan@gmail.com>
Date: Sun, 17 Jul 2016 23:54:42 +0100
Subject: Add a page for revoking certs

Add a template for revocation

Use DATETIME type to store created/expires times

Require auth for the /admin and /revoke endpoints
---
 server/store/mysql.go | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'server/store/mysql.go')

diff --git a/server/store/mysql.go b/server/store/mysql.go
index b108fdc..a62af6b 100644
--- a/server/store/mysql.go
+++ b/server/store/mysql.go
@@ -29,11 +29,12 @@ func parseConfig(config string) string {
 	}
 	_, user, passwd, host, port := s[0], s[1], s[2], s[3], s[4]
 	c := &mysql.Config{
-		User:   user,
-		Passwd: passwd,
-		Net:    "tcp",
-		Addr:   fmt.Sprintf("%s:%s", host, port),
-		DBName: "certs",
+		User:      user,
+		Passwd:    passwd,
+		Net:       "tcp",
+		Addr:      fmt.Sprintf("%s:%s", host, port),
+		DBName:    "certs",
+		ParseTime: true,
 	}
 	return c.FormatDSN()
 }
@@ -80,8 +81,8 @@ func scanCert(s rowScanner) (*CertRecord, error) {
 	var (
 		keyID      sql.NullString
 		principals sql.NullString
-		createdAt  sql.NullInt64
-		expires    sql.NullInt64
+		createdAt  mysql.NullTime
+		expires    mysql.NullTime
 		revoked    sql.NullBool
 		raw        sql.NullString
 	)
@@ -95,8 +96,8 @@ func scanCert(s rowScanner) (*CertRecord, error) {
 	return &CertRecord{
 		KeyID:      keyID.String,
 		Principals: p,
-		CreatedAt:  uint64(createdAt.Int64),
-		Expires:    uint64(expires.Int64),
+		CreatedAt:  createdAt.Time,
+		Expires:    expires.Time,
 		Revoked:    revoked.Bool,
 		Raw:        raw.String,
 	}, nil
@@ -143,7 +144,7 @@ func (db *mysqlDB) Revoke(id string) error {
 
 func (db *mysqlDB) GetRevoked() ([]*CertRecord, error) {
 	var recs []*CertRecord
-	rows, _ := db.revoked.Query(time.Now().UTC().Unix())
+	rows, _ := db.revoked.Query(time.Now().UTC())
 	defer rows.Close()
 	for rows.Next() {
 		cert, err := scanCert(rows)
-- 
cgit v1.2.3