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

Disable HTML escaping for JSON strings in docker inspect

Browse source 
This fix tries to address the issue raised in 27021 where
HTML strings like (`&, >, <, etc`) in environmental variables
are escaped for JSON output for `docker inspect`. For example,
`TEST_ENV="soanni&rtr"` has been escaped to `TEST_ENV="soanni\u0026rtr"`

This fix disabled HTML escaping with `SetEscapeHTML`, which is available
since golang 1.7.0. This changes will be applied to all JSON output
that utilize `httputils.WriteJSON`.

An integration test has been added to cover the changes.

This fix fixes 27021.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
This commit is contained in:
Yong Tang 2016-09-29 18:16:36 -07:00
parent 1d669d82c1
commit 0fa20ad13b
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 { func WriteJSON(w http.ResponseWriter, code int, v interface{}) error {
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
w.WriteHeader(code) 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. // 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) 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`)
}