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

If Content-Type is application/json;charset=UTF-8, RequestBody is empty.

Signed-off-by: odg0318 <odg0318@gmail.com>
This commit is contained in:
odg0318 2018-04-04 04:04:50 -04:00
parent 094aa1a552
commit 6ac73d34e4
2 changed files with 67 additions and 1 deletions

View file

@ -5,6 +5,7 @@ import (
"bytes"
"fmt"
"io"
"mime"
"net/http"
"strings"
@ -153,7 +154,12 @@ func sendBody(url string, header http.Header) bool {
}
// body is sent only for text or json messages
return header.Get("Content-Type") == "application/json"
contentType, _, err := mime.ParseMediaType(header.Get("Content-Type"))
if err != nil {
return false
}
return contentType == "application/json"
}
// headers returns flatten version of the http headers excluding authorization

View file

@ -172,6 +172,66 @@ func TestDrainBody(t *testing.T) {
}
}
func TestSendBody(t *testing.T) {
var (
url = "nothing.com"
testcases = []struct {
contentType string
expected bool
}{
{
contentType: "application/json",
expected: true,
},
{
contentType: "Application/json",
expected: true,
},
{
contentType: "application/JSON",
expected: true,
},
{
contentType: "APPLICATION/JSON",
expected: true,
},
{
contentType: "application/json; charset=utf-8",
expected: true,
},
{
contentType: "application/json;charset=utf-8",
expected: true,
},
{
contentType: "application/json; charset=UTF8",
expected: true,
},
{
contentType: "application/json;charset=UTF8",
expected: true,
},
{
contentType: "text/html",
expected: false,
},
{
contentType: "",
expected: false,
},
}
)
for _, testcase := range testcases {
header := http.Header{}
header.Set("Content-Type", testcase.contentType)
if b := sendBody(url, header); b != testcase.expected {
t.Fatalf("Unexpected Content-Type; Expected: %t, Actual: %t", testcase.expected, b)
}
}
}
func TestResponseModifierOverride(t *testing.T) {
r := httptest.NewRecorder()
m := NewResponseModifier(r)