Merge pull request etcd-io#2522 from xiang90/user_pw

etcdserver/etcdhttp: do not return back the password of a user
adamgomulka · Mar 30, 2015 · 253f7c4 · 253f7c4
2 parents 80d08ca + 9d28f94
commit 253f7c4
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/etcdserver/etcdhttp/client_security.go b/etcdserver/etcdhttp/client_security.go
@@ -267,6 +267,7 @@ func (sh *securityHandler) forUser(w http.ResponseWriter, r *http.Request, user
 			return
 		}
 		u.Password = ""
+
 		err = json.NewEncoder(w).Encode(u)
 		if err != nil {
 			log.Println("etcdhttp: forUser error encoding on", r.URL)
@@ -289,6 +290,8 @@ func (sh *securityHandler) forUser(w http.ResponseWriter, r *http.Request, user
 			writeError(w, err)
 			return
 		}
+		newuser.Password = ""
+
 		w.WriteHeader(http.StatusCreated)
 		err = json.NewEncoder(w).Encode(newuser)
 		if err != nil {