Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add cors remove browser #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add cors remove browser #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d25c2b
Adding options calls to support gui frontend
Binary00 Nov 28, 2018
24aba94
Removing println, needs tests
Binary00 Nov 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 17 additions & 22 deletions api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,10 @@ func (server *ApiServer) PopulateConfig(filename string) {
}
}

func StopBrowsersMiddleware(h http.Handler) http.Handler {
func allRequests(h http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
// We're ok with browsers hitting the proxy. I know of the report
// https://hackerone.com/reports/236349
/*if strings.HasPrefix(r.UserAgent(), "Mozilla/") {
http.Error(w, "User agent not allowed", 403)
} else {*/
h.ServeHTTP(w, r)
//}
setGlobalHeaders(w)
h.ServeHTTP(w, r)
})
}

Expand All @@ -62,19 +57,23 @@ func (server *ApiServer) Listen(host string, port string) {
r.HandleFunc("/reset", server.ResetState).Methods("POST")
r.HandleFunc("/proxies", server.ProxyIndex).Methods("GET")
r.HandleFunc("/proxies", server.ProxyCreate).Methods("POST")
r.HandleFunc("/proxies", server.OptionsHandler).Methods("OPTIONS")
r.HandleFunc("/populate", server.Populate).Methods("POST")
r.HandleFunc("/proxies/{proxy}", server.ProxyShow).Methods("GET")
r.HandleFunc("/proxies/{proxy}", server.ProxyUpdate).Methods("POST")
r.HandleFunc("/proxies/{proxy}", server.ProxyDelete).Methods("DELETE")
r.HandleFunc("/proxies/{proxy}", server.OptionsHandler).Methods("OPTIONS")
r.HandleFunc("/proxies/{proxy}/toxics", server.ToxicIndex).Methods("GET")
r.HandleFunc("/proxies/{proxy}/toxics", server.ToxicCreate).Methods("POST")
r.HandleFunc("/proxies/{proxy}/toxics", server.OptionsHandler).Methods("OPTIONS")
r.HandleFunc("/proxies/{proxy}/toxics/{toxic}", server.ToxicShow).Methods("GET")
r.HandleFunc("/proxies/{proxy}/toxics/{toxic}", server.ToxicUpdate).Methods("POST")
r.HandleFunc("/proxies/{proxy}/toxics/{toxic}", server.ToxicDelete).Methods("DELETE")
r.HandleFunc("/proxies/{proxy}/toxics/{toxic}", server.OptionsHandler).Methods("OPTIONS")

r.HandleFunc("/version", server.Version).Methods("GET")

http.Handle("/", StopBrowsersMiddleware(r))
http.Handle("/", allRequests(r))

logrus.WithFields(logrus.Fields{
"host": host,
Expand All @@ -88,6 +87,15 @@ func (server *ApiServer) Listen(host string, port string) {
}
}

func (server *ApiServer) OptionsHandler(response http.ResponseWriter, request *http.Request) {
response.Header().Set("Access-Control-Allow-Methods", "GET,POST,PUT,DELETE,OPTIONS")
response.Header().Set("Access-Control-Allow-Headers", request.Header.Get("Access-Control-Request-Headers"))
_, err := response.Write(nil)
if err != nil {
logrus.Warn("OptionsHandler: Failed to write response to client", err)
}
}

func (server *ApiServer) ProxyIndex(response http.ResponseWriter, request *http.Request) {
proxies := server.Collection.Proxies()
marshalData := make(map[string]interface{}, len(proxies))
Expand All @@ -102,7 +110,6 @@ func (server *ApiServer) ProxyIndex(response http.ResponseWriter, request *http.
}

response.Header().Set("Content-Type", "application/json")
setGlobalHeaders(response)
_, err = response.Write(data)
if err != nil {
logrus.Warn("ProxyIndex: Failed to write response to client", err)
Expand All @@ -122,7 +129,6 @@ func (server *ApiServer) ResetState(response http.ResponseWriter, request *http.
}

response.WriteHeader(http.StatusNoContent)
setGlobalHeaders(response)
_, err := response.Write(nil)
if err != nil {
logrus.Warn("ResetState: Failed to write headers to client", err)
Expand Down Expand Up @@ -163,7 +169,6 @@ func (server *ApiServer) ProxyCreate(response http.ResponseWriter, request *http

response.Header().Set("Content-Type", "application/json")
response.WriteHeader(http.StatusCreated)
setGlobalHeaders(response)
_, err = response.Write(data)
if err != nil {
logrus.Warn("ProxyCreate: Failed to write response to client", err)
Expand Down Expand Up @@ -194,7 +199,6 @@ func (server *ApiServer) Populate(response http.ResponseWriter, request *http.Re

response.Header().Set("Content-Type", "application/json")
response.WriteHeader(responseCode)
setGlobalHeaders(response)
_, err = response.Write(data)
if err != nil {
logrus.Warn("Populate: Failed to write response to client", err)
Expand All @@ -215,7 +219,6 @@ func (server *ApiServer) ProxyShow(response http.ResponseWriter, request *http.R
}

response.Header().Set("Content-Type", "application/json")
setGlobalHeaders(response)
_, err = response.Write(data)
if err != nil {
logrus.Warn("ProxyShow: Failed to write response to client", err)
Expand Down Expand Up @@ -248,7 +251,6 @@ func (server *ApiServer) ProxyUpdate(response http.ResponseWriter, request *http
}

response.Header().Set("Content-Type", "application/json")
setGlobalHeaders(response)
_, err = response.Write(data)
if err != nil {
logrus.Warn("ProxyUpdate: Failed to write response to client", err)
Expand All @@ -264,7 +266,6 @@ func (server *ApiServer) ProxyDelete(response http.ResponseWriter, request *http
}

response.WriteHeader(http.StatusNoContent)
setGlobalHeaders(response)
_, err = response.Write(nil)
if err != nil {
logrus.Warn("ProxyDelete: Failed to write headers to client", err)
Expand All @@ -286,7 +287,6 @@ func (server *ApiServer) ToxicIndex(response http.ResponseWriter, request *http.
}

response.Header().Set("Content-Type", "application/json")
setGlobalHeaders(response)
_, err = response.Write(data)
if err != nil {
logrus.Warn("ToxicIndex: Failed to write response to client", err)
Expand All @@ -312,7 +312,6 @@ func (server *ApiServer) ToxicCreate(response http.ResponseWriter, request *http
}

response.Header().Set("Content-Type", "application/json")
setGlobalHeaders(response)
_, err = response.Write(data)
if err != nil {
logrus.Warn("ToxicCreate: Failed to write response to client", err)
Expand All @@ -339,7 +338,6 @@ func (server *ApiServer) ToxicShow(response http.ResponseWriter, request *http.R
}

response.Header().Set("Content-Type", "application/json")
setGlobalHeaders(response)
_, err = response.Write(data)
if err != nil {
logrus.Warn("ToxicShow: Failed to write response to client", err)
Expand All @@ -365,7 +363,6 @@ func (server *ApiServer) ToxicUpdate(response http.ResponseWriter, request *http
}

response.Header().Set("Content-Type", "application/json")
setGlobalHeaders(response)
_, err = response.Write(data)
if err != nil {
logrus.Warn("ToxicUpdate: Failed to write response to client", err)
Expand All @@ -386,7 +383,6 @@ func (server *ApiServer) ToxicDelete(response http.ResponseWriter, request *http
}

response.WriteHeader(http.StatusNoContent)
setGlobalHeaders(response)
_, err = response.Write(nil)
if err != nil {
logrus.Warn("ToxicDelete: Failed to write headers to client", err)
Expand All @@ -395,7 +391,6 @@ func (server *ApiServer) ToxicDelete(response http.ResponseWriter, request *http

func (server *ApiServer) Version(response http.ResponseWriter, request *http.Request) {
response.Header().Set("Content-Type", "text/plain;charset=utf-8")
setGlobalHeaders(response)
_, err := response.Write([]byte(Version))
if err != nil {
logrus.Warn("Version: Failed to write response to client", err)
Expand Down