commit 2812d6d9999dbb4fdf9d80aab3d783b1863e980e
parent cef43fcd40af71dca20d76fabfa3b72aa35169c4
Author: Sean Enck <sean@ttypty.com>
Date: Tue, 15 Apr 2025 19:22:09 -0400
move to subdir
Diffstat:
7 files changed, 384 insertions(+), 383 deletions(-)
diff --git a/cmd/main.go b/cmd/lb/main.go
diff --git a/cmd/lb/main_test.go b/cmd/lb/main_test.go
@@ -0,0 +1,379 @@
+//go:build integration
+// +build integration
+
+package main_test
+
+import (
+ "embed"
+ "errors"
+ "fmt"
+ "os"
+ "os/exec"
+ "path/filepath"
+ "sort"
+ "strings"
+ "testing"
+ "time"
+
+ "git.sr.ht/~enckse/lockbox/internal/platform"
+)
+
+const (
+ bothProfile = "both"
+ passProfile = "password"
+ keyFileProfile = "keyfile"
+ testPass = "testingpass"
+ testKeyData = "testkey"
+ reKeyPass = "rekeying"
+ reKeyKeyData = "rekeyfile"
+ clipWait = 1
+ clipTries = 6
+ hookDir = "hooks"
+)
+
+var (
+ target = filepath.Join("..", "..", "target")
+ binary = filepath.Join(target, "lb")
+ //go:embed tests/*
+ testingFiles embed.FS
+)
+
+type (
+ conf map[string]string
+ runner struct {
+ log string
+ testDir string
+ config string
+ store string
+ }
+)
+
+func newRunner(profile string) (runner, error) {
+ t := filepath.Join("testdata", profile)
+ l := filepath.Join(t, "actual.log")
+ wd, err := os.Getwd()
+ if err != nil {
+ return runner{}, err
+ }
+ os.Setenv("PATH", fmt.Sprintf("%s%c%s", filepath.Join(wd, target), os.PathListSeparator, os.Getenv("PATH")))
+ if err := os.RemoveAll(t); err != nil {
+ return runner{}, err
+ }
+ if err := os.MkdirAll(t, 0o755); err != nil {
+ return runner{}, err
+ }
+ return runner{l, t, filepath.Join(t, "config.toml"), filepath.Join(t, "pass.kdbx")}, nil
+}
+
+func TestPass(t *testing.T) {
+ run(t, passProfile)
+}
+
+func TestKeyFile(t *testing.T) {
+ run(t, keyFileProfile)
+}
+
+func TestBoth(t *testing.T) {
+ run(t, bothProfile)
+}
+
+func run(t *testing.T, profile string) {
+ if err := test(profile); err != nil {
+ t.Errorf("%s failed: %v", profile, err)
+ }
+}
+
+func setConfig(config string) {
+ os.Setenv("LOCKBOX_CONFIG_TOML", config)
+}
+
+func (r runner) writeConfig(c conf) {
+ var set []string
+ for k, v := range c {
+ set = append(set, fmt.Sprintf("%s = %s", k, v))
+ }
+ sort.Strings(set)
+ os.WriteFile(r.config, []byte(strings.Join(set, "\n")), 0o644)
+}
+
+func (r runner) run(pipeIn, command string) error {
+ return r.raw(pipeIn, command, r.log, "&1")
+}
+
+func (r runner) raw(pipeIn, command, stdout, stderr string) error {
+ text := fmt.Sprintf("%s %s %s >> %s 2>%s", pipeIn, binary, command, stdout, stderr)
+ cmd := exec.Command("/bin/sh", "-c", text)
+ return cmd.Run()
+}
+
+func (r runner) logAppend(command string) error {
+ return exec.Command("/bin/sh", "-c", fmt.Sprintf("%s >> %s", command, r.log)).Run()
+}
+
+func (r runner) newConf() conf {
+ c := make(conf)
+ c["store"] = c.quoteString(r.store)
+ return c
+}
+
+func (c conf) makePass(pass string) string {
+ return fmt.Sprintf("[\"%s\"]", pass)
+}
+
+func (c conf) quoteString(s string) string {
+ return fmt.Sprintf("\"%s\"", s)
+}
+
+func unpackDir(dir, under string, mode os.FileMode) error {
+ dirs, err := testingFiles.ReadDir(dir)
+ if err != nil {
+ return err
+ }
+ for _, d := range dirs {
+ name := d.Name()
+ if d.IsDir() {
+ if name != hookDir {
+ return fmt.Errorf("unexpected embedded dir: %s", name)
+ }
+ if err := unpackDir(filepath.Join(dir, name), filepath.Join(under, name), 0o755); err != nil {
+ return err
+ }
+ continue
+ }
+ data, err := testingFiles.ReadFile(filepath.Join(dir, name))
+ if err != nil {
+ return err
+ }
+ if err := os.MkdirAll(under, 0o755); err != nil {
+ return err
+ }
+ if err := os.WriteFile(filepath.Join(under, name), data, mode); err != nil {
+ return err
+ }
+ }
+ return nil
+}
+
+func test(profile string) error {
+ r, err := newRunner(profile)
+ if err != nil {
+ return err
+ }
+ if err := unpackDir("tests", r.testDir, 0o644); err != nil {
+ return err
+ }
+
+ setConfig(filepath.Join(r.testDir, "invalid"))
+ if err := r.raw("", "help", "/dev/null", "/dev/null"); err != nil {
+ return err
+ }
+ setConfig(r.config)
+ c := r.newConf()
+ c["interactive"] = "false"
+ keyFile := filepath.Join(r.testDir, "key.file")
+ hasPass := profile == passProfile || profile == bothProfile
+ hasFile := profile == keyFileProfile || profile == bothProfile
+ if hasPass {
+ c["credentials.password"] = c.makePass(testPass)
+ c["credentials.password_mode"] = c.quoteString("plaintext")
+ }
+ if hasFile {
+ os.WriteFile(keyFile, []byte(testKeyData), 0o644)
+ c["credentials.key_file"] = c.quoteString(keyFile)
+ if !hasPass {
+ c["credentials.password_mode"] = c.quoteString("none")
+ }
+ }
+ r.writeConfig(c)
+ r.run("echo test2 |", "insert keys/k/one2")
+ if hasPass {
+ delete(c, "credentials.password")
+ c["interactive"] = "true"
+ c["credentials.password_mode"] = c.quoteString("ask")
+ r.writeConfig(c)
+ } else {
+ r.logAppend("printf \"password: \"")
+ }
+ r.raw(fmt.Sprintf("echo %s |", testPass), "ls", r.log, "/dev/null")
+ c = r.newConf()
+ c["interactive"] = "false"
+ if hasPass {
+ c["credentials.password_mode"] = c.quoteString("plaintext")
+ c["credentials.password"] = c.makePass(testPass)
+ }
+ if hasFile {
+ c["credentials.key_file"] = c.quoteString(keyFile)
+ if !hasPass {
+ c["credentials.password_mode"] = c.quoteString("none")
+ }
+ }
+ r.writeConfig(c)
+ for _, k := range []string{"keys/k/one", "key/a/one", "keys/k/one", "keys/k/one/", "/keys/k/one", "keys/aa/b//s////e"} {
+ r.run("echo test |", fmt.Sprintf("insert %s", k))
+ }
+ for _, k := range []string{"insert keys2/k/three", "multiline keys2/k/three"} {
+ r.run(`printf "test3\ntest4\n" |`, k)
+ }
+ r.run("", "ls")
+ r.run("echo y |", "rm keys/k/one")
+ r.logAppend("echo")
+ r.run("", "ls")
+ r.run("", "ls | grep e")
+ r.run("", "json")
+ r.logAppend("echo")
+ r.run("", "show keys/k/one2")
+ r.run("", "show keys2/k/three")
+ r.run("", "json keys2/k/three")
+ r.logAppend("echo")
+ r.run("echo 5ae472abqdekjqykoyxk7hvc2leklq5n |", "totp insert test/k")
+ r.run("echo 5ae472abqdekjqykoyxk7hvc2leklq5n |", "totp insert test/k/totp")
+ r.run("", "totp ls")
+ r.run("", "totp show test/k")
+ r.run("", "totp once test/k")
+ r.run("", "totp minimal test/k")
+ r.run("", fmt.Sprintf("conv \"%s\"", r.store))
+ r.run("echo y |", "rm keys2/k/three")
+ r.logAppend("echo")
+ r.run("echo y |", "rm test/k/totp")
+ r.logAppend("echo")
+ r.run("echo y |", "rm test/k/one")
+ r.logAppend("echo")
+ r.logAppend("echo")
+ r.run("echo test2 |", "insert move/m/ka/abc")
+ r.run("echo test |", "insert move/m/ka/xyz")
+ r.run("echo test2 |", "insert move/ma/ka/yyy")
+ r.run("echo test |", "insert move/ma/ka/zzz")
+ r.run("echo test |", "insert move/ma/ka2/zzz")
+ r.run("echo test |", "insert move/ma/ka3/yyy")
+ r.run("echo test |", "insert move/ma/ka3/zzz")
+ r.run("", "mv move/m/* move/mac/")
+ r.run("", "mv move/ma/ka/* move/mac/")
+ r.run("", "mv move/ma/ka2/* move/mac/")
+ r.run("", "mv move/ma/ka3/* move/mac/")
+ r.run("", "mv key/a/one keyx/d/e")
+ r.run("", "ls")
+ r.run("echo y |", "rm move/*")
+ r.run("echo y |", "rm keyx/d/e")
+ r.logAppend("echo")
+ r.run("", "ls")
+ r.run("echo test2 |", "insert keys/k2/one2")
+ r.run("echo test |", "insert keys/k2/one")
+ r.run("echo test2 |", "insert keys/k2/t1/one2")
+ r.run("echo test |", "insert keys/k2/t1/one")
+ r.run("echo test2 |", "insert keys/k2/t2/one2")
+
+ // test hooks
+ c["hooks.directory"] = c.quoteString(filepath.Join(r.testDir, hookDir))
+ r.writeConfig(c)
+ r.run("echo test |", "insert keys/k2/t2/one")
+ r.logAppend("echo")
+ r.run("", "ls")
+ r.run("echo y |", "rm keys/k2/t1/*")
+ r.logAppend("echo")
+ r.run("", "ls")
+ r.run("echo y |", "rm keys/k2/*")
+ r.logAppend("echo")
+ r.run("", "ls")
+ r.logAppend("echo")
+ delete(c, "hooks.directory")
+
+ // test rekeying
+ reKeyArgs := []string{}
+ reKeyFile := filepath.Join(r.testDir, "rekey.file")
+ if hasFile {
+ os.WriteFile(reKeyFile, []byte(reKeyKeyData), 0o644)
+ reKeyArgs = append(reKeyArgs, fmt.Sprintf("-keyfile %s", reKeyFile))
+ if !hasPass {
+ reKeyArgs = append(reKeyArgs, "-nokey")
+ }
+ }
+ r.run(fmt.Sprintf("echo %s |", reKeyPass), fmt.Sprintf("rekey %s", strings.Join(reKeyArgs, " ")))
+ if hasPass {
+ c["credentials.password"] = c.makePass(reKeyPass)
+ }
+ if hasFile {
+ c["credentials.key_file"] = c.quoteString(reKeyFile)
+ }
+ r.writeConfig(c)
+ r.logAppend("echo")
+ r.run("", "ls")
+ r.run("", "show keys/k/one2")
+ c["json.mode"] = c.quoteString("plaintext")
+ r.writeConfig(c)
+ r.run("", "json k")
+ c["json.mode"] = c.quoteString("empty")
+ r.writeConfig(c)
+ r.run("", "json k")
+ c["json.mode"] = c.quoteString("hash")
+ c["json.hash_length"] = "3"
+ r.writeConfig(c)
+ r.run("", "json k")
+
+ // clipboard
+ copyFile := filepath.Join(r.testDir, "clip.copy")
+ pasteFile := filepath.Join(r.testDir, "clip.paste")
+ c["clip.copy_command"] = fmt.Sprintf("[\"touch\", \"%s\"]", copyFile)
+ c["clip.paste_command"] = fmt.Sprintf("[\"touch\", \"%s\"]", pasteFile)
+ c["clip.timeout"] = "3"
+ r.writeConfig(c)
+ r.run("", "clip keys/k/one2")
+ clipPassed := false
+ tries := 0
+ for tries < clipTries {
+ if platform.PathExists(copyFile) && platform.PathExists(pasteFile) {
+ clipPassed = true
+ break
+ }
+ time.Sleep(500 * clipWait * time.Millisecond)
+ tries++
+ }
+ if !clipPassed {
+ return errors.New("clipboard test failed unexpectedly")
+ }
+
+ invalid := r.newConf()
+ for k, v := range c {
+ invalid[k] = v
+ }
+ if hasPass {
+ invalid["credentials.password"] = c.makePass("garbage")
+ }
+ if hasFile {
+ invalidFile := filepath.Join(r.testDir, "bad.file")
+ os.WriteFile(invalidFile, []byte{}, 0o644)
+ invalid["credentials.key_file"] = c.quoteString(invalidFile)
+ }
+ r.writeConfig(invalid)
+ r.run("", "ls")
+ r.writeConfig(c)
+ setConfig(filepath.Join(r.testDir, "invalid"))
+ r.run("", "ls")
+ setConfig(r.config)
+ r.run("", "ls")
+
+ // pwgen
+ c["pwgen.word_command"] = "[\"/bin/sh\", \"-c\", \"echo abc abc | tr ' ' '\\n'\"]"
+ c["pwgen.word_count"] = "1"
+ r.writeConfig(c)
+ r.run("", "pwgen")
+ c["pwgen.template"] = "\"{{range $idx, $val := .}}{{if lt $val.Position.End 5}}{{ $val.Text }}{{end}}{{end}}\""
+ c["pwgen.characters"] = c.quoteString("b")
+ c["pwgen.word_count"] = "2"
+ c["pwgen.title"] = "false"
+ r.writeConfig(c)
+ r.run("", "pwgen")
+
+ // what is env
+ r.run("", fmt.Sprintf("vars | sed 's#/%s#/datadir#g' | grep -v CREDENTIALS | sort", profile))
+
+ // cleanup and diff results
+ tmpFile := fmt.Sprintf("%s.tmp", r.log)
+ for _, item := range []string{"'s/\"modtime\": \"[0-9].*$/\"modtime\": \"XXXX-XX-XX\",/g'", "'s/^[0-9][0-9][0-9][0-9][0-9][0-9]$/XXXXXX/g'"} {
+ exec.Command("/bin/sh", "-c", fmt.Sprintf("sed %s %s > %s", item, r.log, tmpFile)).Run()
+ exec.Command("mv", tmpFile, r.log).Run()
+ }
+ diff := exec.Command("diff", "-u", filepath.Join(r.testDir, "expected.log"), r.log)
+ diff.Stdout = os.Stdout
+ diff.Stderr = os.Stderr
+ return diff.Run()
+}
diff --git a/cmd/tests/expected.log b/cmd/lb/tests/expected.log
diff --git a/cmd/tests/hooks/all.sh b/cmd/lb/tests/hooks/all.sh
diff --git a/cmd/tests/hooks/test.sh b/cmd/lb/tests/hooks/test.sh
diff --git a/cmd/main_test.go b/cmd/main_test.go
@@ -1,379 +0,0 @@
-//go:build integration
-// +build integration
-
-package main_test
-
-import (
- "embed"
- "errors"
- "fmt"
- "os"
- "os/exec"
- "path/filepath"
- "sort"
- "strings"
- "testing"
- "time"
-
- "git.sr.ht/~enckse/lockbox/internal/platform"
-)
-
-const (
- bothProfile = "both"
- passProfile = "password"
- keyFileProfile = "keyfile"
- testPass = "testingpass"
- testKeyData = "testkey"
- reKeyPass = "rekeying"
- reKeyKeyData = "rekeyfile"
- clipWait = 1
- clipTries = 6
- hookDir = "hooks"
-)
-
-var (
- target = filepath.Join("..", "target")
- binary = filepath.Join(target, "lb")
- //go:embed tests/*
- testingFiles embed.FS
-)
-
-type (
- conf map[string]string
- runner struct {
- log string
- testDir string
- config string
- store string
- }
-)
-
-func newRunner(profile string) (runner, error) {
- t := filepath.Join("testdata", profile)
- l := filepath.Join(t, "actual.log")
- wd, err := os.Getwd()
- if err != nil {
- return runner{}, err
- }
- os.Setenv("PATH", fmt.Sprintf("%s%c%s", filepath.Join(wd, target), os.PathListSeparator, os.Getenv("PATH")))
- if err := os.RemoveAll(t); err != nil {
- return runner{}, err
- }
- if err := os.MkdirAll(t, 0o755); err != nil {
- return runner{}, err
- }
- return runner{l, t, filepath.Join(t, "config.toml"), filepath.Join(t, "pass.kdbx")}, nil
-}
-
-func TestPass(t *testing.T) {
- run(t, passProfile)
-}
-
-func TestKeyFile(t *testing.T) {
- run(t, keyFileProfile)
-}
-
-func TestBoth(t *testing.T) {
- run(t, bothProfile)
-}
-
-func run(t *testing.T, profile string) {
- if err := test(profile); err != nil {
- t.Errorf("%s failed: %v", profile, err)
- }
-}
-
-func setConfig(config string) {
- os.Setenv("LOCKBOX_CONFIG_TOML", config)
-}
-
-func (r runner) writeConfig(c conf) {
- var set []string
- for k, v := range c {
- set = append(set, fmt.Sprintf("%s = %s", k, v))
- }
- sort.Strings(set)
- os.WriteFile(r.config, []byte(strings.Join(set, "\n")), 0o644)
-}
-
-func (r runner) run(pipeIn, command string) error {
- return r.raw(pipeIn, command, r.log, "&1")
-}
-
-func (r runner) raw(pipeIn, command, stdout, stderr string) error {
- text := fmt.Sprintf("%s %s %s >> %s 2>%s", pipeIn, binary, command, stdout, stderr)
- cmd := exec.Command("/bin/sh", "-c", text)
- return cmd.Run()
-}
-
-func (r runner) logAppend(command string) error {
- return exec.Command("/bin/sh", "-c", fmt.Sprintf("%s >> %s", command, r.log)).Run()
-}
-
-func (r runner) newConf() conf {
- c := make(conf)
- c["store"] = c.quoteString(r.store)
- return c
-}
-
-func (c conf) makePass(pass string) string {
- return fmt.Sprintf("[\"%s\"]", pass)
-}
-
-func (c conf) quoteString(s string) string {
- return fmt.Sprintf("\"%s\"", s)
-}
-
-func unpackDir(dir, under string, mode os.FileMode) error {
- dirs, err := testingFiles.ReadDir(dir)
- if err != nil {
- return err
- }
- for _, d := range dirs {
- name := d.Name()
- if d.IsDir() {
- if name != hookDir {
- return fmt.Errorf("unexpected embedded dir: %s", name)
- }
- if err := unpackDir(filepath.Join(dir, name), filepath.Join(under, name), 0o755); err != nil {
- return err
- }
- continue
- }
- data, err := testingFiles.ReadFile(filepath.Join(dir, name))
- if err != nil {
- return err
- }
- if err := os.MkdirAll(under, 0o755); err != nil {
- return err
- }
- if err := os.WriteFile(filepath.Join(under, name), data, mode); err != nil {
- return err
- }
- }
- return nil
-}
-
-func test(profile string) error {
- r, err := newRunner(profile)
- if err != nil {
- return err
- }
- if err := unpackDir("tests", r.testDir, 0o644); err != nil {
- return err
- }
-
- setConfig(filepath.Join(r.testDir, "invalid"))
- if err := r.raw("", "help", "/dev/null", "/dev/null"); err != nil {
- return err
- }
- setConfig(r.config)
- c := r.newConf()
- c["interactive"] = "false"
- keyFile := filepath.Join(r.testDir, "key.file")
- hasPass := profile == passProfile || profile == bothProfile
- hasFile := profile == keyFileProfile || profile == bothProfile
- if hasPass {
- c["credentials.password"] = c.makePass(testPass)
- c["credentials.password_mode"] = c.quoteString("plaintext")
- }
- if hasFile {
- os.WriteFile(keyFile, []byte(testKeyData), 0o644)
- c["credentials.key_file"] = c.quoteString(keyFile)
- if !hasPass {
- c["credentials.password_mode"] = c.quoteString("none")
- }
- }
- r.writeConfig(c)
- r.run("echo test2 |", "insert keys/k/one2")
- if hasPass {
- delete(c, "credentials.password")
- c["interactive"] = "true"
- c["credentials.password_mode"] = c.quoteString("ask")
- r.writeConfig(c)
- } else {
- r.logAppend("printf \"password: \"")
- }
- r.raw(fmt.Sprintf("echo %s |", testPass), "ls", r.log, "/dev/null")
- c = r.newConf()
- c["interactive"] = "false"
- if hasPass {
- c["credentials.password_mode"] = c.quoteString("plaintext")
- c["credentials.password"] = c.makePass(testPass)
- }
- if hasFile {
- c["credentials.key_file"] = c.quoteString(keyFile)
- if !hasPass {
- c["credentials.password_mode"] = c.quoteString("none")
- }
- }
- r.writeConfig(c)
- for _, k := range []string{"keys/k/one", "key/a/one", "keys/k/one", "keys/k/one/", "/keys/k/one", "keys/aa/b//s////e"} {
- r.run("echo test |", fmt.Sprintf("insert %s", k))
- }
- for _, k := range []string{"insert keys2/k/three", "multiline keys2/k/three"} {
- r.run(`printf "test3\ntest4\n" |`, k)
- }
- r.run("", "ls")
- r.run("echo y |", "rm keys/k/one")
- r.logAppend("echo")
- r.run("", "ls")
- r.run("", "ls | grep e")
- r.run("", "json")
- r.logAppend("echo")
- r.run("", "show keys/k/one2")
- r.run("", "show keys2/k/three")
- r.run("", "json keys2/k/three")
- r.logAppend("echo")
- r.run("echo 5ae472abqdekjqykoyxk7hvc2leklq5n |", "totp insert test/k")
- r.run("echo 5ae472abqdekjqykoyxk7hvc2leklq5n |", "totp insert test/k/totp")
- r.run("", "totp ls")
- r.run("", "totp show test/k")
- r.run("", "totp once test/k")
- r.run("", "totp minimal test/k")
- r.run("", fmt.Sprintf("conv \"%s\"", r.store))
- r.run("echo y |", "rm keys2/k/three")
- r.logAppend("echo")
- r.run("echo y |", "rm test/k/totp")
- r.logAppend("echo")
- r.run("echo y |", "rm test/k/one")
- r.logAppend("echo")
- r.logAppend("echo")
- r.run("echo test2 |", "insert move/m/ka/abc")
- r.run("echo test |", "insert move/m/ka/xyz")
- r.run("echo test2 |", "insert move/ma/ka/yyy")
- r.run("echo test |", "insert move/ma/ka/zzz")
- r.run("echo test |", "insert move/ma/ka2/zzz")
- r.run("echo test |", "insert move/ma/ka3/yyy")
- r.run("echo test |", "insert move/ma/ka3/zzz")
- r.run("", "mv move/m/* move/mac/")
- r.run("", "mv move/ma/ka/* move/mac/")
- r.run("", "mv move/ma/ka2/* move/mac/")
- r.run("", "mv move/ma/ka3/* move/mac/")
- r.run("", "mv key/a/one keyx/d/e")
- r.run("", "ls")
- r.run("echo y |", "rm move/*")
- r.run("echo y |", "rm keyx/d/e")
- r.logAppend("echo")
- r.run("", "ls")
- r.run("echo test2 |", "insert keys/k2/one2")
- r.run("echo test |", "insert keys/k2/one")
- r.run("echo test2 |", "insert keys/k2/t1/one2")
- r.run("echo test |", "insert keys/k2/t1/one")
- r.run("echo test2 |", "insert keys/k2/t2/one2")
-
- // test hooks
- c["hooks.directory"] = c.quoteString(filepath.Join(r.testDir, hookDir))
- r.writeConfig(c)
- r.run("echo test |", "insert keys/k2/t2/one")
- r.logAppend("echo")
- r.run("", "ls")
- r.run("echo y |", "rm keys/k2/t1/*")
- r.logAppend("echo")
- r.run("", "ls")
- r.run("echo y |", "rm keys/k2/*")
- r.logAppend("echo")
- r.run("", "ls")
- r.logAppend("echo")
- delete(c, "hooks.directory")
-
- // test rekeying
- reKeyArgs := []string{}
- reKeyFile := filepath.Join(r.testDir, "rekey.file")
- if hasFile {
- os.WriteFile(reKeyFile, []byte(reKeyKeyData), 0o644)
- reKeyArgs = append(reKeyArgs, fmt.Sprintf("-keyfile %s", reKeyFile))
- if !hasPass {
- reKeyArgs = append(reKeyArgs, "-nokey")
- }
- }
- r.run(fmt.Sprintf("echo %s |", reKeyPass), fmt.Sprintf("rekey %s", strings.Join(reKeyArgs, " ")))
- if hasPass {
- c["credentials.password"] = c.makePass(reKeyPass)
- }
- if hasFile {
- c["credentials.key_file"] = c.quoteString(reKeyFile)
- }
- r.writeConfig(c)
- r.logAppend("echo")
- r.run("", "ls")
- r.run("", "show keys/k/one2")
- c["json.mode"] = c.quoteString("plaintext")
- r.writeConfig(c)
- r.run("", "json k")
- c["json.mode"] = c.quoteString("empty")
- r.writeConfig(c)
- r.run("", "json k")
- c["json.mode"] = c.quoteString("hash")
- c["json.hash_length"] = "3"
- r.writeConfig(c)
- r.run("", "json k")
-
- // clipboard
- copyFile := filepath.Join(r.testDir, "clip.copy")
- pasteFile := filepath.Join(r.testDir, "clip.paste")
- c["clip.copy_command"] = fmt.Sprintf("[\"touch\", \"%s\"]", copyFile)
- c["clip.paste_command"] = fmt.Sprintf("[\"touch\", \"%s\"]", pasteFile)
- c["clip.timeout"] = "3"
- r.writeConfig(c)
- r.run("", "clip keys/k/one2")
- clipPassed := false
- tries := 0
- for tries < clipTries {
- if platform.PathExists(copyFile) && platform.PathExists(pasteFile) {
- clipPassed = true
- break
- }
- time.Sleep(500 * clipWait * time.Millisecond)
- tries++
- }
- if !clipPassed {
- return errors.New("clipboard test failed unexpectedly")
- }
-
- invalid := r.newConf()
- for k, v := range c {
- invalid[k] = v
- }
- if hasPass {
- invalid["credentials.password"] = c.makePass("garbage")
- }
- if hasFile {
- invalidFile := filepath.Join(r.testDir, "bad.file")
- os.WriteFile(invalidFile, []byte{}, 0o644)
- invalid["credentials.key_file"] = c.quoteString(invalidFile)
- }
- r.writeConfig(invalid)
- r.run("", "ls")
- r.writeConfig(c)
- setConfig(filepath.Join(r.testDir, "invalid"))
- r.run("", "ls")
- setConfig(r.config)
- r.run("", "ls")
-
- // pwgen
- c["pwgen.word_command"] = "[\"/bin/sh\", \"-c\", \"echo abc abc | tr ' ' '\\n'\"]"
- c["pwgen.word_count"] = "1"
- r.writeConfig(c)
- r.run("", "pwgen")
- c["pwgen.template"] = "\"{{range $idx, $val := .}}{{if lt $val.Position.End 5}}{{ $val.Text }}{{end}}{{end}}\""
- c["pwgen.characters"] = c.quoteString("b")
- c["pwgen.word_count"] = "2"
- c["pwgen.title"] = "false"
- r.writeConfig(c)
- r.run("", "pwgen")
-
- // what is env
- r.run("", fmt.Sprintf("vars | sed 's#/%s#/datadir#g' | grep -v CREDENTIALS | sort", profile))
-
- // cleanup and diff results
- tmpFile := fmt.Sprintf("%s.tmp", r.log)
- for _, item := range []string{"'s/\"modtime\": \"[0-9].*$/\"modtime\": \"XXXX-XX-XX\",/g'", "'s/^[0-9][0-9][0-9][0-9][0-9][0-9]$/XXXXXX/g'"} {
- exec.Command("/bin/sh", "-c", fmt.Sprintf("sed %s %s > %s", item, r.log, tmpFile)).Run()
- exec.Command("mv", tmpFile, r.log).Run()
- }
- diff := exec.Command("diff", "-u", filepath.Join(r.testDir, "expected.log"), r.log)
- diff.Stdout = os.Stdout
- diff.Stderr = os.Stderr
- return diff.Run()
-}
diff --git a/justfile b/justfile
@@ -5,12 +5,13 @@ object := target / "lb"
ldflags := env_var_or_default("LDFLAGS", "")
gotest := "LOCKBOX_CONFIG_TOML=fake go test"
files := `find . -type f -name "*.go" | tr '\n' ' '`
+cmd := "cmd/lb"
default: build
build:
mkdir -p "{{target}}"
- go build {{goflags}} -ldflags "{{ldflags}} -X main.version={{version}}" -o "{{object}}" cmd/main.go
+ go build {{goflags}} -ldflags "{{ldflags}} -X main.version={{version}}" -o "{{object}}" {{cmd}}/main.go
unittest:
{{gotest}} ./...
@@ -18,9 +19,9 @@ unittest:
check: unittest tests
tests: build
- {{gotest}} cmd/main_test.go
+ {{gotest}} {{cmd}}/main_test.go
clean:
rm -f "{{object}}"
- find internal/ cmd/ -type f -wholename "*testdata*" -delete
- find internal/ cmd/ -type d -empty -delete
+ find internal/ {{cmd}} -type f -wholename "*testdata*" -delete
+ find internal/ {{cmd}} -type d -empty -delete
