security: sanitize uri

This commit is contained in:
yusing 2025-03-22 23:58:37 +08:00
parent 189c870630
commit 17ef5cb9a5
3 changed files with 87 additions and 9 deletions

View file

@ -19,6 +19,7 @@ import (
gphttp "github.com/yusing/go-proxy/internal/net/http"
"github.com/yusing/go-proxy/internal/route/routes"
route "github.com/yusing/go-proxy/internal/route/types"
"github.com/yusing/go-proxy/internal/utils/strutils"
)
type fetchResult struct {
@ -207,10 +208,7 @@ func findIconSlow(r route.HTTPRoute, req *http.Request, uri string) *fetchResult
defer cancel()
newReq := req.WithContext(ctx)
newReq.Header.Set("Accept-Encoding", "identity") // disable compression
if !strings.HasPrefix(uri, "/") {
uri = "/" + uri
}
u, err := url.ParseRequestURI(uri)
u, err := url.ParseRequestURI(strutils.SanitizeURI(uri))
if err != nil {
logging.Error().Err(err).
Str("route", r.TargetName()).
@ -231,11 +229,8 @@ func findIconSlow(r route.HTTPRoute, req *http.Request, uri string) *fetchResult
return &fetchResult{statusCode: http.StatusBadGateway, errMsg: "connection error"}
default:
if loc := c.Header().Get("Location"); loc != "" {
loc = path.Clean(loc)
if !strings.HasPrefix(loc, "/") {
loc = "/" + loc
}
if loc == newReq.URL.Path {
loc = strutils.SanitizeURI(loc)
if loc == "/" || loc == newReq.URL.Path {
return &fetchResult{statusCode: http.StatusBadGateway, errMsg: "circular redirect"}
}
return findIconSlow(r, req, loc)

View file

@ -0,0 +1,20 @@
package strutils
import "path"
// SanitizeURI sanitizes a URI reference to ensure it is safe
// It disallows URLs beginning with // or /\ as absolute URLs,
// cleans the URL path to remove any .. or . path elements,
// and ensures the URL starts with a / if it doesn't already
func SanitizeURI(uri string) string {
if uri == "" {
return "/"
}
if uri[0] != '/' {
uri = "/" + uri
}
if len(uri) > 1 && uri[0] == '/' && uri[1] != '/' && uri[1] != '\\' {
return path.Clean(uri)
}
return "/"
}

View file

@ -0,0 +1,63 @@
package strutils
import (
"testing"
"github.com/stretchr/testify/require"
)
func TestSanitizeURI(t *testing.T) {
tests := []struct {
name string
input string
expected string
}{
{
name: "empty string",
input: "",
expected: "/",
},
{
name: "single slash",
input: "/",
expected: "/",
},
{
name: "normal path",
input: "/path/to/resource",
expected: "/path/to/resource",
},
{
name: "path without leading slash",
input: "path/to/resource",
expected: "/path/to/resource",
},
{
name: "path with dot segments",
input: "/path/./to/../resource",
expected: "/path/resource",
},
{
name: "double slash prefix",
input: "//path/to/resource",
expected: "/",
},
{
name: "backslash prefix",
input: "/\\path/to/resource",
expected: "/",
},
{
name: "path with multiple slashes",
input: "/path//to///resource",
expected: "/path/to/resource",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
result := SanitizeURI(tt.input)
require.Equal(t, tt.expected, result)
})
}
}