1f349/violet
4
0
Fork 0
mirror of https://github.com/1f349/violet.git synced 2024-11-21 10:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modify routing error messages

Browse Source
This commit is contained in:
Melon 2024-10-11 17:07:22 +01:00
parent aa77dccaaf
commit 0f095056d4
Signed by: melon
GPG Key ID: 6C9D970C50D26A25
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
target/route.go
View File

@ -5,7 +5,6 @@ import (
"github.com/1f349/violet/logger" "github.com/1f349/violet/logger"
"github.com/1f349/violet/proxy" "github.com/1f349/violet/proxy"
"github.com/1f349/violet/utils" "github.com/1f349/violet/utils"
"github.com/google/uuid"
websocket2 "github.com/gorilla/websocket" websocket2 "github.com/gorilla/websocket"
"github.com/rs/cors" "github.com/rs/cors"
"golang.org/x/net/http/httpguts" "golang.org/x/net/http/httpguts"
@ -130,8 +129,7 @@ func (r Route) internalServeHTTP(rw http.ResponseWriter, req *http.Request) {
// create the internal request // create the internal request
req2, err := http.NewRequest(req.Method, u.String(), req.Body) req2, err := http.NewRequest(req.Method, u.String(), req.Body)
if err != nil { if err != nil {
Logger.Warn("Error generating new request", "err", err) utils.RespondVioletError(rw, http.StatusBadGateway, "Invalid request for proxy")
utils.RespondVioletError(rw, http.StatusBadGateway, "error generating new request")
return return
} }
@ -182,7 +180,7 @@ func (r Route) internalServeHTTP(rw http.ResponseWriter, req *http.Request) {
} }
if err != nil { if err != nil {
Logger.Warn("Error receiving internal round trip response", "route src", r.Src, "url", req2.URL.String(), "err", err) Logger.Warn("Error receiving internal round trip response", "route src", r.Src, "url", req2.URL.String(), "err", err)
utils.RespondVioletError(rw, http.StatusBadGateway, "error receiving internal round trip response") utils.RespondVioletError(rw, http.StatusBadGateway, "Error receiving internal round trip response")
return return
} }
@ -192,9 +190,8 @@ func (r Route) internalServeHTTP(rw http.ResponseWriter, req *http.Request) {
} }
if resp.StatusCode == http.StatusLoopDetected { if resp.StatusCode == http.StatusLoopDetected {
u := uuid.New() Logger.Warn("Loop Detected", "method", req.Method, "url", req.URL, "url2", req2.URL.String())
Logger.Warn("Loop Detected", "id", u, "method", req.Method, "url", req.URL, "url2", req2.URL.String()) utils.RespondVioletError(rw, http.StatusLoopDetected, "Error loop detected")
utils.RespondVioletError(rw, http.StatusLoopDetected, "error loop detected: "+u.String())
return return
} }
@ -225,7 +222,7 @@ func (r Route) internalReverseProxyMeta(rw http.ResponseWriter, req, req2 *http.
reqUpType := upgradeType(req2.Header) reqUpType := upgradeType(req2.Header)
if !asciiIsPrint(reqUpType) { if !asciiIsPrint(reqUpType) {
utils.RespondVioletError(rw, http.StatusBadRequest, fmt.Sprintf("client tried to switch to invalid protocol %q", reqUpType)) utils.RespondVioletError(rw, http.StatusBadRequest, fmt.Sprintf("Invalid protocol %s", reqUpType))
return true return true
} }
removeHopByHopHeaders(req2.Header) removeHopByHopHeaders(req2.Header)