wgengine/magicsock: remove pickPort, use port 0 to avoid TOCTOU race
pickPort would bind a UDP socket on :0 to get a free port, close the socket, then hope to rebind to the same port in NewConn. This is a TOCTOU race that can cause flaky test failures when another process grabs the port in between. Instead, pass Port: 0 to NewConn and let the OS assign the port atomically, then read back the assigned port via conn.LocalPort(). Fixes #19409 Change-Id: Ie44b599fb93c361e29a05f2171ad747c46f82b7a Co-authored-by: Brad Fitzpatrick <bradfitz@tailscale.com> Signed-off-by: Avery Pennarun <apenwarr@tailscale.com>
This commit is contained in:
committed by
Brad Fitzpatrick
parent
6301a6ce4b
commit
effbe67fe3
@@ -413,9 +413,11 @@ func TestNewConn(t *testing.T) {
|
|||||||
stunAddr, stunCleanupFn := stuntest.Serve(t)
|
stunAddr, stunCleanupFn := stuntest.Serve(t)
|
||||||
defer stunCleanupFn()
|
defer stunCleanupFn()
|
||||||
|
|
||||||
port := pickPort(t)
|
// Use port 0 to let the system assign a port, avoiding TOCTOU races
|
||||||
|
// from the previous pickPort approach which would close a socket and
|
||||||
|
// hope to rebind to the same port.
|
||||||
conn, err := NewConn(Options{
|
conn, err := NewConn(Options{
|
||||||
Port: port,
|
Port: 0,
|
||||||
DisablePortMapper: true,
|
DisablePortMapper: true,
|
||||||
EndpointsFunc: epFunc,
|
EndpointsFunc: epFunc,
|
||||||
Logf: t.Logf,
|
Logf: t.Logf,
|
||||||
@@ -427,6 +429,13 @@ func TestNewConn(t *testing.T) {
|
|||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
defer conn.Close()
|
defer conn.Close()
|
||||||
|
|
||||||
|
// Get the actual port that was assigned
|
||||||
|
port := conn.LocalPort()
|
||||||
|
if port == 0 {
|
||||||
|
t.Fatal("LocalPort returned 0")
|
||||||
|
}
|
||||||
|
|
||||||
conn.SetDERPMap(stuntest.DERPMapOf(stunAddr.String()))
|
conn.SetDERPMap(stuntest.DERPMapOf(stunAddr.String()))
|
||||||
conn.SetPrivateKey(key.NewNode())
|
conn.SetPrivateKey(key.NewNode())
|
||||||
|
|
||||||
@@ -462,16 +471,6 @@ collectEndpoints:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func pickPort(t testing.TB) uint16 {
|
|
||||||
t.Helper()
|
|
||||||
conn, err := net.ListenPacket("udp4", "127.0.0.1:0")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
defer conn.Close()
|
|
||||||
return uint16(conn.LocalAddr().(*net.UDPAddr).Port)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestPickDERPFallback(t *testing.T) {
|
func TestPickDERPFallback(t *testing.T) {
|
||||||
tstest.PanicOnLog()
|
tstest.PanicOnLog()
|
||||||
tstest.ResourceCheck(t)
|
tstest.ResourceCheck(t)
|
||||||
@@ -1470,7 +1469,6 @@ func Test32bitAlignment(t *testing.T) {
|
|||||||
// newTestConn returns a new Conn.
|
// newTestConn returns a new Conn.
|
||||||
func newTestConn(t testing.TB) *Conn {
|
func newTestConn(t testing.TB) *Conn {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
port := pickPort(t)
|
|
||||||
|
|
||||||
bus := eventbustest.NewBus(t)
|
bus := eventbustest.NewBus(t)
|
||||||
|
|
||||||
@@ -1487,7 +1485,7 @@ func newTestConn(t testing.TB) *Conn {
|
|||||||
Metrics: new(usermetric.Registry),
|
Metrics: new(usermetric.Registry),
|
||||||
DisablePortMapper: true,
|
DisablePortMapper: true,
|
||||||
Logf: t.Logf,
|
Logf: t.Logf,
|
||||||
Port: port,
|
Port: 0,
|
||||||
TestOnlyPacketListener: localhostListener{},
|
TestOnlyPacketListener: localhostListener{},
|
||||||
EndpointsFunc: func(eps []tailcfg.Endpoint) {
|
EndpointsFunc: func(eps []tailcfg.Endpoint) {
|
||||||
t.Logf("endpoints: %q", eps)
|
t.Logf("endpoints: %q", eps)
|
||||||
|
|||||||
Reference in New Issue
Block a user