Skip to content

Commit

Permalink
fix html escaping for json encoding (#531)
Browse files Browse the repository at this point in the history 
* fix html escaping for json encoding

* Tests with /, & and non-ASCII characters

Co-authored-by: Joe Afflerbach <joe.afflerbach@avenga.com>
  • Loading branch information
@afflerbach
Marcel Ludwig and afflerbach authored Jun 28, 2022
1 parent a9abdc0 commit 4f77888
Show file tree
Hide file tree
Showing 28 changed files with 182 additions and 437 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Unreleased changes are available as `avenga/couper:edge` container.
* with `retries = 0` ([#528](https://github.com/avenga/couper/pull/528))
* with `retries` > `0` and related origin configuration ([#529](https://github.com/avenga/couper/pull/529))
* race condition resulting in empty [`backends.<label>.health.state` variable](docs/REFERENCE.md#backends) ([#530](https://github.com/avenga/couper/pull/530))
* enabled json html escaping inherited from Go lib ([#531](https://github.com/avenga/couper/pull/531))

---

Expand Down
4 changes: 3 additions & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ require (
github.com/russellhaering/goxmldsig v1.2.0
github.com/satori/go.uuid v1.2.0
github.com/sirupsen/logrus v1.8.1
github.com/zclconf/go-cty v1.10.0
github.com/zclconf/go-cty v1.10.1-0.20220623211957-834994b84991
go.opentelemetry.io/otel v1.4.0
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.27.0
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.27.0
Expand Down Expand Up @@ -68,3 +68,5 @@ require (
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)

replace github.com/zclconf/go-cty => github.com/avenga/go-cty v0.0.0-20220627115852-3ddf0a688aea
10 changes: 2 additions & 8 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM=
github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk=
github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw=
github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
github.com/avenga/go-cty v0.0.0-20220627115852-3ddf0a688aea h1:5WSXDatVzK2gKoubA+JrqvqiyeXWVOnG1Y3O4Yzd53E=
github.com/avenga/go-cty v0.0.0-20220627115852-3ddf0a688aea/go.mod h1:s9IfD1LK5ccNMSWCVFCE2rJfHiZgi7JijgeWIMfhLvA=
github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs=
github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=
github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
Expand Down Expand Up @@ -127,7 +128,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt
github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
Expand Down Expand Up @@ -296,17 +296,12 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4=
github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/zclconf/go-cty v1.2.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8=
github.com/zclconf/go-cty v1.8.0/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk=
github.com/zclconf/go-cty v1.10.0 h1:mp9ZXQeIcN8kAwuqorjH+Q+njbJKjLrvB2yIh4q7U+0=
github.com/zclconf/go-cty v1.10.0/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk=
github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
Expand Down Expand Up @@ -383,7 +378,6 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
Expand Down
33 changes: 27 additions & 6 deletions server/http_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1552,11 +1552,11 @@ func TestHTTPServer_request_bodies(t *testing.T) {
"",
"",
expectation{
Body: "\"foo\"",
Body: `"föö"`,
Args: url.Values{},
Method: "POST",
Headers: http.Header{
"Content-Length": []string{"5"},
"Content-Length": []string{"7"},
"Content-Type": []string{"application/json"},
},
},
Expand All @@ -1566,11 +1566,25 @@ func TestHTTPServer_request_bodies(t *testing.T) {
"",
"",
expectation{
Body: "{\"foo\":\"bar\"}",
Body: `{"url":"http://...?foo&bar"}`,
Args: url.Values{},
Method: "POST",
Headers: http.Header{
"Content-Length": []string{"13"},
"Content-Length": []string{"28"},
"Content-Type": []string{"application/json"},
},
},
},
{
"/request/json_body/object/html",
"",
"",
expectation{
Body: `{"foo":"<p>bar</p>"}`,
Args: url.Values{},
Method: "POST",
Headers: http.Header{
"Content-Length": []string{"20"},
"Content-Type": []string{"application/json"},
},
},
Expand Down Expand Up @@ -1802,14 +1816,21 @@ func TestHTTPServer_response_bodies(t *testing.T) {
{
"/response/json_body/string",
expectation{
Body: "\"foo\"",
Body: `"foo"`,
ContentType: "application/json",
},
},
{
"/response/json_body/object",
expectation{
Body: "{\"foo\":\"bar\"}",
Body: `{"foo":"bar"}`,
ContentType: "application/json",
},
},
{
"/response/json_body/object/html",
expectation{
Body: `{"foo":"<p>bar</p>"}`,
ContentType: "application/json",
},
},
Expand Down
21 changes: 19 additions & 2 deletions server/testdata/integration/endpoint_eval/14_couper.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ server "bodies" {
endpoint "/request/json_body/string" {
request {
url = "${env.COUPER_TEST_BACKEND_ADDR}/anything"
json_body = "foo"
json_body = "föö"

backend {
origin = env.COUPER_TEST_BACKEND_ADDR
Expand All @@ -85,7 +85,18 @@ server "bodies" {
endpoint "/request/json_body/object" {
request {
url = "${env.COUPER_TEST_BACKEND_ADDR}/anything"
json_body = {"foo": "bar"}
json_body = {"url": "http://...?foo&bar"}

backend {
origin = env.COUPER_TEST_BACKEND_ADDR
}
}
}

endpoint "/request/json_body/object/html" {
request {
url = "${env.COUPER_TEST_BACKEND_ADDR}/anything"
json_body = {"foo": "<p>bar</p>"}

backend {
origin = env.COUPER_TEST_BACKEND_ADDR
Expand Down Expand Up @@ -211,6 +222,12 @@ server "bodies" {
}
}

endpoint "/response/json_body/object/html" {
response {
json_body = {"foo": "<p>bar</p>"}
}
}

endpoint "/response/json_body/array" {
response {
json_body = [0,1,2]
Expand Down
12 changes: 12 additions & 0 deletions vendor/github.com/zclconf/go-cty/cty/capsule_ops.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions vendor/github.com/zclconf/go-cty/cty/convert/unify.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/zclconf/go-cty/cty/element_iterator.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/zclconf/go-cty/cty/function/stdlib/format.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion vendor/github.com/zclconf/go-cty/cty/function/stdlib/json.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 4f77888

Please sign in to comment.