diff options
author | Steve Manuel <nilslice@gmail.com> | 2017-01-13 15:48:38 -0800 |
---|---|---|
committer | Steve Manuel <nilslice@gmail.com> | 2017-01-13 15:48:38 -0800 |
commit | 317dcbdda41cafbd5a330602b38b9a52fab5ec6f (patch) | |
tree | 23be361cc3d69a33d2aa88bf49c6586ff44b7afa /system/api | |
parent | af31558e3d90b887758d9266c5ba80f0d9eaf3dc (diff) |
adding test in CORS middleware in fix for start
Diffstat (limited to 'system/api')
-rw-r--r-- | system/api/handlers.go | 9 | ||||
-rw-r--r-- | system/api/server.go | 7 |
2 files changed, 10 insertions, 6 deletions
diff --git a/system/api/handlers.go b/system/api/handlers.go index 0be98a4..de7fbcb 100644 --- a/system/api/handlers.go +++ b/system/api/handlers.go @@ -254,13 +254,12 @@ func sendPreflight(res http.ResponseWriter) { // CORS wraps a HandleFunc to respond to OPTIONS requests properly func CORS(next http.HandlerFunc) http.HandlerFunc { - if db.ConfigCache("cors_disabled").([]string)[0] == "true" { - return http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { + return db.CacheControl(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { + if db.ConfigCache("cors_disabled").(bool) == true { res.WriteHeader(http.StatusForbidden) - }) - } + return + } - return db.CacheControl(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { if req.Method == http.MethodOptions { sendPreflight(res) return diff --git a/system/api/server.go b/system/api/server.go index 4b8b22e..e2af125 100644 --- a/system/api/server.go +++ b/system/api/server.go @@ -1,6 +1,9 @@ package api -import "net/http" +import ( + "fmt" + "net/http" +) // Run adds Handlers to default http listener for API func Run() { @@ -11,4 +14,6 @@ func Run() { http.HandleFunc("/api/content", Record(CORS(contentHandler))) http.HandleFunc("/api/content/external", Record(CORS(externalContentHandler))) + + fmt.Println("API routes registered.") } |