char
/
dendrite
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix http responses in validateRecaptcha (#431) 

fixes #421
main
Anant Prakash 2019-07-09 18:51:33 +05:30 committed by Andrew Morgan
parent 69f8d5a77e
commit c725176878
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clientapi/routing/register.go
View File

@ -243,8 +243,8 @@ func validateRecaptcha(
) *util.JSONResponse { ) *util.JSONResponse {
if !cfg.Matrix.RecaptchaEnabled { if !cfg.Matrix.RecaptchaEnabled {
return &util.JSONResponse{ return &util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusConflict,
JSON: jsonerror.BadJSON("Captcha registration is disabled"), JSON: jsonerror.Unknown("Captcha registration is disabled"),
} }
} }
@ -279,8 +279,8 @@ func validateRecaptcha(
body, err := ioutil.ReadAll(resp.Body) body, err := ioutil.ReadAll(resp.Body)
if err != nil { if err != nil {
return &util.JSONResponse{ return &util.JSONResponse{
Code: http.StatusInternalServerError, Code: http.StatusGatewayTimeout,
JSON: jsonerror.BadJSON("Error in contacting captcha server" + err.Error()), JSON: jsonerror.Unknown("Error in contacting captcha server" + err.Error()),
} }
} }
err = json.Unmarshal(body, &r) err = json.Unmarshal(body, &r)