cristiancmoises
/
gophish
mirror of https://github.com/gophish/gophish
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing middleware JSON responses

pull/539/merge
Jordan Wright 2017-01-18 20:12:25 -06:00
parent c52981614a
commit b3cadcb01f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
middleware/middleware.go
View File

@ -73,6 +73,7 @@ func RequireAPIKey(handler http.Handler) http.HandlerFunc {
} }
if ak == "" { if ak == "" {
JSONError(w, 400, "API Key not set") JSONError(w, 400, "API Key not set")
return
} else { } else {
u, err := models.GetUserByAPIKey(ak) u, err := models.GetUserByAPIKey(ak)
if err != nil { if err != nil {
@ -101,8 +102,8 @@ func RequireLogin(handler http.Handler) http.HandlerFunc {
// JSONError returns an error in JSON format with the given // JSONError returns an error in JSON format with the given
// status code and message // status code and message
func JSONError(w http.ResponseWriter, c int, m string) { func JSONError(w http.ResponseWriter, c int, m string) {
w.WriteHeader(c)
w.Header().Set("Content-Type", "application/json")
cj, _ := json.MarshalIndent(models.Response{Success: false, Message: m}, "", " ") cj, _ := json.MarshalIndent(models.Response{Success: false, Message: m}, "", " ")
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(c)
fmt.Fprintf(w, "%s", cj) fmt.Fprintf(w, "%s", cj)
} }