Merge branch 'pld'

Author: Becivells

internal/reverse/response.go

@@ -149,10 +149,16 @@ func (reverse *Reverse) modifyLocationHeader(shost string, response *http.Respon
 	log.Trace("Location: %s", location.String())
 	target := reverse.AllowSite[shost]
 	targetHost, _ := url.Parse(target)
+	locationHost, err := utils.Parse(location.String())
+	if err != nil {
+		return err
+	}
 
-	if targetHost.Host == location.Host {
+	if targetHost.Host == locationHost.Host {
 		location.Scheme = ""
 		location.Host = ""
+	} else {
+		log.Trace("url: %s,Location: %s", response.Request.URL, location.String())
 	}
 	if location.String() == "" {
 		log.Trace("url: %s,Location is empty", response.Request.URL)
@@ -171,7 +177,7 @@ func (reverse *Reverse) modifyCookieHeader(shost string, response *http.Response
 	var mcook []string
 	addr, _, err := utils.SplitHost(shost)
 	if err != nil {
-		return err
+		addr = shost
 	}
 	for _, value := range rcookies {
 		// 关闭 Secure

internal/reverse/utils.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net/http"
 	"net/http/httputil"
+	"strings"
 
 	"goblin/pkg/utils"
 )
@@ -25,3 +26,23 @@ func dumpReq(r *http.Request) string {
 	req, _ := httputil.DumpRequest(r, true)
 	return fmt.Sprintf(info, r.URL.RequestURI(), GetClientIP(r), string(req), r.URL.RequestURI())
 }
+
+// IsWebSocketRequest returns a boolean indicating whether the request has the
+func IsWebSocketRequest(r *http.Request) bool {
+	contains := func(key, val string) bool {
+		vv := strings.Split(r.Header.Get(key), ",")
+		for _, v := range vv {
+			if val == strings.ToLower(strings.TrimSpace(v)) {
+				return true
+			}
+		}
+		return false
+	}
+	if !contains("Connection", "upgrade") {
+		return false
+	}
+	if !contains("Upgrade", "websocket") {
+		return false
+	}
+	return true
+}