upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-06-09 08:55:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Fix index out of range bug in ParseKeyValues

Browse source
This commit is contained in:
vishalnayak 2017-05-17 21:47:13 -04:00
parent b129929422
commit fb15c97c6c
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
helper/strutil/strutil.go
View file

@ -69,6 +69,10 @@ func ParseKeyValues(input string, out map[string]string, sep string) error {
for _, keyValue := range keyValues {
shards := strings.Split(keyValue, "=")
if len(shards) != 2 {
return fmt.Errorf("invalid <key,value> format")
}
key := strings.TrimSpace(shards[0])
value := strings.TrimSpace(shards[1])
if key == "" || value == "" {

10
helper/strutil/strutil_test.go
View file

@ -139,7 +139,7 @@ func TestStrutil_ParseKeyValues(t *testing.T) {
input = "key1 = value1, key2 = "
err = ParseKeyValues(input, actual, ",")
if err == nil {
t.Fatal("expected an error")
t.Fatalf("expected an error")
}
for k, _ := range actual {
delete(actual, k)
@ -148,11 +148,17 @@ func TestStrutil_ParseKeyValues(t *testing.T) {
input = "key1 = value1, = value2 "
err = ParseKeyValues(input, actual, ",")
if err == nil {
t.Fatal("expected an error")
t.Fatalf("expected an error")
}
for k, _ := range actual {
delete(actual, k)
}
input = "key1"
err = ParseKeyValues(input, actual, ",")
if err == nil {
t.Fatalf("expected an error")
}
}
func TestStrutil_ParseArbitraryKeyValues(t *testing.T) {