forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swarm/network: Sanitize underlay address only when localhost

Browse source
This commit is contained in:
lash 2019-03-01 12:38:26 +01:00
parent 313576530f
commit 78c471d097
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
swarm/network/protocol.go
View file

@ -17,6 +17,7 @@
package network package network
import ( import (
"bytes"
"context" "context"
"errors" "errors"
"fmt" "fmt"
@ -222,15 +223,16 @@ func (b *Bzz) performHandshake(p *protocols.Peer, handshake *HandshakeMsg) error
return nil return nil
} }
// the remote enode string may advertise arbitrary host information (e.g. localhost) // if started without the natip argument, the enode string will be localhost
// this method ensures that the addr of the peer will be the one // this method ensures that if this default is used in a networked environment, we replace
// applicable on the interface the connection came in on // the ip with the one applicable on the interface the connection came in on
// it modifies the passed bzzaddr in place, and returns the same pointer // it modifies the passed bzzaddr in place, and returns the same pointer
func sanitizeEnodeRemote(paddr net.Addr, baddr *BzzAddr) { func sanitizeEnodeRemote(paddr net.Addr, baddr *BzzAddr) {
hsSubmatch := regexpEnodeIP.FindSubmatch(baddr.UAddr) hsSubmatch := regexpEnodeIP.FindSubmatch(baddr.UAddr)
ip, _, err := net.SplitHostPort(paddr.String()) ip, _, err := net.SplitHostPort(paddr.String())
// since we expect nothing else than ipv4 here, a panic on missing submatch is desired if len(hsSubmatch) < 2 {
if err == nil && string(hsSubmatch[1]) != ip { log.Warn("sanitize found non ipv4 string", "str", paddr.String())
} else if err == nil && bytes.Equal(hsSubmatch[1], []byte("127.0.0.1")) {
remoteStr := fmt.Sprintf("@%s:%s", ip, string(hsSubmatch[2])) remoteStr := fmt.Sprintf("@%s:%s", ip, string(hsSubmatch[2]))
log.Debug("rewrote peer uaddr host/port", "addr", baddr) log.Debug("rewrote peer uaddr host/port", "addr", baddr)
baddr.UAddr = regexpEnodeIP.ReplaceAll(baddr.UAddr, []byte(remoteStr)) baddr.UAddr = regexpEnodeIP.ReplaceAll(baddr.UAddr, []byte(remoteStr))

10
swarm/network/protocol_test.go
View file

@ -276,4 +276,14 @@ func TestSanitizeEnodeRemote(t *testing.T) {
if !bytes.Equal(baddr.UAddr, []byte(nodRemote.String())) { if !bytes.Equal(baddr.UAddr, []byte(nodRemote.String())) {
t.Fatalf("insane address. expected %v, got %v", nodRemote.String(), string(baddr.UAddr)) t.Fatalf("insane address. expected %v, got %v", nodRemote.String(), string(baddr.UAddr))
} }
remoteIP = net.IPv4(0x04, 0x04, 0x04, 0x04)
remoteAddr = net.TCPAddr{
IP: remoteIP,
Port: 30399,
}
sanitizeEnodeRemote(&remoteAddr, baddr)
if !bytes.Equal(baddr.UAddr, []byte(nodRemote.String())) {
t.Fatalf("Should not have rewritten non-localhost string. expected %v, got %v", nodRemote.String(), string(baddr.UAddr))
}
} }