commit 4d15eff4d01216e0b69646144ce33bdf259764d4
parent 9a32ec335a1d9932469be2cbb6d6e114c881d464
Author: Sean Enck <sean@ttypty.com>
Date: Sat, 16 Jul 2022 11:47:03 -0400
all but totp ready
Diffstat:
3 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/cmd/lb-rekey/main.go b/cmd/lb-rekey/main.go
@@ -5,7 +5,9 @@ import (
"fmt"
"strings"
- "github.com/enckse/lockbox/internal"
+ "github.com/enckse/lockbox/internal/encrypt"
+ "github.com/enckse/lockbox/internal/misc"
+ "github.com/enckse/lockbox/internal/store"
)
func main() {
@@ -14,26 +16,26 @@ func main() {
inMode := flag.String("inmode", "", "input encryption key mode")
outMode := flag.String("outmode", "", "output encryption key mode")
flag.Parse()
- found, err := internal.List(internal.GetStore(), false)
+ found, err := store.NewFileSystemStore().List(store.ViewOptions{})
if err != nil {
- internal.Die("failed finding entries", err)
+ misc.Die("failed finding entries", err)
}
for _, file := range found {
fmt.Printf("rekeying: %s\n", file)
- in, err := internal.NewLockbox(internal.LockboxOptions{Key: *inKey, KeyMode: *inMode, File: file})
+ in, err := encrypt.NewLockbox(encrypt.LockboxOptions{Key: *inKey, KeyMode: *inMode, File: file})
if err != nil {
- internal.Die("unable to make input lockbox", err)
+ misc.Die("unable to make input lockbox", err)
}
decrypt, err := in.Decrypt()
if err != nil {
- internal.Die("failed to process file decryption", err)
+ misc.Die("failed to process file decryption", err)
}
- out, err := internal.NewLockbox(internal.LockboxOptions{Key: *outKey, KeyMode: *outMode, File: file})
+ out, err := encrypt.NewLockbox(encrypt.LockboxOptions{Key: *outKey, KeyMode: *outMode, File: file})
if err != nil {
- internal.Die("unable to make output lockbox", err)
+ misc.Die("unable to make output lockbox", err)
}
if err := out.Encrypt([]byte(strings.TrimSpace(string(decrypt)))); err != nil {
- internal.Die("failed to encrypt file", err)
+ misc.Die("failed to encrypt file", err)
}
}
}
diff --git a/cmd/lb-rw/main.go b/cmd/lb-rw/main.go
@@ -5,7 +5,8 @@ import (
"flag"
"fmt"
- "github.com/enckse/lockbox/internal"
+ "github.com/enckse/lockbox/internal/encrypt"
+ "github.com/enckse/lockbox/internal/misc"
)
func main() {
@@ -14,22 +15,22 @@ func main() {
file := flag.String("file", "", "file to process")
keyMode := flag.String("keymode", "", "key lookup mode")
flag.Parse()
- l, err := internal.NewLockbox(internal.LockboxOptions{Key: *key, KeyMode: *keyMode, File: *file})
+ l, err := encrypt.NewLockbox(encrypt.LockboxOptions{Key: *key, KeyMode: *keyMode, File: *file})
if err != nil {
- internal.Die("unable to make lockbox model instance", err)
+ misc.Die("unable to make lockbox model instance", err)
}
switch *mode {
case "encrypt":
if err := l.Encrypt(nil); err != nil {
- internal.Die("failed to encrypt", err)
+ misc.Die("failed to encrypt", err)
}
case "decrypt":
results, err := l.Decrypt()
if err != nil {
- internal.Die("failed to decrypt", err)
+ misc.Die("failed to decrypt", err)
}
fmt.Println(string(results))
default:
- internal.Die("invalid mode", errors.New("bad mode"))
+ misc.Die("invalid mode", errors.New("bad mode"))
}
}
diff --git a/cmd/lb-textconv/main.go b/cmd/lb-textconv/main.go
@@ -4,18 +4,19 @@ import (
"fmt"
"os"
- "github.com/enckse/lockbox/internal"
+ "github.com/enckse/lockbox/internal/encrypt"
+ "github.com/enckse/lockbox/internal/misc"
)
func main() {
args := os.Args
- l, err := internal.NewLockbox(internal.LockboxOptions{File: args[len(args)-1]})
+ l, err := encrypt.NewLockbox(encrypt.LockboxOptions{File: args[len(args)-1]})
if err != nil {
- internal.Die("unable to make lockbox model instance", err)
+ misc.Die("unable to make lockbox model instance", err)
}
result, err := l.Decrypt()
if err != nil {
- internal.Die("unable to read file", err)
+ misc.Die("unable to read file", err)
}
if result != nil {
fmt.Println(string(result))
