From 24b4e54f25baadbd32faf3050677cca85b221c30 Mon Sep 17 00:00:00 2001 From: Martin Geno Date: Tue, 17 May 2016 10:56:14 +0200 Subject: [PATCH] api access controll --- api/aliases.go | 10 +++++----- api/lib.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/aliases.go b/api/aliases.go index 4836a2a..013b4ee 100644 --- a/api/aliases.go +++ b/api/aliases.go @@ -46,12 +46,12 @@ func (api *ApiAliases) cleaner(){ } } func (api *ApiAliases) GetAll(w http.ResponseWriter, r *http.Request, _ httprouter.Params) { - jsonOutput(w,api.aliases.List) + jsonOutput(w,r,api.aliases.List) } func (api *ApiAliases) GetOne(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { if alias := api.aliases.List[ps.ByName("nodeid")]; alias !=nil{ - jsonOutput(w,alias) + jsonOutput(w,r,alias) return } fmt.Fprint(w, "Not found: ", ps.ByName("nodeid"),"\n") @@ -67,14 +67,14 @@ func (api *ApiAliases) SaveOne(w http.ResponseWriter, r *http.Request, ps httpro return } api.aliases.Update(ps.ByName("nodeid"),&alias) - jsonOutput(w,alias) + jsonOutput(w,r,alias) } func (api *ApiAliases) Cleanup(w http.ResponseWriter, r *http.Request, _ httprouter.Params) { api.cleaner() - jsonOutput(w,api.aliases.List) + jsonOutput(w,r,api.aliases.List) } func (api *ApiAliases) AnsibleDiff(w http.ResponseWriter, r *http.Request, _ httprouter.Params) { api.cleaner() - jsonOutput(w,models.GenerateAnsible(api.nodes,api.aliases.List)) + jsonOutput(w,r,models.GenerateAnsible(api.nodes,api.aliases.List)) } diff --git a/api/lib.go b/api/lib.go index c922d2f..fcf50e6 100644 --- a/api/lib.go +++ b/api/lib.go @@ -10,7 +10,7 @@ import ( "github.com/julienschmidt/httprouter" ) -func jsonOutput(w http.ResponseWriter,data interface{}){ +func jsonOutput(w http.ResponseWriter, r *http.Request,data interface{}){ js, err := json.Marshal(data) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError)