Add some additional validation for object keys.

pkg/tools/etcd_helper.go

@@ -391,6 +391,9 @@ func (h *EtcdHelper) extractObj(response *etcd.Response, inErr error, objPtr run
 // and 0 means forever. If no error is returned and out is not nil, out will be set to the read value
 // from etcd.
 func (h *EtcdHelper) CreateObj(key string, obj, out runtime.Object, ttl uint64) error {
+	if strings.Contains(key, "../") {
+		return fmt.Errorf("Illegal path, moving to parent directories not supported")
+	}
 	key = h.PrefixEtcdKey(key)
 	data, err := h.Codec.Encode(obj)
 	if err != nil {
@@ -454,6 +457,9 @@ func (h *EtcdHelper) SetObj(key string, obj, out runtime.Object, ttl uint64) err
 	if err != nil {
 		return err
 	}
+	if strings.Contains(key, "../") {
+		return fmt.Errorf("Illegal path, moving to parent directories not supported")
+	}
 	key = h.PrefixEtcdKey(key)
 
 	create := true
@@ -544,6 +550,9 @@ func (h *EtcdHelper) GuaranteedUpdate(key string, ptrToType runtime.Object, igno
 		// Panic is appropriate, because this is a programming error.
 		panic("need ptr to type")
 	}
+	if strings.Contains(key, "../") {
+		return fmt.Errorf("Illegal path, moving to parent directories not supported")
+	}
 	key = h.PrefixEtcdKey(key)
 	for {
 		obj := reflect.New(v.Type()).Interface().(runtime.Object)

pkg/tools/etcd_helper_test.go

@@ -400,6 +400,16 @@ func TestCreateObj(t *testing.T) {
 	}
 }
 
+func TestCreateObjBadPath(t *testing.T) {
+	obj := &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}}
+	fakeClient := NewFakeEtcdClient(t)
+	helper := NewEtcdHelper(fakeClient, testapi.Codec(), etcdtest.PathPrefix())
+	err := helper.CreateObj("/some/../key", obj, &api.Pod{}, 5)
+	if err == nil {
+		t.Error("Unexpected non error")
+	}
+}
+
 func TestCreateObjNilOutParam(t *testing.T) {
 	obj := &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}}
 	fakeClient := NewFakeEtcdClient(t)
@@ -448,6 +458,16 @@ func TestSetObjFailCAS(t *testing.T) {
 	}
 }
 
+func TestSetObjFailBadPath(t *testing.T) {
+	obj := &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "1"}}
+	fakeClient := NewFakeEtcdClient(t)
+	helper := NewEtcdHelper(fakeClient, testapi.Codec(), etcdtest.PathPrefix())
+	err := helper.SetObj("/some/../key", obj, nil, 5)
+	if err == nil {
+		t.Errorf("Expecting error.")
+	}
+}
+
 func TestSetObjWithVersion(t *testing.T) {
 	obj := &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "1"}}
 	fakeClient := NewFakeEtcdClient(t)
@@ -739,6 +759,23 @@ func TestGuaranteedUpdateKeyNotFound(t *testing.T) {
 	}
 }
 
+func TestGuaranteedUpdateBadPath(t *testing.T) {
+	fakeClient := NewFakeEtcdClient(t)
+	fakeClient.TestIndex = true
+	helper := NewEtcdHelper(fakeClient, codec, etcdtest.PathPrefix())
+
+	obj := &TestResource{ObjectMeta: api.ObjectMeta{Name: "foo"}, Value: 1}
+	f := SimpleUpdate(func(in runtime.Object) (runtime.Object, error) {
+		return obj, nil
+	})
+
+	ignoreNotFound := false
+	err := helper.GuaranteedUpdate("/some/../key", &TestResource{}, ignoreNotFound, f)
+	if err == nil {
+		t.Errorf("Expected error for key with bad path.")
+	}
+}
+
 func TestGuaranteedUpdate_CreateCollision(t *testing.T) {
 	fakeClient := NewFakeEtcdClient(t)
 	fakeClient.TestIndex = true