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

Added list keys that ignores symlinks

This commit is contained in:
Diogo Monica 2015-07-09 14:51:31 -07:00
parent 53ad4a7539
commit 8c6de46aca
8 changed files with 56 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client/client.go
View File

@ -515,7 +515,7 @@ Example TUF Content for root key:
}
}
*/
func (r *NotaryRepository) ValidateRoot(root *data.Signed) error {
func (r *NotaryRepository) validateRoot(root *data.Signed) error {
rootSigned := &data.Root{}
err := json.Unmarshal(root.Signed, rootSigned)
if err != nil {
@ -581,7 +581,7 @@ func (r *NotaryRepository) bootstrapClient() (*tufclient.Client, error) {
return nil, err
}
err = r.ValidateRoot(root)
err = r.validateRoot(root)
if err != nil {
return nil, err
}
@ -594,8 +594,6 @@ func (r *NotaryRepository) bootstrapClient() (*tufclient.Client, error) {
return nil, err
}
// TODO(dlaw): Where does this keyDB come in
return tufclient.NewClient(
r.tufRepo,
remote,
@ -603,14 +601,10 @@ func (r *NotaryRepository) bootstrapClient() (*tufclient.Client, error) {
), nil
}
// ListPrivateKeys lists all availables private keys. Does not include private key
// ListPrivateKeys lists all available root keys. Does not include private key
// material
func (c *NotaryRepository) ListPrivateKeys() []string {
// TODO(diogo): Make this work
for _, k := range c.rootKeyStore.ListAll() {
fmt.Println(k)
}
return nil
func (c *NotaryRepository) ListRootKeys() []string {
return c.rootKeyStore.ListKeys()
}
// GenRootKey generates a new root key protected by a given passphrase

2
client/client_test.go
View File

@ -52,7 +52,7 @@ func TestInitRepo(t *testing.T) {
// Look for keys in private. The filenames should match the key IDs
// in the private key store.
privKeyList := repo.privKeyStore.ListAll()
privKeyList := repo.privKeyStore.ListFiles(true)
for _, privKeyName := range privKeyList {
_, err := os.Stat(privKeyName)
assert.NoError(t, err, "missing private key: %s", privKeyName)

4
cmd/notary/keys.go
View File

@ -92,7 +92,7 @@ func keysRemove(cmd *cobra.Command, args []string) {
}
// We didn't find a certificate with this ID, let's try to see if we can find keys.
keyList := privKeyStore.ListDir(gunOrID)
keyList := privKeyStore.ListDir(gunOrID, true)
if len(keyList) < 1 {
fatalf("no Private Keys found under Global Unique Name: %s", gunOrID)
}
@ -187,7 +187,7 @@ func keysList(cmd *cobra.Command, args []string) {
fmt.Println("")
fmt.Println("# Signing keys: ")
for _, k := range privKeyStore.ListAll() {
for _, k := range privKeyStore.ListFiles(true) {
printKey(k)
}
}

32
trustmanager/filestore.go
View File

@ -17,17 +17,11 @@ type FileStore interface {
RemoveDir(directoryName string) error
Get(fileName string) ([]byte, error)
GetPath(fileName string) string
ListAll() []string
ListDir(directoryName string) []string
ListFiles(symlinks bool) []string
ListDir(directoryName string, symlinks bool) []string
Link(src, dst string) error
}
type EncryptedFileStore interface {
FileStore
AddEncrypted(fileName string, data []byte, passphrase string) error
GetDecrypted(fileName, passphrase string) ([]byte, error)
}
// SimpleFileStore implements FileStore
type SimpleFileStore struct {
baseDir string
@ -36,7 +30,7 @@ type SimpleFileStore struct {
}
// NewFileStore creates a directory with 755 permissions
func NewFileStore(baseDir string, fileExt string) (FileStore, error) {
func NewSimpleFileStore(baseDir string, fileExt string) (FileStore, error) {
if err := CreateDirectory(baseDir); err != nil {
return nil, err
}
@ -49,7 +43,7 @@ func NewFileStore(baseDir string, fileExt string) (FileStore, error) {
}
// NewPrivateFileStore creates a directory with 700 permissions
func NewPrivateFileStore(baseDir string, fileExt string) (FileStore, error) {
func NewPrivateSimpleFileStore(baseDir string, fileExt string) (FileStore, error) {
if err := CreatePrivateDirectory(baseDir); err != nil {
return nil, err
}
@ -110,18 +104,18 @@ func (f *SimpleFileStore) GetPath(name string) string {
}
// List lists all the files inside of a store
func (f *SimpleFileStore) ListAll() []string {
return f.list(f.baseDir)
func (f *SimpleFileStore) ListFiles(symlinks bool) []string {
return f.list(f.baseDir, symlinks)
}
// List lists all the files inside of a directory identified by a name
func (f *SimpleFileStore) ListDir(name string) []string {
func (f *SimpleFileStore) ListDir(name string, symlinks bool) []string {
fullPath := filepath.Join(f.baseDir, name)
return f.list(fullPath)
return f.list(fullPath, symlinks)
}
// list lists all the files in a directory given a full path
func (f *SimpleFileStore) list(path string) []string {
// list lists all the files in a directory given a full path. Ignores symlinks.
func (f *SimpleFileStore) list(path string, symlinks bool) []string {
files := make([]string, 0, 0)
filepath.Walk(path, func(fp string, fi os.FileInfo, err error) error {
// If there are errors, ignore this particular file
@ -132,6 +126,12 @@ func (f *SimpleFileStore) list(path string) []string {
if fi.IsDir() {
return nil
}
// If this is a symlink, and symlinks is true, ignore it
if !symlinks && fi.Mode()&os.ModeSymlink == os.ModeSymlink {
return nil
}
// Only allow matches that end with our certificate extension (e.g. *.crt)
matched, _ := filepath.Match("*"+f.fileExt, fi.Name())

27
trustmanager/filestore_test.go
View File

@ -129,7 +129,7 @@ func TestRemoveDir(t *testing.T) {
}
}
func TestListAll(t *testing.T) {
func TestListFiles(t *testing.T) {
testName := "docker.com/notary/certificate"
testExt := "crt"
perms := os.FileMode(0755)
@ -144,11 +144,18 @@ func TestListAll(t *testing.T) {
// Create 10 randomfiles
for i := 1; i <= 10; i++ {
// Since we're generating this manually we need to add the extension '.'
expectedFilePath = filepath.Join(tempBaseDir, testName+string(i)+"."+testExt)
expectedFilename := testName + strconv.Itoa(i) + "." + testExt
expectedFilePath = filepath.Join(tempBaseDir, expectedFilename)
_, err = generateRandomFile(expectedFilePath, perms)
if err != nil {
t.Fatalf("failed to generate random file: %v", err)
}
// Create symlinks for all the files
err = os.Symlink(expectedFilename, filepath.Join(tempBaseDir, expectedFilename+".link."+testExt))
if err != nil {
t.Fatalf("failed to create symlink: %v", err)
}
}
// Create our SimpleFileStore
@ -158,11 +165,17 @@ func TestListAll(t *testing.T) {
perms: perms,
}
// Call the List function
files := store.ListAll()
// Call the List function. Expect 10 real files when not listing symlinks
files := store.ListFiles(false)
if len(files) != 10 {
t.Fatalf("expected 10 files in listing, got: %d", len(files))
}
// Call the List function. Expect 20 total files when listing symlinks
files = store.ListFiles(true)
if len(files) != 20 {
t.Fatalf("expected 20 files in listing, got: %d", len(files))
}
}
func TestListDir(t *testing.T) {
@ -196,15 +209,15 @@ func TestListDir(t *testing.T) {
}
// Call the ListDir function
files := store.ListDir("docker.com/")
files := store.ListDir("docker.com/", true)
if len(files) != 10 {
t.Fatalf("expected 10 files in listing, got: %d", len(files))
}
files = store.ListDir("docker.com/notary")
files = store.ListDir("docker.com/notary", true)
if len(files) != 10 {
t.Fatalf("expected 10 files in listing, got: %d", len(files))
}
files = store.ListDir("fakedocker.com/")
files = store.ListDir("fakedocker.com/", true)
if len(files) != 0 {
t.Fatalf("expected 0 files in listing, got: %d", len(files))
}

9
trustmanager/keyfilestore.go
View File

@ -14,7 +14,7 @@ type KeyFileStore struct {
// NewKeyFileStore returns a new KeyFileStore creating a private directory to
// hold the keys.
func NewKeyFileStore(baseDir string) (*KeyFileStore, error) {
fileStore, err := NewFileStore(baseDir, keyExtension)
fileStore, err := NewPrivateSimpleFileStore(baseDir, keyExtension)
if err != nil {
return nil, err
}
@ -74,3 +74,10 @@ func (s *KeyFileStore) GetDecryptedKey(name string, passphrase string) (*data.Pr
return privKey, nil
}
// ListKeys returns a list of unique PublicKeys present on the KeyFileStore.
// There might be symlinks associating Certificate IDs to Public Keys, so this
// method only returns the IDs that aren't symlinks
func (s *KeyFileStore) ListKeys() []string {
return s.ListFiles(false)
}

5
trustmanager/x509filestore.go
View File

@ -3,9 +3,10 @@ package trustmanager
import (
"crypto/x509"
"errors"
"github.com/Sirupsen/logrus"
"os"
"path"
"github.com/Sirupsen/logrus"
)
// X509FileStore implements X509Store that persists on disk
@ -30,7 +31,7 @@ func NewX509FilteredFileStore(directory string, validate func(*x509.Certificate)
}
func newX509FileStore(directory string, validate func(*x509.Certificate) bool) (*X509FileStore, error) {
fileStore, err := NewFileStore(directory, certExtension)
fileStore, err := NewSimpleFileStore(directory, certExtension)
if err != nil {
return nil, err
}

2
trustmanager/x509utils.go
View File

@ -133,7 +133,7 @@ func fingerprintCert(cert *x509.Certificate) CertID {
// loadCertsFromDir receives a store AddCertFromFile for each certificate found
func loadCertsFromDir(s *X509FileStore) {
certFiles := s.fileStore.ListAll()
certFiles := s.fileStore.ListFiles(true)
for _, c := range certFiles {
s.AddCertFromFile(c)
}