Handle left param for http tracker server announces

[btrtrc.git] / tracker / http / server / server.go

diff --git a/tracker/http/server/server.go b/tracker/http/server/server.go
index 88457826e1bbb819ab97a94243558ad6106cc788..9a21b8c1a9849e78f1c4cb937e414a02a2cb78c2 100644 (file)
--- a/tracker/http/server/server.go
+++ b/tracker/http/server/server.go
@@ -6,18 +6,23 @@ import (
        "net/http"
        "net/netip"
        "net/url"
+       "strconv"
 
        "github.com/anacrolix/dht/v2/krpc"
+       "github.com/anacrolix/generics"
        "github.com/anacrolix/log"
+       trackerServer "github.com/anacrolix/torrent/tracker/server"
 
        "github.com/anacrolix/torrent/bencode"
        "github.com/anacrolix/torrent/tracker"
        httpTracker "github.com/anacrolix/torrent/tracker/http"
-       udpTrackerServer "github.com/anacrolix/torrent/tracker/udp/server"
 )
 
 type Handler struct {
-       AnnounceTracker udpTrackerServer.AnnounceTracker
+       Announce *trackerServer.AnnounceHandler
+       // Called to derive an announcer's IP if non-nil. If not specified, the Request.RemoteAddr is
+       // used. Necessary for instances running behind reverse proxies for example.
+       RequestHost func(r *http.Request) (netip.Addr, error)
 }
 
 func unmarshalQueryKeyToArray(w http.ResponseWriter, key string, query url.Values) (ret [20]byte, ok bool) {
@@ -31,6 +36,20 @@ func unmarshalQueryKeyToArray(w http.ResponseWriter, key string, query url.Value
        return
 }
 
+// Returns false if there was an error and it was served.
+func (me Handler) requestHostAddr(r *http.Request) (_ netip.Addr, err error) {
+       if me.RequestHost != nil {
+               return me.RequestHost(r)
+       }
+       host, _, err := net.SplitHostPort(r.RemoteAddr)
+       if err != nil {
+               return
+       }
+       return netip.ParseAddr(host)
+}
+
+var requestHeadersLogger = log.Default.WithNames("request", "headers")
+
 func (me Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
        vs := r.URL.Query()
        var event tracker.AnnounceEvent
@@ -47,34 +66,44 @@ func (me Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
        if !ok {
                return
        }
-       host, _, err := net.SplitHostPort(r.RemoteAddr)
+       requestHeadersLogger.Levelf(log.Debug, "request RemoteAddr=%q, header=%q", r.RemoteAddr, r.Header)
+       addr, err := me.requestHostAddr(r)
        if err != nil {
-               log.Printf("error splitting remote port: %v", err)
-               http.Error(w, "error determining your IP", http.StatusInternalServerError)
+               log.Printf("error getting requester IP: %v", err)
+               http.Error(w, "error determining your IP", http.StatusBadGateway)
                return
        }
-       addrPort, err := netip.ParseAddrPort(net.JoinHostPort(host, vs.Get("port")))
-       err = me.AnnounceTracker.TrackAnnounce(r.Context(), tracker.AnnounceRequest{
-               InfoHash: infoHash,
-               PeerId:   peerId,
-               Event:    event,
-               Port:     addrPort.Port(),
-       }, addrPort)
+       portU64, _ := strconv.ParseUint(vs.Get("port"), 0, 16)
+       addrPort := netip.AddrPortFrom(addr, uint16(portU64))
+       left, err := strconv.ParseInt(vs.Get("left"), 0, 64)
        if err != nil {
-               log.Printf("error tracking announce: %v", err)
-               http.Error(w, "error tracking announce", http.StatusInternalServerError)
-               return
+               left = -1
        }
-       peers, err := me.AnnounceTracker.GetPeers(r.Context(), infoHash, tracker.GetPeersOpts{})
+       res := me.Announce.Serve(
+               r.Context(),
+               tracker.AnnounceRequest{
+                       InfoHash: infoHash,
+                       PeerId:   peerId,
+                       Event:    event,
+                       Port:     addrPort.Port(),
+                       NumWant:  -1,
+                       Left:     left,
+               },
+               addrPort,
+               trackerServer.GetPeersOpts{
+                       MaxCount: generics.Some[uint](200),
+               },
+       )
+       err = res.Err
        if err != nil {
-               log.Printf("error getting peers: %v", err)
-               http.Error(w, "error getting peers", http.StatusInternalServerError)
+               log.Printf("error serving announce: %v", err)
+               http.Error(w, "error handling announce", http.StatusInternalServerError)
                return
        }
        var resp httpTracker.HttpResponse
-       resp.Interval = 5 * 60
+       resp.Interval = res.Interval.UnwrapOr(5 * 60)
        resp.Peers.Compact = true
-       for _, peer := range peers {
+       for _, peer := range res.Peers {
                if peer.Addr().Is4() {
                        resp.Peers.List = append(resp.Peers.List, tracker.Peer{
                                IP:   peer.Addr().AsSlice(),