From 25f4e027727389f7173f727a9e70612805f0ea51 Mon Sep 17 00:00:00 2001 From: Sean DuBois Date: Sat, 21 Jun 2014 02:48:40 +0000 Subject: [PATCH] Implement the deletion/creation of failRegexes --- jail.go | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/jail.go b/jail.go index 6ff7747..0b64081 100644 --- a/jail.go +++ b/jail.go @@ -18,7 +18,7 @@ func jailGetHandler(res http.ResponseWriter, req *http.Request, fail2goConn *fai "currentlyBanned": currentlyBanned, "totalBanned": totalBanned, "IPList": IPList, - "failregex": failRegexes}) + "failRegexes": failRegexes}) if err != nil { } @@ -58,18 +58,58 @@ func jailUnbanIPHandler(res http.ResponseWriter, req *http.Request, fail2goConn } res.Write(encodedOutput) +} +type jailFailRegexBody struct { + FailRegex string +} + +func jailAddFailRegexHandler(res http.ResponseWriter, req *http.Request, fail2goConn *fail2go.Fail2goConn) { + var input jailFailRegexBody + err := json.NewDecoder(req.Body).Decode(&input) + if err != nil { + } + + output, _ := fail2goConn.JailAddFailRegex(mux.Vars(req)["jail"], input.FailRegex) + + encodedOutput, err := json.Marshal(map[string]interface{}{"FailRegex": output}) + if err != nil { + } + + res.Write(encodedOutput) +} + +func jailDeleteFailRegexHandler(res http.ResponseWriter, req *http.Request, fail2goConn *fail2go.Fail2goConn) { + var input jailFailRegexBody + err := json.NewDecoder(req.Body).Decode(&input) + if err != nil { + } + + output, _ := fail2goConn.JailDeleteFailRegex(mux.Vars(req)["jail"], input.FailRegex) + + encodedOutput, err := json.Marshal(map[string]interface{}{"FailRegex": output}) + if err != nil { + } + + res.Write(encodedOutput) } func jailHandler(jailRouter *mux.Router, fail2goConn *fail2go.Fail2goConn) { - jailRouter.HandleFunc("/{jail}/bannedips", func(res http.ResponseWriter, req *http.Request) { + jailRouter.HandleFunc("/{jail}/bannedip", func(res http.ResponseWriter, req *http.Request) { jailBanIPHandler(res, req, fail2goConn) }).Methods("POST") - jailRouter.HandleFunc("/{jail}/bannedips", func(res http.ResponseWriter, req *http.Request) { + jailRouter.HandleFunc("/{jail}/bannedip", func(res http.ResponseWriter, req *http.Request) { jailUnbanIPHandler(res, req, fail2goConn) }).Methods("DELETE") + jailRouter.HandleFunc("/{jail}/failregex", func(res http.ResponseWriter, req *http.Request) { + jailAddFailRegexHandler(res, req, fail2goConn) + }).Methods("POST") + jailRouter.HandleFunc("/{jail}/failregex", func(res http.ResponseWriter, req *http.Request) { + jailDeleteFailRegexHandler(res, req, fail2goConn) + }).Methods("DELETE") + jailRouter.HandleFunc("/{jail}", func(res http.ResponseWriter, req *http.Request) { jailGetHandler(res, req, fail2goConn) }).Methods("GET")