Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit088e8f0

Browse files
committed
chore: add support for blockEndpoints to configMaps
1 parent3844f8a commit088e8f0

File tree

2 files changed

+103
-4
lines changed

2 files changed

+103
-4
lines changed

‎tailnet/configmaps.go

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,11 @@ func (c *configMaps) netMapLocked() *netmap.NetworkMap {
204204
func (c*configMaps)peerConfigLocked() []*tailcfg.Node {
205205
out:=make([]*tailcfg.Node,0,len(c.peers))
206206
for_,p:=rangec.peers {
207-
out=append(out,p.node.Clone())
207+
n:=p.node.Clone()
208+
ifc.blockEndpoints {
209+
n.Endpoints=nil
210+
}
211+
out=append(out,n)
208212
}
209213
returnout
210214
}
@@ -222,6 +226,17 @@ func (c *configMaps) setAddresses(ips []netip.Prefix) {
222226
c.Broadcast()
223227
}
224228

229+
// nolint: revive
230+
func (c*configMaps)setBlockEndpoints(blockEndpointsbool) {
231+
c.L.Lock()
232+
deferc.L.Unlock()
233+
ifc.blockEndpoints!=blockEndpoints {
234+
c.netmapDirty=true
235+
}
236+
c.blockEndpoints=blockEndpoints
237+
c.Broadcast()
238+
}
239+
225240
func (c*configMaps)derpMapLocked()*tailcfg.DERPMap {
226241
m:=DERPMapFromProto(c.derpMap)
227242
returnm
@@ -325,9 +340,6 @@ func (c *configMaps) updatePeerLocked(update *proto.CoordinateResponse_PeerUpdat
325340
// to avoid random hangs while we set up the connection again after
326341
// inactivity.
327342
node.KeepAlive=ok&&peerStatus.Active
328-
ifc.blockEndpoints {
329-
node.Endpoints=nil
330-
}
331343
}
332344
switch {
333345
case!ok&&update.Kind==proto.CoordinateResponse_PeerUpdate_NODE:

‎tailnet/configmaps_internal_test.go

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,93 @@ func TestConfigMaps_updatePeers_lost_and_found(t *testing.T) {
475475
_=testutil.RequireRecvCtx(ctx,t,done)
476476
}
477477

478+
funcTestConfigMaps_setBlockEndpoints_different(t*testing.T) {
479+
t.Parallel()
480+
ctx:=testutil.Context(t,testutil.WaitShort)
481+
logger:=slogtest.Make(t,nil).Leveled(slog.LevelDebug)
482+
fEng:=newFakeEngineConfigurable()
483+
nodePrivateKey:=key.NewNode()
484+
nodeID:=tailcfg.NodeID(5)
485+
discoKey:=key.NewDisco()
486+
uut:=newConfigMaps(logger,fEng,nodeID,nodePrivateKey,discoKey.Public(),nil)
487+
deferuut.close()
488+
489+
p1ID:=uuid.MustParse("10000000-0000-0000-0000-000000000000")
490+
p1Node:=newTestNode(1)
491+
p1n,err:=NodeToProto(p1Node)
492+
require.NoError(t,err)
493+
p1tcn,err:=uut.protoNodeToTailcfg(p1n)
494+
p1tcn.KeepAlive=true
495+
require.NoError(t,err)
496+
497+
// Given: peer already exists
498+
uut.L.Lock()
499+
uut.peers[p1ID]=&peerLifecycle{
500+
peerID:p1ID,
501+
node:p1tcn,
502+
lastHandshake:time.Date(2024,1,7,12,0,10,0,time.UTC),
503+
}
504+
uut.L.Unlock()
505+
506+
uut.setBlockEndpoints(true)
507+
508+
nm:=testutil.RequireRecvCtx(ctx,t,fEng.setNetworkMap)
509+
r:=testutil.RequireRecvCtx(ctx,t,fEng.reconfig)
510+
require.Len(t,nm.Peers,1)
511+
require.Len(t,nm.Peers[0].Endpoints,0)
512+
require.Len(t,r.wg.Peers,1)
513+
514+
done:=make(chanstruct{})
515+
gofunc() {
516+
deferclose(done)
517+
uut.close()
518+
}()
519+
_=testutil.RequireRecvCtx(ctx,t,done)
520+
}
521+
522+
funcTestConfigMaps_setBlockEndpoints_same(t*testing.T) {
523+
t.Parallel()
524+
ctx:=testutil.Context(t,testutil.WaitShort)
525+
logger:=slogtest.Make(t,nil).Leveled(slog.LevelDebug)
526+
fEng:=newFakeEngineConfigurable()
527+
nodePrivateKey:=key.NewNode()
528+
nodeID:=tailcfg.NodeID(5)
529+
discoKey:=key.NewDisco()
530+
uut:=newConfigMaps(logger,fEng,nodeID,nodePrivateKey,discoKey.Public(),nil)
531+
deferuut.close()
532+
533+
p1ID:=uuid.MustParse("10000000-0000-0000-0000-000000000000")
534+
p1Node:=newTestNode(1)
535+
p1n,err:=NodeToProto(p1Node)
536+
require.NoError(t,err)
537+
p1tcn,err:=uut.protoNodeToTailcfg(p1n)
538+
p1tcn.KeepAlive=true
539+
require.NoError(t,err)
540+
541+
// Given: peer already exists && blockEndpoints set to true
542+
uut.L.Lock()
543+
uut.peers[p1ID]=&peerLifecycle{
544+
peerID:p1ID,
545+
node:p1tcn,
546+
lastHandshake:time.Date(2024,1,7,12,0,10,0,time.UTC),
547+
}
548+
uut.blockEndpoints=true
549+
uut.L.Unlock()
550+
551+
// Then: we don't configure
552+
requireNeverConfigures(ctx,t,uut)
553+
554+
// When we set blockEndpoints to true
555+
uut.setBlockEndpoints(true)
556+
557+
done:=make(chanstruct{})
558+
gofunc() {
559+
deferclose(done)
560+
uut.close()
561+
}()
562+
_=testutil.RequireRecvCtx(ctx,t,done)
563+
}
564+
478565
funcexpectStatusWithHandshake(
479566
ctx context.Context,t testing.TB,fEng*fakeEngineConfigurable,k key.NodePublic,lastHandshake time.Time,
480567
)<-chanstruct{} {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp