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

Commitcbf1981

Browse files
committed
chore: add Coder service prefix to tailnet
1 parent2f043d7 commitcbf1981

File tree

17 files changed

+110
-76
lines changed

17 files changed

+110
-76
lines changed

‎agent/agent.go‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ type Options struct {
8282
SSHMaxTimeout time.Duration
8383
TailnetListenPortuint16
8484
Subsystems []codersdk.AgentSubsystem
85-
Addresses []netip.Prefix
8685
PrometheusRegistry*prometheus.Registry
8786
ReportMetadataInterval time.Duration
8887
ServiceBannerRefreshInterval time.Duration
@@ -180,7 +179,6 @@ func New(options Options) Agent {
180179
announcementBannersRefreshInterval:options.ServiceBannerRefreshInterval,
181180
sshMaxTimeout:options.SSHMaxTimeout,
182181
subsystems:options.Subsystems,
183-
addresses:options.Addresses,
184182
syscaller:options.Syscaller,
185183
modifiedProcs:options.ModifiedProcesses,
186184
processManagementTick:options.ProcessManagementTick,
@@ -250,7 +248,6 @@ type agent struct {
250248
lifecycleLastReportedIndexint// Keeps track of the last lifecycle state we successfully reported.
251249

252250
network*tailnet.Conn
253-
addresses []netip.Prefix
254251
statsReporter*statsReporter
255252
logSender*agentsdk.LogSender
256253

@@ -1112,15 +1109,11 @@ func (a *agent) updateCommandEnv(current []string) (updated []string, err error)
11121109
returnupdated,nil
11131110
}
11141111

1115-
func (a*agent)wireguardAddresses(agentID uuid.UUID) []netip.Prefix {
1116-
iflen(a.addresses)==0 {
1117-
return []netip.Prefix{
1118-
// This is the IP that should be used primarily.
1119-
netip.PrefixFrom(tailnet.IPFromUUID(agentID),128),
1120-
}
1112+
func (*agent)wireguardAddresses(agentID uuid.UUID) []netip.Prefix {
1113+
return []netip.Prefix{
1114+
// This is the IP that should be used primarily.
1115+
tailnet.TailscaleServicePrefix.PrefixFromUUID(agentID),
11211116
}
1122-
1123-
returna.addresses
11241117
}
11251118

11261119
func (a*agent)trackGoroutine(fnfunc())error {

‎agent/agent_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1880,7 +1880,7 @@ func TestAgent_UpdatedDERP(t *testing.T) {
18801880
// Setup a client connection.
18811881
newClientConn:=func(derpMap*tailcfg.DERPMap,namestring)*workspacesdk.AgentConn {
18821882
conn,err:=tailnet.NewConn(&tailnet.Options{
1883-
Addresses: []netip.Prefix{netip.PrefixFrom(tailnet.IP(),128)},
1883+
Addresses: []netip.Prefix{tailnet.TailscaleServicePrefix.RandomPrefix()},
18841884
DERPMap:derpMap,
18851885
Logger:logger.Named(name),
18861886
})
@@ -2372,7 +2372,7 @@ func setupAgent(t *testing.T, metadata agentsdk.Manifest, ptyTimeout time.Durati
23722372
_=agnt.Close()
23732373
})
23742374
conn,err:=tailnet.NewConn(&tailnet.Options{
2375-
Addresses: []netip.Prefix{netip.PrefixFrom(tailnet.IP(),128)},
2375+
Addresses: []netip.Prefix{netip.PrefixFrom(tailnet.TailscaleServicePrefix.RandomAddr(),128)},
23762376
DERPMap:metadata.DERPMap,
23772377
Logger:logger.Named("client"),
23782378
})

‎coderd/coderd_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func TestDERP(t *testing.T) {
8383
},
8484
},
8585
}
86-
w1IP:=tailnet.IP()
86+
w1IP:=tailnet.TailscaleServicePrefix.RandomAddr()
8787
w1,err:=tailnet.NewConn(&tailnet.Options{
8888
Addresses: []netip.Prefix{netip.PrefixFrom(w1IP,128)},
8989
Logger:logger.Named("w1"),
@@ -92,7 +92,7 @@ func TestDERP(t *testing.T) {
9292
require.NoError(t,err)
9393

9494
w2,err:=tailnet.NewConn(&tailnet.Options{
95-
Addresses: []netip.Prefix{netip.PrefixFrom(tailnet.IP(),128)},
95+
Addresses: []netip.Prefix{tailnet.TailscaleServicePrefix.RandomPrefix()},
9696
Logger:logger.Named("w2"),
9797
DERPMap:derpMap,
9898
})

‎coderd/tailnet.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func NewServerTailnet(
6161
) (*ServerTailnet,error) {
6262
logger=logger.Named("servertailnet")
6363
conn,err:=tailnet.NewConn(&tailnet.Options{
64-
Addresses: []netip.Prefix{netip.PrefixFrom(tailnet.IP(),128)},
64+
Addresses: []netip.Prefix{tailnet.TailscaleServicePrefix.RandomPrefix()},
6565
DERPForceWebSockets:derpForceWebSockets,
6666
Logger:logger,
6767
BlockEndpoints:blockEndpoints,
@@ -352,7 +352,7 @@ func (s *ServerTailnet) ReverseProxy(targetURL, dashboardURL *url.URL, agentID u
352352
// "localhost:port", causing connections to be shared across agents.
353353
tgt:=*targetURL
354354
_,port,_:=net.SplitHostPort(tgt.Host)
355-
tgt.Host=net.JoinHostPort(tailnet.IPFromUUID(agentID).String(),port)
355+
tgt.Host=net.JoinHostPort(tailnet.TailscaleServicePrefix.AddrFromUUID(agentID).String(),port)
356356

357357
proxy:=httputil.NewSingleHostReverseProxy(&tgt)
358358
proxy.ErrorHandler=func(w http.ResponseWriter,r*http.Request,theErrerror) {

‎coderd/tailnet_test.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,9 @@ func TestServerTailnet_ReverseProxy(t *testing.T) {
186186
// Ensure the reverse proxy director rewrites the url host to the agent's IP.
187187
rp.Director(req)
188188
assert.Equal(t,
189-
fmt.Sprintf("[%s]:%d",tailnet.IPFromUUID(a.id).String(),workspacesdk.AgentHTTPAPIServerPort),
189+
fmt.Sprintf("[%s]:%d",
190+
tailnet.TailscaleServicePrefix.AddrFromUUID(a.id).String(),
191+
workspacesdk.AgentHTTPAPIServerPort),
190192
req.URL.Host,
191193
)
192194
})

‎codersdk/workspacesdk/agentconn.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ type AgentConnOptions struct {
5151
}
5252

5353
func (c*AgentConn)agentAddress() netip.Addr {
54-
returntailnet.IPFromUUID(c.opts.AgentID)
54+
returntailnet.TailscaleServicePrefix.AddrFromUUID(c.opts.AgentID)
5555
}
5656

5757
// AwaitReachable waits for the agent to be reachable.

‎codersdk/workspacesdk/workspacesdk.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ func (c *Client) DialAgent(dialCtx context.Context, agentID uuid.UUID, options *
236236
CompressionMode:websocket.CompressionDisabled,
237237
})
238238

239-
ip:=tailnet.IP()
239+
ip:=tailnet.TailscaleServicePrefix.RandomAddr()
240240
varheader http.Header
241241
ifheaderTransport,ok:=c.client.HTTPClient.Transport.(*codersdk.HeaderTransport);ok {
242242
header=headerTransport.Header

‎enterprise/tailnet/pgcoord_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ func TestPGCoordinatorSingle_AgentInvalidIP(t *testing.T) {
120120
deferagent.Close(ctx)
121121
agent.UpdateNode(&proto.Node{
122122
Addresses: []string{
123-
netip.PrefixFrom(agpl.IP(),128).String(),
123+
agpl.TailscaleServicePrefix.RandomPrefix().String(),
124124
},
125125
PreferredDerp:10,
126126
})
@@ -147,7 +147,7 @@ func TestPGCoordinatorSingle_AgentInvalidIPBits(t *testing.T) {
147147
deferagent.Close(ctx)
148148
agent.UpdateNode(&proto.Node{
149149
Addresses: []string{
150-
netip.PrefixFrom(agpl.IPFromUUID(agent.ID),64).String(),
150+
netip.PrefixFrom(agpl.TailscaleServicePrefix.AddrFromUUID(agent.ID),64).String(),
151151
},
152152
PreferredDerp:10,
153153
})
@@ -174,7 +174,7 @@ func TestPGCoordinatorSingle_AgentValidIP(t *testing.T) {
174174
deferagent.Close(ctx)
175175
agent.UpdateNode(&proto.Node{
176176
Addresses: []string{
177-
netip.PrefixFrom(agpl.IPFromUUID(agent.ID),128).String(),
177+
agpl.TailscaleServicePrefix.PrefixFromUUID(agent.ID).String(),
178178
},
179179
PreferredDerp:10,
180180
})

‎tailnet/conn.go‎

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -327,28 +327,37 @@ func NewConn(options *Options) (conn *Conn, err error) {
327327
returnserver,nil
328328
}
329329

330-
funcmaskUUID(uid uuid.UUID) uuid.UUID {
331-
// This is Tailscale's ephemeral service prefix. This can be changed easily
332-
// later-on, because all of our nodes are ephemeral.
333-
// fd7a:115c:a1e0
334-
uid[0]=0xfd
335-
uid[1]=0x7a
336-
uid[2]=0x11
337-
uid[3]=0x5c
338-
uid[4]=0xa1
339-
uid[5]=0xe0
330+
typeServicePrefix [6]byte
331+
332+
var (
333+
TailscaleServicePrefixServicePrefix= [6]byte{0xfd,0x7a,0x11,0x5c,0xa1,0xe0}
334+
CoderServicePrefixServicePrefix= [6]byte{0xfd,0x60,0x62,0x7a,0xa4,0x2b}
335+
)
336+
337+
// maskUUID returns a new UUID with the first 6 bytes changed to the ServicePrefix
338+
func (pServicePrefix)maskUUID(uid uuid.UUID) uuid.UUID {
339+
copy(uid[:],p[:])
340340
returnuid
341341
}
342342

343-
// IP generates a random IP with a static service prefix.
344-
funcIP() netip.Addr {
345-
uid:=maskUUID(uuid.New())
346-
returnnetip.AddrFrom16(uid)
343+
// RandomAddr returns a random IP address in the service prefix.
344+
func (pServicePrefix)RandomAddr() netip.Addr {
345+
returnnetip.AddrFrom16(p.maskUUID(uuid.New()))
346+
}
347+
348+
// AddrFromUUID returns an IPv6 address corresponding to the given UUID in the service prefix.
349+
func (pServicePrefix)AddrFromUUID(uid uuid.UUID) netip.Addr {
350+
returnnetip.AddrFrom16(p.maskUUID(uid))
351+
}
352+
353+
// PrefixFromUUID returns a single IPv6 /128 prefix corresponding to the given UUID.
354+
func (pServicePrefix)PrefixFromUUID(uid uuid.UUID) netip.Prefix {
355+
returnnetip.PrefixFrom(p.AddrFromUUID(uid),128)
347356
}
348357

349-
//IP generates anew IP from a UUID.
350-
funcIPFromUUID(uid uuid.UUID)netip.Addr {
351-
returnnetip.AddrFrom16(maskUUID(uid))
358+
//RandomPrefix returns asingle IPv6 /128 prefix within the service prefix.
359+
func(pServicePrefix)RandomPrefix()netip.Prefix {
360+
returnnetip.PrefixFrom(p.RandomAddr(),128)
352361
}
353362

354363
// Conn is an actively listening Wireguard connection.

‎tailnet/conn_test.go‎

Lines changed: 44 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package tailnet_test
33
import (
44
"context"
55
"net/netip"
6+
"strings"
67
"testing"
78
"time"
89

@@ -30,7 +31,7 @@ func TestTailnet(t *testing.T) {
3031
t.Parallel()
3132
logger:=slogtest.Make(t,nil).Leveled(slog.LevelDebug)
3233
conn,err:=tailnet.NewConn(&tailnet.Options{
33-
Addresses: []netip.Prefix{netip.PrefixFrom(tailnet.IP(),128)},
34+
Addresses: []netip.Prefix{tailnet.TailscaleServicePrefix.RandomPrefix()},
3435
Logger:logger.Named("w1"),
3536
DERPMap:derpMap,
3637
})
@@ -42,7 +43,7 @@ func TestTailnet(t *testing.T) {
4243
t.Parallel()
4344
logger:=slogtest.Make(t,nil).Leveled(slog.LevelDebug)
4445
ctx:=testutil.Context(t,testutil.WaitLong)
45-
w1IP:=tailnet.IP()
46+
w1IP:=tailnet.TailscaleServicePrefix.RandomAddr()
4647
w1,err:=tailnet.NewConn(&tailnet.Options{
4748
Addresses: []netip.Prefix{netip.PrefixFrom(w1IP,128)},
4849
Logger:logger.Named("w1"),
@@ -51,7 +52,7 @@ func TestTailnet(t *testing.T) {
5152
require.NoError(t,err)
5253

5354
w2,err:=tailnet.NewConn(&tailnet.Options{
54-
Addresses: []netip.Prefix{netip.PrefixFrom(tailnet.IP(),128)},
55+
Addresses: []netip.Prefix{tailnet.TailscaleServicePrefix.RandomPrefix()},
5556
Logger:logger.Named("w2"),
5657
DERPMap:derpMap,
5758
})
@@ -106,7 +107,7 @@ func TestTailnet(t *testing.T) {
106107
logger:=slogtest.Make(t,nil).Leveled(slog.LevelDebug)
107108
ctx:=testutil.Context(t,testutil.WaitMedium)
108109

109-
w1IP:=tailnet.IP()
110+
w1IP:=tailnet.TailscaleServicePrefix.RandomAddr()
110111
derpMap:=tailnettest.RunDERPOnlyWebSockets(t)
111112
w1,err:=tailnet.NewConn(&tailnet.Options{
112113
Addresses: []netip.Prefix{netip.PrefixFrom(w1IP,128)},
@@ -117,7 +118,7 @@ func TestTailnet(t *testing.T) {
117118
require.NoError(t,err)
118119

119120
w2,err:=tailnet.NewConn(&tailnet.Options{
120-
Addresses: []netip.Prefix{netip.PrefixFrom(tailnet.IP(),128)},
121+
Addresses: []netip.Prefix{tailnet.TailscaleServicePrefix.RandomPrefix()},
121122
Logger:logger.Named("w2"),
122123
DERPMap:derpMap,
123124
BlockEndpoints:true,
@@ -168,7 +169,7 @@ func TestTailnet(t *testing.T) {
168169
t.Parallel()
169170
logger:=slogtest.Make(t,nil).Leveled(slog.LevelDebug)
170171
ctx:=testutil.Context(t,testutil.WaitLong)
171-
w1IP:=tailnet.IP()
172+
w1IP:=tailnet.TailscaleServicePrefix.RandomAddr()
172173
w1,err:=tailnet.NewConn(&tailnet.Options{
173174
Addresses: []netip.Prefix{netip.PrefixFrom(w1IP,128)},
174175
Logger:logger.Named("w1"),
@@ -177,7 +178,7 @@ func TestTailnet(t *testing.T) {
177178
require.NoError(t,err)
178179

179180
w2,err:=tailnet.NewConn(&tailnet.Options{
180-
Addresses: []netip.Prefix{netip.PrefixFrom(tailnet.IP(),128)},
181+
Addresses: []netip.Prefix{tailnet.TailscaleServicePrefix.RandomPrefix()},
181182
Logger:logger.Named("w2"),
182183
DERPMap:derpMap,
183184
})
@@ -211,7 +212,7 @@ func TestTailnet(t *testing.T) {
211212
t.Parallel()
212213
logger:=slogtest.Make(t,nil).Leveled(slog.LevelDebug)
213214
ctx:=testutil.Context(t,testutil.WaitLong)
214-
w1IP:=tailnet.IP()
215+
w1IP:=tailnet.TailscaleServicePrefix.RandomAddr()
215216
w1,err:=tailnet.NewConn(&tailnet.Options{
216217
Addresses: []netip.Prefix{netip.PrefixFrom(w1IP,128)},
217218
Logger:logger.Named("w1"),
@@ -221,7 +222,7 @@ func TestTailnet(t *testing.T) {
221222
require.NoError(t,err)
222223

223224
w2,err:=tailnet.NewConn(&tailnet.Options{
224-
Addresses: []netip.Prefix{netip.PrefixFrom(tailnet.IP(),128)},
225+
Addresses: []netip.Prefix{tailnet.TailscaleServicePrefix.RandomPrefix()},
225226
Logger:logger.Named("w2"),
226227
DERPMap:derpMap,
227228
BlockEndpoints:true,
@@ -261,7 +262,7 @@ func TestConn_PreferredDERP(t *testing.T) {
261262
logger:=slogtest.Make(t,nil).Leveled(slog.LevelDebug)
262263
derpMap,_:=tailnettest.RunDERPAndSTUN(t)
263264
conn,err:=tailnet.NewConn(&tailnet.Options{
264-
Addresses: []netip.Prefix{netip.PrefixFrom(tailnet.IP(),128)},
265+
Addresses: []netip.Prefix{tailnet.TailscaleServicePrefix.RandomPrefix()},
265266
Logger:logger.Named("w1"),
266267
DERPMap:derpMap,
267268
})
@@ -290,7 +291,7 @@ func TestConn_UpdateDERP(t *testing.T) {
290291
logger:=slogtest.Make(t,nil).Leveled(slog.LevelDebug)
291292

292293
derpMap1,_:=tailnettest.RunDERPAndSTUN(t)
293-
ip:=tailnet.IP()
294+
ip:=tailnet.TailscaleServicePrefix.RandomAddr()
294295
conn,err:=tailnet.NewConn(&tailnet.Options{
295296
Addresses: []netip.Prefix{netip.PrefixFrom(ip,128)},
296297
Logger:logger.Named("w1"),
@@ -320,7 +321,7 @@ func TestConn_UpdateDERP(t *testing.T) {
320321

321322
// Connect from a different client.
322323
client1,err:=tailnet.NewConn(&tailnet.Options{
323-
Addresses: []netip.Prefix{netip.PrefixFrom(tailnet.IP(),128)},
324+
Addresses: []netip.Prefix{tailnet.TailscaleServicePrefix.RandomPrefix()},
324325
Logger:logger.Named("client1"),
325326
DERPMap:derpMap1,
326327
BlockEndpoints:true,
@@ -394,7 +395,7 @@ parentLoop:
394395
// Connect from a different different client with up-to-date derp map and
395396
// nodes.
396397
client2,err:=tailnet.NewConn(&tailnet.Options{
397-
Addresses: []netip.Prefix{netip.PrefixFrom(tailnet.IP(),128)},
398+
Addresses: []netip.Prefix{tailnet.TailscaleServicePrefix.RandomPrefix()},
398399
Logger:logger.Named("client2"),
399400
DERPMap:derpMap2,
400401
BlockEndpoints:true,
@@ -425,7 +426,7 @@ func TestConn_BlockEndpoints(t *testing.T) {
425426
derpMap,_:=tailnettest.RunDERPAndSTUN(t)
426427

427428
// Setup conn 1.
428-
ip1:=tailnet.IP()
429+
ip1:=tailnet.TailscaleServicePrefix.RandomAddr()
429430
conn1,err:=tailnet.NewConn(&tailnet.Options{
430431
Addresses: []netip.Prefix{netip.PrefixFrom(ip1,128)},
431432
Logger:logger.Named("w1"),
@@ -439,7 +440,7 @@ func TestConn_BlockEndpoints(t *testing.T) {
439440
}()
440441

441442
// Setup conn 2.
442-
ip2:=tailnet.IP()
443+
ip2:=tailnet.TailscaleServicePrefix.RandomAddr()
443444
conn2,err:=tailnet.NewConn(&tailnet.Options{
444445
Addresses: []netip.Prefix{netip.PrefixFrom(ip2,128)},
445446
Logger:logger.Named("w2"),
@@ -492,3 +493,31 @@ func stitch(t *testing.T, dst, src *tailnet.Conn) {
492493
assert.NoError(t,err)
493494
})
494495
}
496+
497+
funcTestTailscaleServicePrefix(t*testing.T) {
498+
t.Parallel()
499+
a:=tailnet.TailscaleServicePrefix.RandomAddr()
500+
require.True(t,strings.HasPrefix(a.String(),"fd7a:115c:a1e0"))
501+
p:=tailnet.TailscaleServicePrefix.RandomPrefix()
502+
require.True(t,strings.HasPrefix(p.String(),"fd7a:115c:a1e0"))
503+
require.True(t,strings.HasSuffix(p.String(),"/128"))
504+
u:=uuid.MustParse("aaaaaaaa-aaaa-aaaa-aaaa-123456789abc")
505+
a=tailnet.TailscaleServicePrefix.AddrFromUUID(u)
506+
require.Equal(t,"fd7a:115c:a1e0:aaaa:aaaa:1234:5678:9abc",a.String())
507+
p=tailnet.TailscaleServicePrefix.PrefixFromUUID(u)
508+
require.Equal(t,"fd7a:115c:a1e0:aaaa:aaaa:1234:5678:9abc/128",p.String())
509+
}
510+
511+
funcTestCoderServicePrefix(t*testing.T) {
512+
t.Parallel()
513+
a:=tailnet.CoderServicePrefix.RandomAddr()
514+
require.True(t,strings.HasPrefix(a.String(),"fd60:627a:a42b"))
515+
p:=tailnet.CoderServicePrefix.RandomPrefix()
516+
require.True(t,strings.HasPrefix(p.String(),"fd60:627a:a42b"))
517+
require.True(t,strings.HasSuffix(p.String(),"/128"))
518+
u:=uuid.MustParse("aaaaaaaa-aaaa-aaaa-aaaa-123456789abc")
519+
a=tailnet.CoderServicePrefix.AddrFromUUID(u)
520+
require.Equal(t,"fd60:627a:a42b:aaaa:aaaa:1234:5678:9abc",a.String())
521+
p=tailnet.CoderServicePrefix.PrefixFromUUID(u)
522+
require.Equal(t,"fd60:627a:a42b:aaaa:aaaa:1234:5678:9abc/128",p.String())
523+
}

0 commit comments

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