-
Notifications
You must be signed in to change notification settings - Fork 514
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: David Lawrence <[email protected]> (github: endophage)
- Loading branch information
David Lawrence
committed
Jul 13, 2016
1 parent
1e67617
commit e710460
Showing
14 changed files
with
1,050 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,90 @@ | ||
// +build pkcs11 | ||
|
||
package main | ||
|
||
import ( | ||
"encoding/pem" | ||
"io/ioutil" | ||
"os" | ||
"testing" | ||
|
||
"github.com/spf13/cobra" | ||
"github.com/spf13/viper" | ||
"github.com/stretchr/testify/require" | ||
|
||
"github.com/docker/notary" | ||
"github.com/docker/notary/cryptoservice" | ||
"github.com/docker/notary/passphrase" | ||
store "github.com/docker/notary/storage" | ||
"github.com/docker/notary/trustmanager" | ||
"github.com/docker/notary/trustmanager/yubikey" | ||
"github.com/docker/notary/tuf/data" | ||
) | ||
|
||
func TestImportWithYubikey(t *testing.T) { | ||
setUp(t) | ||
tempBaseDir, err := ioutil.TempDir("/tmp", "notary-test-") | ||
require.NoError(t, err) | ||
defer os.RemoveAll(tempBaseDir) | ||
input, err := ioutil.TempFile("/tmp", "notary-test-import-") | ||
require.NoError(t, err) | ||
defer os.RemoveAll(input.Name()) | ||
k := &keyCommander{ | ||
configGetter: func() (*viper.Viper, error) { | ||
v := viper.New() | ||
v.SetDefault("trust_dir", tempBaseDir) | ||
return v, nil | ||
}, | ||
getRetriever: func() notary.PassRetriever { return passphrase.ConstantRetriever("pass") }, | ||
} | ||
|
||
memStore := store.NewMemoryStore(nil) | ||
ks := trustmanager.NewGenericKeyStore(memStore, k.getRetriever()) | ||
cs := cryptoservice.NewCryptoService(ks) | ||
|
||
pubK, err := cs.Create(data.CanonicalRootRole, "ankh", data.ECDSAKey) | ||
require.NoError(t, err) | ||
bID := pubK.ID() // need to check presence in yubikey later | ||
bytes, err := memStore.Get(notary.RootKeysSubdir + "/" + pubK.ID()) | ||
require.NoError(t, err) | ||
b, _ := pem.Decode(bytes) | ||
b.Headers["path"] = "ankh" | ||
|
||
pubK, err = cs.Create(data.CanonicalTargetsRole, "morpork", data.ECDSAKey) | ||
require.NoError(t, err) | ||
cID := pubK.ID() | ||
bytes, err = memStore.Get(notary.NonRootKeysSubdir + "/morpork/" + pubK.ID()) | ||
require.NoError(t, err) | ||
c, _ := pem.Decode(bytes) | ||
c.Headers["path"] = "morpork" | ||
|
||
bBytes := pem.EncodeToMemory(b) | ||
cBytes := pem.EncodeToMemory(c) | ||
input.Write(bBytes) | ||
input.Write(cBytes) | ||
|
||
file := input.Name() | ||
err = input.Close() // close so import can open | ||
require.NoError(t, err) | ||
|
||
err = k.importKeys(&cobra.Command{}, []string{file}) | ||
require.NoError(t, err) | ||
|
||
yks, err := yubikey.NewYubiStore(nil, k.getRetriever()) | ||
require.NoError(t, err) | ||
_, _, err = yks.GetKey(bID) | ||
require.NoError(t, err) | ||
_, _, err = yks.GetKey(cID) | ||
require.Error(t, err) // c is non-root, should not be in yubikey | ||
|
||
fileStore, err := store.NewPrivateKeyFileStorage(tempBaseDir, notary.KeyExtension) | ||
_, err = fileStore.Get("ankh") | ||
require.Error(t, err) // b should only be in yubikey, not in filestore | ||
|
||
cResult, err := fileStore.Get("morpork") | ||
require.NoError(t, err) | ||
|
||
block, rest := pem.Decode(cResult) | ||
require.Equal(t, c.Bytes, block.Bytes) | ||
require.Len(t, rest, 0) | ||
} |
Oops, something went wrong.