Skip to content

fix: never send local endpoints if disabled #12138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 20, 2024
Merged

fix: never send local endpoints if disabled #12138

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73ac7b9
fix: never send local endpoints if disabled
deansheather Feb 14, 2024
2c2ca6b
Add 10s delay test to ensure endpoints don't appear
deansheather Feb 14, 2024
e49020e
Merge branch 'main' into dean/block-endpoints
deansheather Feb 20, 2024
97f5acc
Comments
deansheather Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Comments
  • Loading branch information
@deansheather
deansheather committed Feb 20, 2024
commit 97f5accd3c3059dec36068641b6a56026c679381
30 changes: 6 additions & 24 deletions tailnet/conn_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,25 +448,15 @@ func TestConn_BlockEndpoints(t *testing.T) {
}()

// Connect them together and wait for them to be reachable.
nodes1 := stitch(t, conn2, conn1)
nodes2 := stitch(t, conn1, conn2)
stitch(t, conn2, conn1)
stitch(t, conn1, conn2)
awaitReachableCtx, awaitReachableCancel := context.WithTimeout(context.Background(), testutil.WaitShort)
defer awaitReachableCancel()
require.True(t, conn1.AwaitReachable(awaitReachableCtx, ip2))

// Watch for 10 seconds to ensure that neither peer has any endpoints.
// There's no good way to force endpoint updates, so we just wait.
parentLoop:
for {
select {
case node := <-nodes1:
require.Empty(t, node.Endpoints, "conn1 got endpoints")
case node := <-nodes2:
require.Empty(t, node.Endpoints, "conn2 got endpoints")
case <-time.After(testutil.WaitShort):
break parentLoop
}
}
// Wait 10s for endpoints to potentially be sent over Disco. There's no way
// to force Disco to send endpoints immediately.
time.Sleep(10 * time.Second)

// Double check that both peers don't have endpoints for the other peer
// according to magicsock.
Expand All @@ -482,9 +472,7 @@ parentLoop:

// stitch sends node updates from src Conn as peer updates to dst Conn. Sort of
// like the Coordinator would, but without actually needing a Coordinator.
func stitch(t *testing.T, dst, src *tailnet.Conn) <-chan *tailnet.Node {
// Buffered to avoid blocking the callback.
out := make(chan *tailnet.Node, 50)
func stitch(t *testing.T, dst, src *tailnet.Conn) {
srcID := uuid.New()
src.SetNodeCallback(func(node *tailnet.Node) {
pn, err := tailnet.NodeToProto(node)
Expand All @@ -497,11 +485,5 @@ func stitch(t *testing.T, dst, src *tailnet.Conn) <-chan *tailnet.Node {
Kind: proto.CoordinateResponse_PeerUpdate_NODE,
}})
assert.NoError(t, err)

select {
case out <- node:
default:
}
})
return out
}