Merge pull request #151 from nono/fix-content-type-with-charset

Accept application/json; charset=utf-8 for /auth/register
cozy · Dec 15, 2016 · baae195 · baae195
2 parents 7e9c03f + b20d273
commit baae195
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/web/auth/auth.go b/web/auth/auth.go
@@ -142,7 +142,11 @@ func checkRedirectParam(c echo.Context, defaultRedirect string) (string, error)
 
 func registerClient(c echo.Context) error {
  // TODO add rate-limiting to prevent DOS attacks
- if c.Request().Header.Get("Content-Type") != "application/json" {
+ contentType := c.Request().Header.Get("Content-Type")
+ if contentType != "" {
+ contentType = strings.Split(contentType, ";")[0]
+ }
+ if contentType != "application/json" {
  return c.JSON(http.StatusBadRequest, echo.Map{
  "error": "bad_content_type",
  })

diff --git a/web/auth/auth_test.go b/web/auth/auth_test.go
@@ -914,7 +914,7 @@ func postJSON(u string, v echo.Map) (*http.Response, error) {
  body, _ := json.Marshal(v)
  req, _ := http.NewRequest("POST", ts.URL+u, bytes.NewBuffer(body))
  req.Host = domain
- req.Header.Add("Content-Type", "application/json")
+ req.Header.Add("Content-Type", "application/json; charset=utf-8")
  req.Header.Add("Accept", "application/json")
  return client.Do(req)
 }