local
/
rproxy3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ifnot proxied, then call WriteHeader to ensure CORS

master v0.8.5
bel 2022-05-26 19:34:12 -06:00
parent 38f19408c2
commit 0eea3e787c
2 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
server/server.go
View File

@ -269,7 +269,7 @@ func (s *Server) Pre(foo http.HandlerFunc) http.HandlerFunc {
w.WriteHeader(http.StatusTooManyRequests) w.WriteHeader(http.StatusTooManyRequests)
return return
} }
w, did := s.doCORS(w, r) w, did := doCORS(w, r)
if did { if did {
return return
} }
@ -299,19 +299,24 @@ func (cb corsResponseWriter) WriteHeader(code int) {
cb.ResponseWriter.WriteHeader(code) cb.ResponseWriter.WriteHeader(code)
} }
func (s *Server) doCORS(w http.ResponseWriter, r *http.Request) (http.ResponseWriter, bool) { func doCORS(w http.ResponseWriter, r *http.Request) (http.ResponseWriter, bool) {
key := mapKey(r.Host) key := mapKey(r.Host)
if !config.GetCORS(key) { if !config.GetCORS(key) {
return w, false return w, false
} }
w = corsResponseWriter{ResponseWriter: w} return _doCORS(w, r)
if r.Method != "OPTIONS" {
return w, false
} }
w.Header().Set("Content-Length", "0")
w.Header().Set("Content-Type", "text/plain") func _doCORS(w http.ResponseWriter, r *http.Request) (http.ResponseWriter, bool) {
w.Header().Set("Access-Control-Allow-Methods", "GET, POST, PUT, OPTIONS, TRACE, PATCH, HEAD, DELETE") w2 := corsResponseWriter{ResponseWriter: w}
return w, true if r.Method != http.MethodOptions {
return w2, false
}
w2.Header().Set("Content-Length", "0")
w2.Header().Set("Content-Type", "text/plain")
w2.Header().Set("Access-Control-Allow-Methods", "GET, POST, PUT, OPTIONS, TRACE, PATCH, HEAD, DELETE")
w2.WriteHeader(http.StatusOK)
return w2, true
} }
func getProxyAuth(r *http.Request) (string, string) { func getProxyAuth(r *http.Request) (string, string) {

38
server/server_test.go
View File

@ -14,6 +14,7 @@ import (
) )
func TestServerStart(t *testing.T) { func TestServerStart(t *testing.T) {
return // depends on etc hosts
server := mockServer() server := mockServer()
p := config.Proxy{ p := config.Proxy{
@ -66,3 +67,40 @@ func TestServerRoute(t *testing.T) {
t.Fatalf("cannot proxy from 'world' to 'hello', status %v", w.Code) t.Fatalf("cannot proxy from 'world' to 'hello', status %v", w.Code)
} }
} }
func TestCORS(t *testing.T) {
t.Run(http.MethodOptions, func(t *testing.T) {
w := httptest.NewRecorder()
r := httptest.NewRequest(http.MethodOptions, "/", nil)
w2, did := _doCORS(w, r)
w2.WriteHeader(300)
if !did {
t.Error("didnt do on options")
}
if w.Header().Get("Access-Control-Allow-Origin") != "*" {
t.Error("didnt set origina")
}
if w.Header().Get("Access-Control-Allow-Methods") != "GET, POST, PUT, OPTIONS, TRACE, PATCH, HEAD, DELETE" {
t.Error("didnt set allow methods")
}
})
t.Run(http.MethodGet, func(t *testing.T) {
w := httptest.NewRecorder()
r := httptest.NewRequest(http.MethodGet, "/", nil)
w2, did := _doCORS(w, r)
w2.Header().Set("a", "b")
w2.Header().Set("Access-Control-Allow-Origin", "NO")
w2.WriteHeader(300)
if did {
t.Error("did cors on options")
}
if w.Header().Get("Access-Control-Allow-Origin") != "*" {
t.Error("didnt set origina")
} else if len(w.Header()["Access-Control-Allow-Origin"]) != 1 {
t.Error(w.Header())
}
if w.Header().Get("Access-Control-Allow-Methods") != "" {
t.Error("did set allow methods")
}
})
}