feat: Add subdomain normalization in proxy.go

miseyu · miseyu · commit d71efbd87c90 · 2024-07-08T23:47:10.000+09:00
diff --git a/pkg/proxy.go b/pkg/proxy.go
@@ -26,6 +26,8 @@ func NewReverseProxy(schema string, baseDomain string, defaultSubdomain string,
 		subDomain := req.Header.Get(headerName)
 		if subDomain == "" {
 			subDomain = defaultSubdomain
+		} else {
+			subDomain = strings.ReplaceAll(strings.ReplaceAll(strings.ToLower(subDomain), "/", "-"), ".", "-")
 		}
 		req.URL.Scheme = schema
 		req.URL.Host = subDomain + "." + baseDomain + ":" + strconv.Itoa(port)
@@ -99,7 +101,7 @@ func (p *ReverseProxy) copyResponse(dst io.Writer, src io.Reader) {
 
 	_, err := io.Copy(dst, src)
 	if err != nil {
-		slog.Warn("copyResponse, %s", err)
+		slog.Warn("copyResponse, %v", err)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@ func NewReverseProxy(schema string, baseDomain string, defaultSubdomain string,`
`26`	`26`	`subDomain := req.Header.Get(headerName)`
`27`	`27`	`if subDomain == "" {`
`28`	`28`	`subDomain = defaultSubdomain`
	`29`	`+ } else {`
	`30`	`+ subDomain = strings.ReplaceAll(strings.ReplaceAll(strings.ToLower(subDomain), "/", "-"), ".", "-")`
`29`	`31`	`}`
`30`	`32`	`req.URL.Scheme = schema`
`31`	`33`	`req.URL.Host = subDomain + "." + baseDomain + ":" + strconv.Itoa(port)`
`@@ -99,7 +101,7 @@ func (p *ReverseProxy) copyResponse(dst io.Writer, src io.Reader) {`
`99`	`101`
`100`	`102`	`_, err := io.Copy(dst, src)`
`101`	`103`	`if err != nil {`
`102`		`- slog.Warn("copyResponse, %s", err)`
	`104`	`+ slog.Warn("copyResponse, %v", err)`
`103`	`105`	`}`
`104`	`106`	`}`
`105`	`107`