ffhb/yanic
ffhb
/
yanic
mirror of https://github.com/FreifunkBremen/yanic.git
1
0
Fork 0
Code Issues Releases Wiki Activity

api access controll

This commit is contained in:
Martin Geno 2016-05-17 10:56:14 +02:00
parent b2af5382ea
commit 24b4e54f25
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/aliases.go
View File

@ -46,12 +46,12 @@ func (api *ApiAliases) cleaner(){
} }
} }
func (api *ApiAliases) GetAll(w http.ResponseWriter, r *http.Request, _ httprouter.Params) { 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) { func (api *ApiAliases) GetOne(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
if alias := api.aliases.List[ps.ByName("nodeid")]; alias !=nil{ if alias := api.aliases.List[ps.ByName("nodeid")]; alias !=nil{
jsonOutput(w,alias) jsonOutput(w,r,alias)
return return
} }
fmt.Fprint(w, "Not found: ", ps.ByName("nodeid"),"\n") 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 return
} }
api.aliases.Update(ps.ByName("nodeid"),&alias) 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) { func (api *ApiAliases) Cleanup(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
api.cleaner() 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) { func (api *ApiAliases) AnsibleDiff(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
api.cleaner() api.cleaner()
jsonOutput(w,models.GenerateAnsible(api.nodes,api.aliases.List)) jsonOutput(w,r,models.GenerateAnsible(api.nodes,api.aliases.List))
} }

2
api/lib.go
View File

@ -10,7 +10,7 @@ import (
"github.com/julienschmidt/httprouter" "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) js, err := json.Marshal(data)
if err != nil { if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)