Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ctx.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"encoding/xml"
"errors"
"fmt"
"html"
"io"
"mime/multipart"
"net"
Expand Down Expand Up @@ -606,7 +607,7 @@ func (c *Ctx) Format(body interface{}) error {
// Format based on the accept content type
switch accept {
case "html":
return c.SendString("<p>" + b + "</p>")
return c.SendString("<p>" + html.EscapeString(b) + "</p>")
case "json":
return c.JSON(body)
case "txt":
Expand Down
18 changes: 18 additions & 0 deletions ctx_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1218,11 +1218,24 @@ func Test_Ctx_Format(t *testing.T) {
utils.AssertEqual(t, nil, err)
utils.AssertEqual(t, "<p>Hello, World!</p>", string(c.Response().Body()))

c.Request().Header.Set(HeaderAccept, MIMETextHTML)
err = c.Format("<script>alert(1)</script>")
utils.AssertEqual(t, nil, err)
utils.AssertEqual(t, "<p>&lt;script&gt;alert(1)&lt;/script&gt;</p>", string(c.Response().Body()))

c.Request().Header.Set(HeaderAccept, MIMEApplicationJSON)
err = c.Format("Hello, World!")
utils.AssertEqual(t, nil, err)
utils.AssertEqual(t, `"Hello, World!"`, string(c.Response().Body()))

c.Request().Header.Set(HeaderAccept, MIMEApplicationJSON)
err = c.Format("<script>alert(1)</script>")
utils.AssertEqual(t, nil, err)
jsonBody := append([]byte(nil), c.Response().Body()...)
err = c.JSON("<script>alert(1)</script>")
utils.AssertEqual(t, nil, err)
utils.AssertEqual(t, string(jsonBody), string(c.Response().Body()))
Comment thread
ReneWerner87 marked this conversation as resolved.

c.Request().Header.Set(HeaderAccept, MIMETextPlain)
err = c.Format(complex(1, 1))
utils.AssertEqual(t, nil, err)
Expand All @@ -1233,6 +1246,11 @@ func Test_Ctx_Format(t *testing.T) {
utils.AssertEqual(t, nil, err)
utils.AssertEqual(t, `<string>Hello, World!</string>`, string(c.Response().Body()))

c.Request().Header.Set(HeaderAccept, MIMEApplicationXML)
err = c.Format("<script>alert(1)</script>")
utils.AssertEqual(t, nil, err)
utils.AssertEqual(t, `<string>&lt;script&gt;alert(1)&lt;/script&gt;</string>`, string(c.Response().Body()))

err = c.Format(complex(1, 1))
utils.AssertEqual(t, true, err != nil)

Expand Down
Loading