(untested) sanitize code

* remove peer argument from scrape swarm storage call

* replace Peer field with netip.Addr in ScrapeRequest

* add man for keydb storage

* update readme
This commit is contained in:
Lawrence, Rendall
2022-04-25 18:57:35 +03:00
parent 081d3752d8
commit b365abd296
16 changed files with 104 additions and 78 deletions

View File

@@ -33,6 +33,7 @@ func SanitizeAnnounce(r *AnnounceRequest, maxNumWant, defaultNumWant uint32) err
}
log.Debug("sanitized announce", r, log.Fields{
"ipPort": r.AddrPort,
"maxNumWant": maxNumWant,
"defaultNumWant": defaultNumWant,
})
@@ -46,12 +47,13 @@ func SanitizeScrape(r *ScrapeRequest, maxScrapeInfoHashes uint32) error {
r.InfoHashes = r.InfoHashes[:maxScrapeInfoHashes]
}
r.AddrPort = netip.AddrPortFrom(r.Addr(), r.Port())
if !r.Addr().IsValid() || r.Addr().IsUnspecified() {
r.Addr = r.Addr.Unmap()
if !r.Addr.IsValid() || r.Addr.IsUnspecified() {
return ErrInvalidIP
}
log.Debug("sanitized scrape", r, log.Fields{
"ip": r.Addr,
"maxScrapeInfoHashes": maxScrapeInfoHashes,
})
return nil