aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--server/store/store.go15
-rw-r--r--server/store/store_test.go3
-rw-r--r--server/store/string_slice.go (renamed from server/store/types/string_slice.go)2
3 files changed, 9 insertions, 11 deletions
diff --git a/server/store/store.go b/server/store/store.go
index 4863ff0..b620e6d 100644
--- a/server/store/store.go
+++ b/server/store/store.go
@@ -9,7 +9,6 @@ import (
"github.com/nsheridan/cashier/lib"
"github.com/nsheridan/cashier/server/config"
- "github.com/nsheridan/cashier/server/store/types"
)
// New returns a new configured database.
@@ -37,12 +36,12 @@ type CertStorer interface {
// A CertRecord is a representation of a ssh certificate used by a CertStorer.
type CertRecord struct {
- KeyID string `json:"key_id" db:"key_id"`
- Principals types.StringSlice `json:"principals" db:"principals"`
- CreatedAt time.Time `json:"created_at" db:"created_at"`
- Expires time.Time `json:"expires" db:"expires_at"`
- Revoked bool `json:"revoked" db:"revoked"`
- Raw string `json:"-" db:"raw_key"`
+ KeyID string `json:"key_id" db:"key_id"`
+ Principals StringSlice `json:"principals" db:"principals"`
+ CreatedAt time.Time `json:"created_at" db:"created_at"`
+ Expires time.Time `json:"expires" db:"expires_at"`
+ Revoked bool `json:"revoked" db:"revoked"`
+ Raw string `json:"-" db:"raw_key"`
}
// MarshalJSON implements the json.Marshaler interface for the CreatedAt and
@@ -69,7 +68,7 @@ func parseTime(t uint64) time.Time {
func parseCertificate(cert *ssh.Certificate) *CertRecord {
return &CertRecord{
KeyID: cert.KeyId,
- Principals: types.StringSlice(cert.ValidPrincipals),
+ Principals: StringSlice(cert.ValidPrincipals),
CreatedAt: parseTime(cert.ValidAfter),
Expires: parseTime(cert.ValidBefore),
Raw: string(lib.GetPublicKey(cert)),
diff --git a/server/store/store_test.go b/server/store/store_test.go
index d9ae325..3fd900c 100644
--- a/server/store/store_test.go
+++ b/server/store/store_test.go
@@ -10,7 +10,6 @@ import (
"testing"
"time"
- "github.com/nsheridan/cashier/server/store/types"
"github.com/nsheridan/cashier/testdata"
"github.com/stretchr/testify/assert"
@@ -24,7 +23,7 @@ func TestParseCertificate(t *testing.T) {
pub, _ := ssh.NewPublicKey(r.Public())
c := &ssh.Certificate{
KeyId: "id",
- ValidPrincipals: types.StringSlice{"principal"},
+ ValidPrincipals: StringSlice{"principal"},
ValidBefore: now,
CertType: ssh.UserCert,
Key: pub,
diff --git a/server/store/types/string_slice.go b/server/store/string_slice.go
index 81b38c3..ac86360 100644
--- a/server/store/types/string_slice.go
+++ b/server/store/string_slice.go
@@ -1,4 +1,4 @@
-package types
+package store
import (
"database/sql/driver"