MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

downloader: properly detect and handle integer IPs

Browse Source
This commit is contained in:
Matthew Penner 2021-02-12 16:35:51 -07:00
parent 5c56ddf5d6
commit 00195b4a5b
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
router/downloader/downloader.go
View File

@ -13,6 +13,7 @@ import (
"net/url" "net/url"
"path/filepath" "path/filepath"
"regexp" "regexp"
"strconv"
"strings" "strings"
"sync" "sync"
"time" "time"
@ -89,7 +90,7 @@ type Download struct {
cancelFunc *context.CancelFunc cancelFunc *context.CancelFunc
} }
// Starts a new tracked download which allows for cancelation later on by calling // Starts a new tracked download which allows for cancellation later on by calling
// the Downloader.Cancel function. // the Downloader.Cancel function.
func New(s *server.Server, r DownloadRequest) *Download { func New(s *server.Server, r DownloadRequest) *Download {
dl := Download{ dl := Download{
@ -228,6 +229,13 @@ func (dl *Download) isExternalNetwork(ctx context.Context) error {
} }
host := dl.req.URL.Host host := dl.req.URL.Host
// This cluster-fuck of math and integer shit converts an integer IP into a proper IPv4.
// For example: 16843009 would become 1.1.1.1
if i, err := strconv.ParseInt(host, 10, 64); err == nil {
host = strconv.FormatInt((i>>24)&0xFF, 10) + "." + strconv.FormatInt((i>>16)&0xFF, 10) + "." + strconv.FormatInt((i>>8)&0xFF, 10) + "." + strconv.FormatInt(i&0xFF, 10)
}
if !ipMatchRegex.MatchString(host) { if !ipMatchRegex.MatchString(host) {
if dl.req.URL.Scheme == "https" { if dl.req.URL.Scheme == "https" {
host = host + ":443" host = host + ":443"
@ -240,7 +248,7 @@ func (dl *Download) isExternalNetwork(ctx context.Context) error {
if err != nil { if err != nil {
return errors.WithStack(err) return errors.WithStack(err)
} }
c.Close() _ = c.Close()
ip := net.ParseIP(ipMatchRegex.ReplaceAllString(c.RemoteAddr().String(), "")) ip := net.ParseIP(ipMatchRegex.ReplaceAllString(c.RemoteAddr().String(), ""))
if ip == nil { if ip == nil {