Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/beacon, lib/discover: Send IPv4 limited broadcast when address listing fails (fixes #1628) (#9087)

This commit is contained in:
bt90 2023-09-12 14:28:17 +02:00 committed by GitHub
parent 415f320005
commit ed66fba42b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/beacon/broadcast.go
View File

@ -46,8 +46,9 @@ func writeBroadcasts(ctx context.Context, inbox <-chan []byte, port int) error {
intfs, err := net.Interfaces() intfs, err := net.Interfaces()
if err != nil { if err != nil {
l.Debugln(err) l.Debugln("Failed to list interfaces:", err)
return err // net.Interfaces() is broken on Android. see https://github.com/golang/go/issues/40569
// Use the general broadcast address 255.255.255.255 instead.
} }
var dsts []net.IP var dsts []net.IP
@ -58,8 +59,9 @@ func writeBroadcasts(ctx context.Context, inbox <-chan []byte, port int) error {
addrs, err := intf.Addrs() addrs, err := intf.Addrs()
if err != nil { if err != nil {
l.Debugln(err) l.Debugln("Failed to list interface addresses:", err)
return err // Interface discovery might work while retrieving the addresses doesn't. So log the error and carry on.
continue
} }
for _, addr := range addrs { for _, addr := range addrs {

19
lib/discover/local.go
View File

@ -110,11 +110,8 @@ func (c *localClient) Error() error {
func (c *localClient) announcementPkt(instanceID int64, msg []byte) ([]byte, bool) { func (c *localClient) announcementPkt(instanceID int64, msg []byte) ([]byte, bool) {
addrs := c.addrList.AllAddresses() addrs := c.addrList.AllAddresses()
// The list of all addresses can include unspecified addresses intended // remove all addresses which are not dialable
// for a discovery server to complete, based on the packet source. We addrs = filterUndialableLocal(addrs)
// don't do that for local discovery, so filter out addresses that are
// usable as-is.
addrs = filterUnspecifiedLocal(addrs)
// do not leak relay tokens to discovery // do not leak relay tokens to discovery
addrs = sanitizeRelayAddresses(addrs) addrs = sanitizeRelayAddresses(addrs)
@ -266,7 +263,7 @@ func (c *localClient) registerDevice(src net.Addr, device Announce) bool {
continue continue
} }
u.Host = net.JoinHostPort(host, strconv.Itoa(tcpAddr.Port)) u.Host = net.JoinHostPort(host, strconv.Itoa(tcpAddr.Port))
l.Debugf("discover: Reconstructed URL is %#v", u) l.Debugf("discover: Reconstructed URL is %v", u)
validAddresses = append(validAddresses, u.String()) validAddresses = append(validAddresses, u.String())
l.Debugf("discover: Replaced address %v in %s to get %s", tcpAddr.IP, addr, u.String()) l.Debugf("discover: Replaced address %v in %s to get %s", tcpAddr.IP, addr, u.String())
} else { } else {
@ -292,9 +289,9 @@ func (c *localClient) registerDevice(src net.Addr, device Announce) bool {
return isNewDevice return isNewDevice
} }
// filterUnspecifiedLocal returns the list of addresses after removing any // filterUndialableLocal returns the list of addresses after removing any
// unspecified, localhost, multicast, broadcast or port-zero addresses. // localhost, multicast, broadcast or port-zero addresses.
func filterUnspecifiedLocal(addrs []string) []string { func filterUndialableLocal(addrs []string) []string {
filtered := addrs[:0] filtered := addrs[:0]
for _, addr := range addrs { for _, addr := range addrs {
u, err := url.Parse(addr) u, err := url.Parse(addr)
@ -310,9 +307,7 @@ func filterUnspecifiedLocal(addrs []string) []string {
switch { switch {
case len(tcpAddr.IP) == 0: case len(tcpAddr.IP) == 0:
case tcpAddr.Port == 0: case tcpAddr.Port == 0:
case tcpAddr.IP.IsUnspecified(): case tcpAddr.IP.IsGlobalUnicast(), tcpAddr.IP.IsLinkLocalUnicast(), tcpAddr.IP.IsUnspecified():
case !tcpAddr.IP.IsGlobalUnicast() && !tcpAddr.IP.IsLinkLocalUnicast():
default:
filtered = append(filtered, addr) filtered = append(filtered, addr)
} }
} }

12
lib/discover/local_test.go
View File

@ -91,14 +91,14 @@ func TestLocalInstanceIDShouldTriggerNew(t *testing.T) {
} }
} }
func TestFilterUnspecified(t *testing.T) { func TestFilterUndialable(t *testing.T) {
addrs := []string{ addrs := []string{
"quic://[2001:db8::1]:22000", // OK "quic://[2001:db8::1]:22000", // OK
"tcp://192.0.2.42:22000", // OK "tcp://192.0.2.42:22000", // OK
"quic://[2001:db8::1]:0", // remove, port zero "quic://[2001:db8::1]:0", // remove, port zero
"tcp://192.0.2.42:0", // remove, port zero "tcp://192.0.2.42:0", // remove, port zero
"quic://[::]:22000", // remove, unspecified "quic://[::]:22000", // OK
"tcp://0.0.0.0:22000", // remove, unspecified "tcp://0.0.0.0:22000", // OK
"tcp://[2001:db8::1]", // remove, no port "tcp://[2001:db8::1]", // remove, no port
"tcp://192.0.2.42", // remove, no port "tcp://192.0.2.42", // remove, no port
"tcp://foo:bar", // remove, host/port does not resolve "tcp://foo:bar", // remove, host/port does not resolve
@ -112,11 +112,13 @@ func TestFilterUnspecified(t *testing.T) {
exp := []string{ exp := []string{
"quic://[2001:db8::1]:22000", "quic://[2001:db8::1]:22000",
"tcp://192.0.2.42:22000", "tcp://192.0.2.42:22000",
"quic://[::]:22000",
"tcp://0.0.0.0:22000",
"tcp://[fe80::9ef:dff1:b332:5e56]:55681", "tcp://[fe80::9ef:dff1:b332:5e56]:55681",
} }
res := filterUnspecifiedLocal(addrs) res := filterUndialableLocal(addrs)
if fmt.Sprint(res) != fmt.Sprint(exp) { if fmt.Sprint(res) != fmt.Sprint(exp) {
t.Log(res) t.Log(res)
t.Error("filterUnspecified returned invalid addresses") t.Error("filterUndialableLocal returned invalid addresses")
} }
} }