docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move key database to signer package 

The key database is not generally used but only used by the signing service.
Move the implementation to the signer package to be imported by the signer.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
This commit is contained in:
Derek McGowan 2015-07-30 16:22:47 -07:00
parent 3746a86509
commit bd9d7c9c74
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/notary-signer/main.go
View File

@ -21,7 +21,6 @@ import (
"github.com/docker/notary/cryptoservice" "github.com/docker/notary/cryptoservice"
"github.com/docker/notary/signer" "github.com/docker/notary/signer"
"github.com/docker/notary/signer/api" "github.com/docker/notary/signer/api"
"github.com/docker/notary/trustmanager"
"github.com/endophage/gotuf/data" "github.com/endophage/gotuf/data"
_ "github.com/go-sql-driver/mysql" _ "github.com/go-sql-driver/mysql"
"github.com/miekg/pkcs11" "github.com/miekg/pkcs11"
@ -141,7 +140,7 @@ func main() {
defaultAlias := viper.GetString(_DefaultAliasEnv) defaultAlias := viper.GetString(_DefaultAliasEnv)
logrus.Debug("Default Alias: ", defaultAlias) logrus.Debug("Default Alias: ", defaultAlias)
keyStore, err := trustmanager.NewKeyDBStore(passphraseRetriever, defaultAlias, dbType, dbSQL) keyStore, err := signer.NewKeyDBStore(passphraseRetriever, defaultAlias, dbType, dbSQL)
if err != nil { if err != nil {
log.Fatalf("failed to create a new keydbstore: %v", err) log.Fatalf("failed to create a new keydbstore: %v", err)
} }

9
trustmanager/keydbstore.go → signer/keydbstore.go
View File

@ -1,4 +1,4 @@
package trustmanager package signer
import ( import (
"database/sql" "database/sql"
@ -6,6 +6,7 @@ import (
"sync" "sync"
"github.com/docker/notary/pkg/passphrase" "github.com/docker/notary/pkg/passphrase"
"github.com/docker/notary/trustmanager"
jose "github.com/dvsekhvalnov/jose2go" jose "github.com/dvsekhvalnov/jose2go"
"github.com/endophage/gotuf/data" "github.com/endophage/gotuf/data"
"github.com/jinzhu/gorm" "github.com/jinzhu/gorm"
@ -107,7 +108,7 @@ func (s *KeyDBStore) GetKey(name string) (data.PrivateKey, string, error) {
// Retrieve the GORM private key from the database // Retrieve the GORM private key from the database
dbPrivateKey := GormPrivateKey{} dbPrivateKey := GormPrivateKey{}
if s.db.Where(&GormPrivateKey{KeyID: name}).First(&dbPrivateKey).RecordNotFound() { if s.db.Where(&GormPrivateKey{KeyID: name}).First(&dbPrivateKey).RecordNotFound() {
return nil, "", ErrKeyNotFound{} return nil, "", trustmanager.ErrKeyNotFound{}
} }
// Get the passphrase to use for this key // Get the passphrase to use for this key
@ -146,7 +147,7 @@ func (s *KeyDBStore) RemoveKey(name string) error {
// Retrieve the GORM private key from the database // Retrieve the GORM private key from the database
dbPrivateKey := GormPrivateKey{} dbPrivateKey := GormPrivateKey{}
if s.db.Where(&GormPrivateKey{KeyID: name}).First(&dbPrivateKey).RecordNotFound() { if s.db.Where(&GormPrivateKey{KeyID: name}).First(&dbPrivateKey).RecordNotFound() {
return ErrKeyNotFound{} return trustmanager.ErrKeyNotFound{}
} }
// Delete the key from the database // Delete the key from the database
@ -160,7 +161,7 @@ func (s *KeyDBStore) RotateKeyPassphrase(name, newPassphraseAlias string) error
// Retrieve the GORM private key from the database // Retrieve the GORM private key from the database
dbPrivateKey := GormPrivateKey{} dbPrivateKey := GormPrivateKey{}
if s.db.Where(&GormPrivateKey{KeyID: name}).First(&dbPrivateKey).RecordNotFound() { if s.db.Where(&GormPrivateKey{KeyID: name}).First(&dbPrivateKey).RecordNotFound() {
return ErrKeyNotFound{} return trustmanager.ErrKeyNotFound{}
} }
// Get the current passphrase to use for this key // Get the current passphrase to use for this key

13
trustmanager/keydbstore_test.go → signer/keydbstore_test.go
View File

@ -1,4 +1,4 @@
package trustmanager package signer
import ( import (
"crypto/rand" "crypto/rand"
@ -8,6 +8,7 @@ import (
"os" "os"
"testing" "testing"
"github.com/docker/notary/trustmanager"
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
@ -30,7 +31,7 @@ func TestCreateRead(t *testing.T) {
tempBaseDir, err := ioutil.TempDir("", "notary-test-") tempBaseDir, err := ioutil.TempDir("", "notary-test-")
defer os.RemoveAll(tempBaseDir) defer os.RemoveAll(tempBaseDir)
testKey, err := GenerateECDSAKey(rand.Reader) testKey, err := trustmanager.GenerateECDSAKey(rand.Reader)
assert.NoError(t, err) assert.NoError(t, err)
// We are using SQLite for the tests // We are using SQLite for the tests
@ -69,10 +70,10 @@ func TestDoubleCreate(t *testing.T) {
tempBaseDir, err := ioutil.TempDir("", "notary-test-") tempBaseDir, err := ioutil.TempDir("", "notary-test-")
defer os.RemoveAll(tempBaseDir) defer os.RemoveAll(tempBaseDir)
testKey, err := GenerateECDSAKey(rand.Reader) testKey, err := trustmanager.GenerateECDSAKey(rand.Reader)
assert.NoError(t, err) assert.NoError(t, err)
anotherTestKey, err := GenerateECDSAKey(rand.Reader) anotherTestKey, err := trustmanager.GenerateECDSAKey(rand.Reader)
assert.NoError(t, err) assert.NoError(t, err)
// We are using SQLite for the tests // We are using SQLite for the tests
@ -103,7 +104,7 @@ func TestCreateDelete(t *testing.T) {
tempBaseDir, err := ioutil.TempDir("", "notary-test-") tempBaseDir, err := ioutil.TempDir("", "notary-test-")
defer os.RemoveAll(tempBaseDir) defer os.RemoveAll(tempBaseDir)
testKey, err := GenerateECDSAKey(rand.Reader) testKey, err := trustmanager.GenerateECDSAKey(rand.Reader)
assert.NoError(t, err) assert.NoError(t, err)
// We are using SQLite for the tests // We are using SQLite for the tests
@ -134,7 +135,7 @@ func TestKeyRotation(t *testing.T) {
tempBaseDir, err := ioutil.TempDir("", "notary-test-") tempBaseDir, err := ioutil.TempDir("", "notary-test-")
defer os.RemoveAll(tempBaseDir) defer os.RemoveAll(tempBaseDir)
testKey, err := GenerateECDSAKey(rand.Reader) testKey, err := trustmanager.GenerateECDSAKey(rand.Reader)
assert.NoError(t, err) assert.NoError(t, err)
// We are using SQLite for the tests // We are using SQLite for the tests