Merge pull request #607 from Dimariqe/proxy-support

Add proxy support for BitTorrent traffic

Author: YouROK

docker-entrypoint.sh

@@ -1,12 +1,14 @@
 #!/bin/sh
 
 FLAGS="--path $TS_CONF_PATH --logpath $TS_LOG_PATH --port $TS_PORT --torrentsdir $TS_TORR_DIR"
+if [[ ! -z "$TS_IP" ]]; then FLAGS="${FLAGS} -i ${TS_IP}"; fi
 if [[ "$TS_HTTPAUTH" -eq 1 ]]; then FLAGS="${FLAGS} --httpauth"; fi
 if [[ "$TS_RDB" -eq 1 ]]; then FLAGS="${FLAGS} --rdb"; fi
 if [[ "$TS_DONTKILL" -eq 1 ]]; then FLAGS="${FLAGS} --dontkill"; fi
 if [[ "$TS_EN_SSL" -eq 1 ]]; then FLAGS="${FLAGS} --ssl"; fi
 if [[ -v "$TS_SSL_PORT" ]]; then FLAGS="${FLAGS} --sslport ${TS_SSL_PORT}"; fi
-
+if [[ ! -z "$TS_PROXY" ]]; then FLAGS="${FLAGS} --proxy ${TS_PROXY}"; fi
+if [[ ! -z "$TS_PROXYMODE" ]]; then FLAGS="${FLAGS} --proxymode ${TS_PROXYMODE}"; fi
 
 if [ ! -d $TS_CONF_PATH ]; then
   mkdir -p $TS_CONF_PATH

server/cmd/main.go

@@ -48,6 +48,8 @@ type args struct {
 	TGToken     string `arg:"-T" help:"telegram bot token"`
 	FusePath    string `arg:"-f" help:"fuse mount path"`
 	WebDAV      bool   `help:"web dav enable"`
+	Proxy       string `help:"proxy URL for BitTorrent traffic (http, socks4, socks5, socks5h), e.g. socks5://user:password@127.0.0.1:8080"`
+	ProxyMode   string `help:"proxy mode: tracker (only HTTP trackers, default), peers (only peer connections), or full (all traffic)"`
 }
 
 func (args) Version() string {
@@ -136,6 +138,19 @@ func main() {
 		}
 	}
 
+	if params.Proxy != "" {
+		settings.ProxyURL = params.Proxy
+		settings.ProxyMode = params.ProxyMode
+		if settings.ProxyMode == "" {
+			settings.ProxyMode = "tracker" // default
+		}
+		// Update BTsets if already loaded
+		if settings.BTsets != nil {
+			settings.BTsets.ProxyURL = params.Proxy
+			settings.BTsets.ProxyMode = settings.ProxyMode
+		}
+	}
+
 	settings.Args = &settings.ExecArgs{
 		Port:        params.Port,
 		IP:          params.IP,
@@ -159,6 +174,12 @@ func main() {
 		TGToken:     params.TGToken,
 		FusePath:    params.FusePath,
 		WebDAV:      params.WebDAV,
+		Proxy:       params.Proxy,
+		ProxyMode:   params.ProxyMode,
+	}
+
+	if params.Proxy != "" {
+		log.TLogln("Proxy configured from CLI:", params.Proxy, "mode:", settings.ProxyMode)
 	}
 
 	server.Start()

server/settings/args.go

@@ -23,6 +23,8 @@ type ExecArgs struct {
 	TGToken     string
 	FusePath    string
 	WebDAV      bool
+	Proxy       string
+	ProxyMode   string
 }
 
 var Args *ExecArgs

server/settings/btsets.go

@@ -72,6 +72,10 @@ type BTSets struct {
 	// Storage preferences
 	StoreSettingsInJson bool
 	StoreViewedInJson   bool
+
+	// Proxy
+	ProxyURL  string // Proxy URL for BitTorrent traffic (http, socks4, socks5, socks5h)
+	ProxyMode string // tracker (HTTP trackers only, default), peers (peer connections only), or full (all traffic)
 }
 
 func (v *BTSets) String() string {
@@ -110,6 +114,14 @@ func SetBTSets(sets *BTSets) {
 		sets.PreloadCache = 100
 	}
 
+	if sets.ProxyURL != "" && sets.ProxyMode == "" {
+		sets.ProxyMode = "tracker" // default
+	}
+	if sets.ProxyMode != "" && sets.ProxyMode != "tracker" && sets.ProxyMode != "peers" && sets.ProxyMode != "full" {
+		log.TLogln("Invalid proxy mode, using default 'tracker'")
+		sets.ProxyMode = "tracker"
+	}
+
 	if sets.TorrentsSavePath == "" {
 		sets.UseDisk = false
 	} else if sets.UseDisk {

server/settings/settings.go

@@ -22,19 +22,21 @@ func IsDebug() bool {
 }
 
 var (
-	tdb      TorrServerDB
-	Path     string
-	IP       string
-	Port     string
-	Ssl      bool
-	SslPort  string
-	ReadOnly bool
-	HttpAuth bool
-	SearchWA bool
-	PubIPv4  string
-	PubIPv6  string
-	TorAddr  string
-	MaxSize  int64
+	tdb       TorrServerDB
+	Path      string
+	IP        string
+	Port      string
+	Ssl       bool
+	SslPort   string
+	ReadOnly  bool
+	HttpAuth  bool
+	SearchWA  bool
+	PubIPv4   string
+	PubIPv6   string
+	TorAddr   string
+	MaxSize   int64
+	ProxyURL  string
+	ProxyMode string
 )
 
 func InitSets(readOnly, searchWA bool) {

server/torr/btserver.go

@@ -6,6 +6,8 @@ import (
 	"log"
 	"maps"
 	"net"
+	"net/http"
+	"net/url"
 	"sync"
 
 	"github.com/anacrolix/publicip"
@@ -136,6 +138,17 @@ func (bt *BTServer) configure(ctx context.Context) {
 		}
 	}
 
+	// Configure proxy if enabled
+	if err := bt.configureProxy(); err != nil {
+		log.Println("Proxy configuration error:", err)
+	}
+
+	// Update BTsets with current proxy settings for display in Client config
+	if settings.ProxyURL != "" && settings.BTsets != nil {
+		settings.BTsets.ProxyURL = settings.ProxyURL
+		settings.BTsets.ProxyMode = settings.ProxyMode
+	}
+
 	log.Println("Client config:", settings.BTsets)
 
 	var err error
@@ -179,6 +192,73 @@ func (bt *BTServer) configure(ctx context.Context) {
 	}
 }
 
+func (bt *BTServer) configureProxy() error {
+	proxyURL := settings.ProxyURL
+	if proxyURL == "" && settings.BTsets != nil && settings.BTsets.ProxyURL != "" {
+		proxyURL = settings.BTsets.ProxyURL
+	}
+
+	if proxyURL == "" {
+		return nil // No proxy configured
+	}
+
+	proxyMode := settings.ProxyMode
+	if proxyMode == "" && settings.BTsets != nil && settings.BTsets.ProxyMode != "" {
+		proxyMode = settings.BTsets.ProxyMode
+	}
+	if proxyMode == "" {
+		proxyMode = "tracker" // default
+	}
+
+	// Parse and validate proxy URL
+	parsedURL, err := url.Parse(proxyURL)
+	if err != nil {
+		return fmt.Errorf("invalid proxy URL: %w", err)
+	}
+
+	scheme := parsedURL.Scheme
+	// Validate proxy protocol
+	switch scheme {
+	case "socks5", "socks5h", "socks4", "socks4a", "http", "https":
+		// Supported protocols
+	default:
+		return fmt.Errorf("unsupported proxy protocol: %s (supported: http, https, socks4, socks4a, socks5, socks5h)", scheme)
+	}
+
+	if proxyMode == "full" {
+		log.Printf("Configuring proxy for all BitTorrent traffic: %s://%s", scheme, parsedURL.Host)
+
+		// Set ProxyURL - this will be used by anacrolix/torrent for all BitTorrent traffic
+		bt.config.ProxyURL = proxyURL
+
+		// Also set HTTPProxy explicitly for HTTP tracker requests
+		bt.config.HTTPProxy = func(req *http.Request) (*url.URL, error) {
+			return parsedURL, nil
+		}
+
+		log.Println("Proxy configured successfully for all BitTorrent connections (tracker, DHT, peers)")
+	} else if proxyMode == "peers" {
+		log.Printf("Configuring proxy for peer connections only: %s://%s", scheme, parsedURL.Host)
+
+		// Set ProxyURL for peer connections, but don't set HTTPProxy
+		// This routes DHT and peer connections through proxy, but not HTTP tracker requests
+		bt.config.ProxyURL = proxyURL
+
+		log.Println("Proxy configured successfully for peer and DHT connections only")
+	} else {
+		log.Printf("Configuring proxy for HTTP tracker requests only: %s://%s", scheme, parsedURL.Host)
+
+		// Only set HTTPProxy for tracker requests, don't set ProxyURL
+		bt.config.HTTPProxy = func(req *http.Request) (*url.URL, error) {
+			return parsedURL, nil
+		}
+
+		log.Println("Proxy configured successfully for HTTP tracker connections only")
+	}
+
+	return nil
+}
+
 func (bt *BTServer) GetTorrent(hash torrent.InfoHash) *Torrent {
 	if torr, ok := bt.torrents[hash]; ok {
 		return torr