Merge branch 'release-0.3.0'

Author: bndw

Makefile

@@ -7,7 +7,7 @@ PICK_DIR = $(HOME)/.pick
 BIN_DIR = /usr/local/bin
 INSTALL = install
 
-FOLDERS = $(shell find ./src -mindepth 1 -maxdepth 1 -type d)
+FOLDERS = $(shell find . -mindepth 1 -type d -not -path "*.git*" -not -path "./githooks*" -not -path "./vendor*" -not -path "*bin*")
 
 all: build
 
@@ -29,10 +29,10 @@ goget:
 	GOPATH=$(GOPATH) $(CURDIR)/vendor/bin/godeps -u dependencies.tsv
 	mkdir -p $(shell dirname "$(CURDIR)/vendor/src/$(GOPKG)")
 	rm -f $(CURDIR)/vendor/src/$(GOPKG)
-	ln -sf $(PWD)/src $(CURDIR)/vendor/src/$(GOPKG)
+	ln -sf $(PWD) $(CURDIR)/vendor/src/$(GOPKG)
 
 build: install_hooks goget
-	GOPATH=$(GOPATH) go build -o bin/pick $(GOPKG)
+	GOPATH=$(GOPATH) go build -o bin/pick .
 
 test: goget
 	GOPATH=$(GOPATH) go test -v $(FOLDERS)
@@ -49,6 +49,9 @@ fmt: gofmt
 gofmt:
 	GOPATH=$(GOPATH) go fmt $(FOLDERS)
 
+govet:
+	GOPATH=$(GOPATH) go tool vet $(FOLDERS)
+
 config:
 	@if [ ! -f "$(PICK_DIR)/config.toml" ]; then \
 		OLD_UMASK=$(shell echo `umask`) ; \

README.md

@@ -3,7 +3,8 @@ pick
 A minimal password manager for OS X and Linux.
 
 ```sh
-$ go get -u github.com/bndw/pick
+$ brew tap bndw/pick
+$ brew install bndw/pick/pick-pass
 ```
 
 or

src/backends/client.go renamed to backends/client.go

@@ -10,9 +10,9 @@ func New(config *Config) (Client, error) {
 	switch config.Type {
 	default:
 		fallthrough
-	case "file":
+	case ConfigTypeFile:
 		return NewDiskBackend(*config)
-	case "mock":
+	case ConfigTypeMock:
 		return NewMockBackend(), nil
 	}
 }

backends/config.go

@@ -0,0 +1,28 @@
+package backends
+
+type Config struct {
+	Type     string                 `toml:"type"`
+	Backup   backupConfig           `toml:"backup"`
+	Settings map[string]interface{} `toml:"settings"`
+}
+
+type backupConfig struct {
+	DirPath     string
+	AutoEnabled bool `toml:"auto"`
+	MaxFiles    int  `toml:"max"`
+}
+
+const (
+	ConfigTypeFile = "file"
+	ConfigTypeMock = "mock"
+)
+
+func NewDefaultConfig() Config {
+	return Config{
+		Type: ConfigTypeFile,
+		Backup: backupConfig{
+			AutoEnabled: true,
+			MaxFiles:    100,
+		},
+	}
+}

src/backends/disk.go renamed to backends/disk.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"sort"
 	"strings"
 	"time"
 
@@ -27,9 +28,12 @@ var (
 )
 
 type DiskBackend struct {
-	path string
+	path         string
+	backupConfig backupConfig
 }
 
+type fileInfoSlice []os.FileInfo
+
 func NewDiskBackend(config Config) (*DiskBackend, error) {
 	var err error
 	if homeDir, err = homedir.Dir(); err != nil {
@@ -46,7 +50,12 @@ func NewDiskBackend(config Config) (*DiskBackend, error) {
 		}
 	}
 
-	return &DiskBackend{safePath}, nil
+	config.Backup.DirPath = fmt.Sprintf(defaultBackupDir, homeDir, defaultSafeDirName)
+
+	return &DiskBackend{
+		path:         safePath,
+		backupConfig: config.Backup,
+	}, nil
 }
 
 func (db *DiskBackend) Load() ([]byte, error) {
@@ -74,8 +83,63 @@ func (db *DiskBackend) Save(data []byte) error {
 	return nil
 }
 
+func (f fileInfoSlice) Len() int {
+	return len(f)
+}
+
+func (f fileInfoSlice) Less(i, j int) bool {
+	return f[i].ModTime().Before(f[j].ModTime())
+}
+
+func (f fileInfoSlice) Swap(i, j int) {
+	f[i], f[j] = f[j], f[i]
+}
+
+func (db *DiskBackend) cleanOldBackups(max int) error {
+	files, err := ioutil.ReadDir(db.backupConfig.DirPath)
+	if err != nil {
+		return err
+	}
+
+	filesSorted := make(fileInfoSlice, 0, len(files))
+	for _, f := range files {
+		filesSorted = append(filesSorted, f)
+	}
+	sort.Sort(filesSorted)
+	max = min(max, len(filesSorted))
+
+	for _, f := range filesSorted[:len(filesSorted)-max] {
+		p := fmt.Sprintf("%s/%s", db.backupConfig.DirPath, f.Name())
+		if err := os.Remove(p); err != nil {
+			fmt.Println("Error removing old backup", err.Error())
+		}
+	}
+
+	return nil
+}
+
+func min(a, b int) int {
+	if a <= b {
+		return a
+	}
+	return b
+}
+
 func (db *DiskBackend) Backup() error {
-	backupDir := fmt.Sprintf(defaultBackupDir, homeDir, defaultSafeDirName)
+	if db.backupConfig.MaxFiles == 0 {
+		// Keep no backups
+		db.cleanOldBackups(0)
+		return &errors.BackupDisabled{}
+	} else if db.backupConfig.MaxFiles > 0 {
+		// Subtract one as we are about to create another backup
+		if err := db.cleanOldBackups(db.backupConfig.MaxFiles - 1); err != nil {
+			if !os.IsNotExist(err) {
+				fmt.Println("Failed to remove old backup(s)", err.Error())
+			}
+		}
+	}
+
+	backupDir := db.backupConfig.DirPath
 	timeFormat := time.Now().Format(defaultBackupTimeFormat)
 	backupFileName := fmt.Sprintf(defaultBackupFileName, timeFormat)
 	backupPath := backupDir + "/" + backupFileName

src/backends/mock.go renamed to backends/mock.go

@@ -7,6 +7,7 @@ type mockBackend struct {
 
 func NewMockBackend() *mockBackend {
 	safeData := []byte(`-----BEGIN PGP MESSAGE-----
+
 wx4EBwMI/EyvqWA12cNgJBnoGRxYO1D0/F/w5Ro5uafS4AHkLjgl3wFVjIRB1vbo
 GSX6FeE9q+Ap4JzhoTTgcOLB6iyW4HDmGZFzcVq+JgYYg0+7Q+4jlC/bBxyhtb1h
 UHBuCvFGG4ENExdLliCsixI1bP8KB2TlLH459U859KWkg1aEJJ+1FeDR5E1GwV5y

src/backends/mock_test.go renamed to backends/mock_test.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/bndw/pick/safe"
 	"github.com/spf13/cobra"
 )
 
@@ -25,7 +26,7 @@ func Backup(args ...string) int {
 		return handleError(err)
 	}
 
-	if err := backendClient.Backup(); err != nil {
+	if err := safe.Backup(backendClient); err != nil {
 		return handleError(err)
 	}
 

src/commands/add.go renamed to commands/add.go

@@ -20,6 +20,12 @@
 type = "file"
   [storage.settings]
   path = "$HOME/.pick/pick.safe"
+  #[storage.backup]
+  # Whether to auto-create backups before the safe is modified.
+  #auto = true
+  # The number of backups to keep.
+  # Specify -1 to allow unlimited backups, 0 to not create backups at all.
+  #max = 100
 
 
 ## Encryption
@@ -28,6 +34,8 @@ type = "file"
 #    Only uncomment / adjust the settings in the [encryption] section if you know what you are doing.
 #    If you change something and we update our default (recommended) settings, your safe will
 #    _not_ automatically upgrade to our new recommendations.
+#    All settings in the [encryption] section can be modified on-the-fly, i.e. your safe
+#    will automatically upgrade from the old to the new encryption settings.
 #    The encryption section controls the configuration of the safe encryption.
 #
 # [encryption]
@@ -51,10 +59,22 @@ type = "file"
 #   # Specifies the key length (in bytes) to use for AES.
 #   # Currently supported values: 32, 24, 16 for 256bit, 192bit, 128bit respectively.
 #   keylen = 32
-#   # The hash function to use for PBKDF2.
-#   # Currently supported values: "sha512", "sha256".
-#   pbkdf2hash = "sha512"
-#   # The number of iterations used to derive the key from your password.
-#   pbkdf2iterations = 100000
-#   # Specifies the salt length (in bytes) for the PBKDF2.
-#   pbkdf2saltlen = 16
+#   # Specifies the key derivation function to use.
+#   # Currently supported values: "pbkdf2", "scrypt".
+#   keyderivation = "pbkdf2"
+#     # Settings for the "pbkdf2" Key-Derivation type
+#     [encryption.aes_gcm.pbkdf2]
+#     # The hash function to use for PBKDF2.
+#     # Currently supported values: "sha512", "sha256".
+#     hash = "sha512"
+#     # The number of iterations used to derive the key from your password.
+#     iterations = 100000
+#     # Specifies the salt length (in bytes) for the PBKDF2.
+#     saltlen = 16
+#     # Settings for the "scrypt" key-derivation type
+#     [encryption.aes_gcm.scrypt]
+#     n = 131072
+#     r = 8
+#     p = 1
+#     # Specifies the salt length (in bytes) for Scrypt.
+#     saltlen = 16

src/commands/backup.go renamed to commands/backup.go

@@ -34,6 +34,7 @@ func Load(version string) (*Config, error) {
 
 	configFile := fmt.Sprintf(defaultConfigFileTmpl, home)
 	config := Config{
+		Storage:    backends.NewDefaultConfig(),
 		Encryption: crypto.NewDefaultConfig(),
 		General: generalConfig{
 			PasswordLen: defaultPasswordLen,