cherry-pick: add local domain pattern as a host alias (#2030)

Author: eball

daemon/go.mod

@@ -26,7 +26,7 @@ require (
 	github.com/containerd/containerd v1.7.28
 	github.com/distribution/distribution/v3 v3.0.0
 	github.com/dustin/go-humanize v1.0.1
-	github.com/eball/zeroconf v0.2.1
+	github.com/eball/zeroconf v0.2.2
 	github.com/godbus/dbus/v5 v5.1.0
 	github.com/gofiber/fiber/v2 v2.52.9
 	github.com/hirochachacha/go-smb2 v1.1.0

daemon/go.sum

@@ -85,8 +85,8 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/eball/echo/v4 v4.13.4-patch h1:5w83KQrEqrxhc1BO0BpRBHssC37vFrWualUM27Rt2sg=
 github.com/eball/echo/v4 v4.13.4-patch/go.mod h1:ORgy8LWTq8knpwgaz538rAJMri7WgpoAD6H3zYccn84=
-github.com/eball/zeroconf v0.2.1 h1:PZ89f6J2k2Z7q3oSzcZGFXJf97S7NPmj7H04ACw9v8c=
-github.com/eball/zeroconf v0.2.1/go.mod h1:eIbIjGYo9sSMaKWLcveHEPRWdyblz7q9ih2R1HnNw5M=
+github.com/eball/zeroconf v0.2.2 h1:y23X67tLFlU+b35LyM9THXGsdC88IUz803G+mzfeSeE=
+github.com/eball/zeroconf v0.2.2/go.mod h1:eIbIjGYo9sSMaKWLcveHEPRWdyblz7q9ih2R1HnNw5M=
 github.com/ebitengine/purego v0.8.4 h1:CF7LEKg5FFOsASUj0+QwaXf8Ht6TlFxg09+S9wz0omw=
 github.com/ebitengine/purego v0.8.4/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
 github.com/emicklei/go-restful/v3 v3.13.0 h1:C4Bl2xDndpU6nJ4bc1jXd+uTmYPVUwkD6bFY/oTyCes=

daemon/internel/intranet/dns.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"net"
 	"slices"
+	"strings"
 
 	"github.com/beclab/Olares/daemon/pkg/nets"
 	"github.com/eball/zeroconf"
@@ -17,6 +18,7 @@ type DNSConfig struct {
 type instanceServer struct {
 	queryServer *zeroconf.Server
 	host        *DNSConfig
+	aliases     []string
 }
 
 type mDNSServer struct {
@@ -66,6 +68,14 @@ func (s *mDNSServer) StartAll() error {
 			return err
 		}
 
+		// add host alias
+		domainTokens := strings.Split(domain, ".")
+		alias := []string{strings.Join(domainTokens, "-") + ".local."}
+
+		// TODO: add more alias if needed
+		klog.Info("add host alias, ", alias[0])
+		server.AddHostAlias(alias[0])
+
 		s.servers[domain] = &instanceServer{
 			queryServer: server,
 			host:        &DNSConfig{Domain: domain},

daemon/internel/intranet/proxy.go

@@ -57,7 +57,8 @@ func (p *proxyServer) Start() error {
 	p.proxy.Use(
 		func(next echo.HandlerFunc) echo.HandlerFunc {
 			return func(c echo.Context) error {
-				if strings.HasSuffix(c.Request().Host, ".olares.local") {
+				if strings.HasSuffix(c.Request().Host, ".olares.local") ||
+					strings.HasSuffix(c.Request().Host, "-olares.local") {
 					if c.IsWebSocket() {
 						ctx := c.Request().Context()
 						ctx = context.WithValue(ctx, WSKey, true)
@@ -103,7 +104,25 @@ func (p *proxyServer) Next(c echo.Context) *middleware.ProxyTarget {
 	if c.IsWebSocket() {
 		scheme = "wss://"
 	}
-	proxyPass, err := url.Parse(scheme + c.Request().Host + ":443")
+
+	var (
+		proxyPass *url.URL
+		err       error
+	)
+	requestHost := c.Request().Host
+	if strings.HasSuffix(requestHost, "-olares.local") {
+		// intranet request, and host parttern is appid-<username>-olares.local for windows and linux client
+		tokens := strings.Split(requestHost, "-")
+		if len(tokens) < 3 {
+			klog.Error("invalid intranet request host, ", requestHost)
+			return nil
+		}
+		requestHost = strings.Join(tokens, ".")
+		c.Request().Host = requestHost
+		proxyPass, err = url.Parse(scheme + requestHost + ":443")
+	} else {
+		proxyPass, err = url.Parse(scheme + c.Request().Host + ":443")
+	}
 	if err != nil {
 		klog.Error("parse proxy target error, ", err)
 		return nil