kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #27060 from yongtang/27021-inspect-show-env

Browse source 
Disable HTML escaping for JSON strings in `docker inspect`
This commit is contained in:
Vincent Demeester 2016-10-02 14:32:56 +02:00 • committed by GitHub
commit 420e22fad4
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
api/server/httputils/httputils.go
View file

@ -81,7 +81,9 @@ func ParseForm(r *http.Request) error {
func WriteJSON(w http.ResponseWriter, code int, v interface{}) error {
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(code)
return json.NewEncoder(w).Encode(v)
enc := json.NewEncoder(w)
enc.SetEscapeHTML(false)
return enc.Encode(v)
}
// VersionFromContext returns an API version from the context using APIVersionKey.

10
integration-cli/docker_cli_inspect_test.go
View file

@ -407,3 +407,13 @@ func (s *DockerSuite) TestInspectRootFS(c *check.C) {
c.Assert(len(imageJSON[0].RootFS.Layers), checker.GreaterOrEqualThan, 1)
}
func (s *DockerSuite) TestInspectAmpersand(c *check.C) {
testRequires(c, DaemonIsLinux)
name := "test"
out, _ := dockerCmd(c, "run", "--name", name, "--env", `TEST_ENV="soanni&rtr"`, "busybox", "env")
c.Assert(out, checker.Contains, `soanni&rtr`)
out, _ = dockerCmd(c, "inspect", name)
c.Assert(out, checker.Contains, `soanni&rtr`)
}