Add CORS top level middleware router to knotserver/ #735

To make it easier to get information about tangled repos, CORS need to be enabled on repo knots otherwise browsers will throw a fit. This change adds those headers. I think maybe the auth routes could do without them as right now it just gives it to all the routes.

+19

2 changed files

Diff round #2

expand all

unified split

knotserver

middleware.go

router.go

+18

knotserver/middleware.go

··· 33 33 ) 34 34 }) 35 35 } 36 + 37 + func (h *Knot) CORS(next http.Handler) http.Handler { 38 + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { 39 + // Set CORS headers 40 + w.Header().Set("Access-Control-Allow-Origin", "*") 41 + w.Header().Set("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS") 42 + w.Header().Set("Access-Control-Allow-Headers", "Content-Type, Authorization") 43 + w.Header().Set("Access-Control-Max-Age", "86400") 44 + 45 + // Handle preflight requests 46 + if r.Method == "OPTIONS" { 47 + w.WriteHeader(http.StatusOK) 48 + return 49 + } 50 + 51 + next.ServeHTTP(w, r) 52 + }) 53 + }

knotserver/router.go

··· 71 71 func (h *Knot) Router() http.Handler { 72 72 r := chi.NewRouter() 73 73 74 + r.Use(h.CORS) 74 75 r.Use(h.RequestLogger) 75 76 76 77 r.Get("/", func(w http.ResponseWriter, r *http.Request) {

History

3 rounds 4 comments

nekomimi.pet submitted #2 4mo

interdiff

2 commits

expand

59a1308e

knotserver: add cors headers as a middleware function

b19de89d

knotserver: have top level router use cors header function

expand 2 comments

nekomimi.pet 4mo

renamed commits

anirudh.fi 4mo

Amazing, merging!

pull request successfully merged

nekomimi.pet submitted #1 4mo

diff interdiff

2 commits

expand

83963a3d

knotserver/middleware.go: add cors headers as a middleware function

729f7fce

knotserver/router.go: have top level router use cors header function

expand 2 comments

nekomimi.pet 4mo

resubmitted to sign off on commits

anirudh.fi 4mo

Awesome, this looks great! Tiny nit about the commits: they can simply be knotserver: … (exclude the filename, we only specify nested directories).

nekomimi.pet submitted #0 4mo

diff

2 commits

expand

88684a67

knotserver/middleware.go: add cors headers as a middleware function

396baab5

knotserver/router.go: have top level router use cors header function

expand 0 comments