Mirror/mochi
1
0
Fork 0
mirror of https://github.com/sot-tech/mochi.git synced 2026-07-11 02:58:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

(tested) fix invalid parsing of multivalued and comma-separated addresses from HTTP header

Browse Source
This commit is contained in:
Lawrence, Rendall
2022-05-02 23:12:13 +03:00
parent 607f9da00a
commit cf2adad4c9
3 changed files with 59 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/http/parser.go
+9 -2
View File
@@ -4,6 +4,7 @@ import (
"errors"
"net/http"
"net/netip"
"strings"
"github.com/sot-tech/mochi/bittorrent"
"github.com/sot-tech/mochi/frontend"
@@ -149,8 +150,14 @@ func requestedIPs(r *http.Request, p bittorrent.Params, opts ParseOptions) (addr
}
}
if ipStr := r.Header.Get(opts.RealIPHeader); ipStr != "" && opts.RealIPHeader != "" {
addresses.Add(parseRequestAddress(ipStr, false))
if ipValues := r.Header.Values(opts.RealIPHeader); len(ipValues) > 0 && opts.RealIPHeader != "" {
for _, ipStr := range ipValues {
for _, ipStr := range strings.Split(ipStr, ",") {
if ipStr = strings.TrimSpace(ipStr); len(ipStr) > 0 {
addresses.Add(parseRequestAddress(ipStr, false))
}
}
}
} else {
addrPort, _ := netip.ParseAddrPort(r.RemoteAddr)
addresses.Add(bittorrent.RequestAddress{