mirror of
https://github.com/optim-enterprises-bv/vault.git
synced 2025-11-01 19:17:58 +00:00
Handle people specifying PGP key files with @ in front
This commit is contained in:
@@ -27,6 +27,9 @@ func (g *pgpkeys) Set(value string) error {
|
||||
return errors.New("pgp-keys can only be specified once")
|
||||
}
|
||||
for _, keyfile := range strings.Split(value, ",") {
|
||||
if keyfile[0] == '@' {
|
||||
keyfile = keyfile[1:]
|
||||
}
|
||||
f, err := os.Open(keyfile)
|
||||
if err != nil {
|
||||
return err
|
||||
|
||||
@@ -169,7 +169,7 @@ func TestInit_PGP(t *testing.T) {
|
||||
args := []string{
|
||||
"-address", addr,
|
||||
"-key-shares", "2",
|
||||
"-pgp-keys", tempDir + "/pubkey1," + tempDir + "/pubkey2," + tempDir + "/pubkey3",
|
||||
"-pgp-keys", tempDir + "/pubkey1,@" + tempDir + "/pubkey2," + tempDir + "/pubkey3",
|
||||
"-key-threshold", "2",
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user