Respect standard proxy header for hostname when generating M3U playlist (#611)

* server: get host for M3U similarly to scheme

Rely on Gin's location middleware for retrieval of host/port combination,
so that HTTP headers (such as ones passed from a reverse proxy) are also
taken into account.

Only `/stream` API seems to be relevant for #610 (see web's Hosts.js)
but fix `/playlist*` APIs as well while we're at it.

It seems that Media Station X stuff (`msx.go`) may benefit from this too
but keep it intact for now as it's offtopic.

* server: fix hostname in M3U

Respect standard proxy host header (`X-Forwarded-Host`) when building
playlist content.
See gin-contrib/location#15

Closes #610

Author: dtruebin

server/go.mod

@@ -17,7 +17,7 @@ require (
 	github.com/anacrolix/torrent v1.59.1
 	github.com/dustin/go-humanize v1.0.1
 	github.com/gin-contrib/cors v1.7.6
-	github.com/gin-contrib/location v1.0.3
+	github.com/gin-contrib/location/v2 v2.0.0
 	github.com/gin-gonic/gin v1.11.0
 	github.com/hanwen/go-fuse/v2 v2.9.0
 	github.com/kljensen/snowball v0.10.0
@@ -99,7 +99,6 @@ require (
 	github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.3.1 // indirect
-	go.uber.org/mock v0.6.0 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/arch v0.23.0 // indirect
 	golang.org/x/crypto v0.45.0 // indirect

server/go.sum

@@ -230,8 +230,8 @@ github.com/gin-contrib/cors v1.7.6 h1:3gQ8GMzs1Ylpf70y8bMw4fVpycXIeX1ZemuSQIsnQQ
 github.com/gin-contrib/cors v1.7.6/go.mod h1:Ulcl+xN4jel9t1Ry8vqph23a60FwH9xVLd+3ykmTjOk=
 github.com/gin-contrib/gzip v0.0.6 h1:NjcunTcGAj5CO1gn4N8jHOSIeRFHIbn51z6K+xaN4d4=
 github.com/gin-contrib/gzip v0.0.6/go.mod h1:QOJlmV2xmayAjkNS2Y8NQsMneuRShOU/kjovCXNuzzk=
-github.com/gin-contrib/location v1.0.3 h1:iy5FY2JsunZ73Lnq8YZsx7wkGFY1xcyRdKiRh/8Uptg=
-github.com/gin-contrib/location v1.0.3/go.mod h1:fMoqRQxX0d5ycvxzP7e5VtqfID00RPb4jMGDh3oT0pk=
+github.com/gin-contrib/location/v2 v2.0.0 h1:iLx5RatHQHSxgC0tm2AG0sIuQKecI7FhREessVd6RWY=
+github.com/gin-contrib/location/v2 v2.0.0/go.mod h1:276TDNr25NENBA/NQZUuEIlwxy/I5CYVFIr/d2TgOdU=
 github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w=
 github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM=
 github.com/gin-gonic/gin v1.11.0 h1:OW/6PLjyusp2PPXtyxKHU0RbX6I/l28FTdDlae5ueWk=

server/utils/location.go

@@ -1,7 +1,7 @@
 package utils
 
 import (
-	"github.com/gin-contrib/location"
+	"github.com/gin-contrib/location/v2"
 	"github.com/gin-gonic/gin"
 )
 
@@ -12,3 +12,11 @@ func GetScheme(c *gin.Context) string {
 	}
 	return url.Scheme
 }
+
+func GetHost(c *gin.Context) string {
+	url := location.Get(c)
+	if url == nil {
+		return c.Request.Host
+	}
+	return url.Host
+}

server/web/api/m3u.go

@@ -35,7 +35,7 @@ import (
 func allPlayList(c *gin.Context) {
 	torrs := torr.ListTorrent()
 
-	host := utils.GetScheme(c) + "://" + c.Request.Host
+	host := utils.GetScheme(c) + "://" + utils.GetHost(c)
 	list := "#EXTM3U\n"
 	hash := ""
 	// fn=file.m3u fix forkplayer bug with end .m3u in link
@@ -87,7 +87,7 @@ func playList(c *gin.Context) {
 		}
 	}
 
-	host := utils.GetScheme(c) + "://" + c.Request.Host
+	host := utils.GetScheme(c) + "://" + utils.GetHost(c)
 	list := getM3uList(tor.Status(), host, fromlast)
 	list = "#EXTM3U\n" + list
 	name := strings.ReplaceAll(c.Param("fname"), `/`, "") // strip starting / from param

server/web/api/stream.go

@@ -179,7 +179,7 @@ func stream(c *gin.Context) {
 		} else if !strings.HasSuffix(strings.ToLower(name), ".m3u") && !strings.HasSuffix(strings.ToLower(name), ".m3u8") {
 			name += ".m3u"
 		}
-		m3ulist := "#EXTM3U\n" + getM3uList(tor.Status(), utils2.GetScheme(c)+"://"+c.Request.Host, fromlast)
+		m3ulist := "#EXTM3U\n" + getM3uList(tor.Status(), utils2.GetScheme(c)+"://"+utils2.GetHost(c), fromlast)
 		sendM3U(c, name, tor.Hash().HexString(), m3ulist)
 		return
 	} else
@@ -299,7 +299,7 @@ func streamNoAuth(c *gin.Context) {
 		} else if !strings.HasSuffix(strings.ToLower(name), ".m3u") && !strings.HasSuffix(strings.ToLower(name), ".m3u8") {
 			name += ".m3u"
 		}
-		m3ulist := "#EXTM3U\n" + getM3uList(tor.Status(), utils2.GetScheme(c)+"://"+c.Request.Host, fromlast)
+		m3ulist := "#EXTM3U\n" + getM3uList(tor.Status(), utils2.GetScheme(c)+"://"+utils2.GetHost(c), fromlast)
 		sendM3U(c, name, tor.Hash().HexString(), m3ulist)
 		return
 	} else

server/web/server.go

@@ -11,7 +11,7 @@ import (
 	"server/rutor"
 
 	"github.com/gin-contrib/cors"
-	"github.com/gin-contrib/location"
+	"github.com/gin-contrib/location/v2"
 	"github.com/gin-gonic/gin"
 	"github.com/wlynxg/anet"