Arsharth/dex
1
0
Fork 0
forked from mystiq/dex
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #259 from ericchiang/secret_errors

Browse source 
pkg: improve base64 flag error message
This commit is contained in:
bobbyrullo 2016-01-08 16:39:43 -08:00
commit 217e26691c
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkg/flag/base64.go
View file

@ -31,7 +31,7 @@ func (f *Base64) Set(s string) error {
} }
if len(b) != f.len { if len(b) != f.len {
return fmt.Errorf("expected %d-byte secret", f.len) return fmt.Errorf("expected %d-byte secret, got %d-byte secret", f.len, len(b))
} }
f.val = b f.val = b
@ -62,11 +62,15 @@ func (f *Base64List) Set(ss string) error {
if ss == "" { if ss == "" {
return nil return nil
} }
for i, s := range strings.Split(ss, ",") { splits := strings.Split(ss, ",")
for i, s := range splits {
b64 := NewBase64(f.len) b64 := NewBase64(f.len)
err := b64.Set(s) err := b64.Set(s)
if err != nil { if err != nil {
return fmt.Errorf("error decoding string %d: %q", i, err) if len(splits) == 1 {
return err
}
return fmt.Errorf("error decoding string %d: %v", i, err)
} }
f.val = append(f.val, b64.Bytes()) f.val = append(f.val, b64.Bytes())
} }