luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #834 from apoydence/master 

Returns an error for a key with a '/'
This commit is contained in:
Ryan Uber 2015-06-05 15:23:57 -07:00
parent 7e82b3c32c 3f6a912af6
commit 4d8b4abcc5
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/kv.go
View File

@ -168,6 +168,10 @@ func (k *KV) Release(p *KVPair, q *WriteOptions) (bool, *WriteMeta, error) {
} }
func (k *KV) put(key string, params map[string]string, body []byte, q *WriteOptions) (bool, *WriteMeta, error) { func (k *KV) put(key string, params map[string]string, body []byte, q *WriteOptions) (bool, *WriteMeta, error) {
if len(key) > 0 && key[0] == '/' {
return false, nil, fmt.Errorf("Invalid key. Key must not begin with a '/': %s", key)
}
r := k.c.newRequest("PUT", "/v1/kv/"+key) r := k.c.newRequest("PUT", "/v1/kv/"+key)
r.setWriteOptions(q) r.setWriteOptions(q)
for param, val := range params { for param, val := range params {

8
api/kv_test.go
View File

@ -31,6 +31,14 @@ func TestClientPutGetDelete(t *testing.T) {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
// Put a key that begins with a '/'
invalidKey := "/test"
value = []byte(invalidKey)
p = &KVPair{Key: key, Flags: 42, Value: value}
if _, err := kv.Put(p, nil); err == nil {
t.Fatalf("Invalid key not detected: %s", invalidKey)
}
// Get should work // Get should work
pair, meta, err := kv.Get(key, nil) pair, meta, err := kv.Get(key, nil)
if err != nil { if err != nil {