sovonegr/TorrServerJellyfin
1
0
Fork 0
mirror of https://github.com/Ernous/TorrServerJellyfin.git synced 2025-12-19 13:36:09 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix link-local ipv6 for PublicIp6

Browse Source 
maybe move ip functions o utils?

https://stackoverflow.com/a/50825191
This commit is contained in:
nikk gitanes
2022-01-20 05:11:31 +03:00
parent 12e0222665
commit f5a577a474
2 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/settings/settings.go
View File

@@ -13,8 +13,8 @@ var (
Port string Port string
ReadOnly bool ReadOnly bool
HttpAuth bool HttpAuth bool
PubIPv4 string PubIPv4 string
PubIPv6 string PubIPv6 string
) )
func InitSets(readOnly bool) { func InitSets(readOnly bool) {

55
server/torr/btserver.go
View File

@@ -1,6 +1,7 @@
package torr package torr
import ( import (
"fmt"
"log" "log"
"net" "net"
"strconv" "strconv"
@@ -26,6 +27,27 @@ type BTServer struct {
mu sync.Mutex mu sync.Mutex
} }
var privateIPBlocks []*net.IPNet
func init() {
for _, cidr := range []string{
"127.0.0.0/8", // IPv4 loopback
"10.0.0.0/8", // RFC1918
"172.16.0.0/12", // RFC1918
"192.168.0.0/16", // RFC1918
"169.254.0.0/16", // RFC3927 link-local
"::1/128", // IPv6 loopback
"fe80::/10", // IPv6 link-local
"fc00::/7", // IPv6 unique local addr
} {
_, block, err := net.ParseCIDR(cidr)
if err != nil {
panic(fmt.Errorf("parse error on %q: %v", cidr, err))
}
privateIPBlocks = append(privateIPBlocks, block)
}
}
func NewBTS() *BTServer { func NewBTS() *BTServer {
bts := new(BTServer) bts := new(BTServer)
bts.torrents = make(map[metainfo.Hash]*Torrent) bts.torrents = make(map[metainfo.Hash]*Torrent)
@@ -120,13 +142,12 @@ func (bt *BTServer) configure() {
// set public IPv4 // set public IPv4
if settings.PubIPv4 != "" { if settings.PubIPv4 != "" {
ip4 := net.ParseIP(settings.PubIPv4) if ip4 := net.ParseIP(settings.PubIPv4); ip4.To4 != nil {
if ip4.To4 != nil {
bt.config.PublicIp4 = ip4 bt.config.PublicIp4 = ip4
} }
} }
if bt.config.PublicIp4 == nil { if bt.config.PublicIp4 == nil {
bt.config.PublicIp4 = getPublicIp4() bt.config.PublicIp4 = getPublicIp4()
} }
if bt.config.PublicIp4 != nil { if bt.config.PublicIp4 != nil {
log.Println("PublicIp4:", bt.config.PublicIp4) log.Println("PublicIp4:", bt.config.PublicIp4)
@@ -134,13 +155,12 @@ func (bt *BTServer) configure() {
// set public IPv6 // set public IPv6
if settings.PubIPv6 != "" { if settings.PubIPv6 != "" {
ip6 := net.ParseIP(settings.PubIPv6) if ip6 := net.ParseIP(settings.PubIPv6); ip6.To16 != nil && ip6.To4 == nil {
if ip6.To4 == nil && ip6.To16 != nil {
bt.config.PublicIp6 = ip6 bt.config.PublicIp6 = ip6
} }
} }
if bt.config.PublicIp6 == nil { if bt.config.PublicIp6 == nil {
bt.config.PublicIp6 = getPublicIp6() bt.config.PublicIp6 = getPublicIp6()
} }
if bt.config.PublicIp6 != nil { if bt.config.PublicIp6 != nil {
log.Println("PublicIp6:", bt.config.PublicIp6) log.Println("PublicIp6:", bt.config.PublicIp6)
@@ -168,6 +188,25 @@ func (bt *BTServer) RemoveTorrent(hash torrent.InfoHash) {
} }
} }
func isPrivateIP(ip net.IP) bool {
// log.Println(ip, "IsLoopback:", ip.IsLoopback())
// log.Println(ip, "IsPrivate:", ip.IsPrivate())
// log.Println(ip, "IsLinkLocalUnicast:", ip.IsLinkLocalUnicast())
// log.Println(ip, "IsLinkLocalMulticast:", ip.IsLinkLocalMulticast())
// log.Println(ip, "IsGlobalUnicast:", ip.IsGlobalUnicast())
if ip.IsLoopback() || ip.IsPrivate() || ip.IsLinkLocalUnicast() || ip.IsLinkLocalMulticast() {
return true
}
for _, block := range privateIPBlocks {
if block.Contains(ip) {
return true
}
}
return false
}
func getPublicIp4() net.IP { func getPublicIp4() net.IP {
ifaces, err := net.Interfaces() ifaces, err := net.Interfaces()
if err != nil { if err != nil {
@@ -185,7 +224,7 @@ func getPublicIp4() net.IP {
case *net.IPAddr: case *net.IPAddr:
ip = v.IP ip = v.IP
} }
if !ip.IsLoopback() && !ip.IsPrivate() && ip.To4 != nil && ip.To16 == nil { if !isPrivateIP(ip) && ip.To4() != nil {
return ip return ip
} }
} }
@@ -211,7 +250,7 @@ func getPublicIp6() net.IP {
case *net.IPAddr: case *net.IPAddr:
ip = v.IP ip = v.IP
} }
if !ip.IsLoopback() && !ip.IsPrivate() && ip.To4 == nil && ip.To16 != nil { if !isPrivateIP(ip) && ip.To16() != nil && ip.To4() == nil {
return ip return ip
} }
} }