eburet-oss/wireguard-go-awg2-lx
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

conn,device: implement InitiationAwareEndpoint

Browse source 
To be implemented by [magicsock.lazyEndpoint], which is responsible for
triggering JIT peer configuration.

Updates tailscale/corp#20732
Updates tailscale/corp#30042

Signed-off-by: Jordan Whited <jordan@tailscale.com>
This commit is contained in:
Jordan Whited 2025-07-03 20:54:49 -07:00 • committed by Jordan Whited
parent 24483d7a00
commit 1f398ae148
4 changed files with 52 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
device/noise-protocol.go
View file

@ -16,6 +16,7 @@ import (
"golang.org/x/crypto/chacha20poly1305"
"golang.org/x/crypto/poly1305"
"github.com/tailscale/wireguard-go/conn"
"github.com/tailscale/wireguard-go/tai64n"
)
@ -338,7 +339,7 @@ func (device *Device) CreateMessageInitiation(peer *Peer) (*MessageInitiation, e
return &msg, nil
}
func (device *Device) ConsumeMessageInitiation(msg *MessageInitiation) *Peer {
func (device *Device) ConsumeMessageInitiation(msg *MessageInitiation, endpoint conn.Endpoint) *Peer {
var (
hash [blake2s.Size]byte
chainKey [blake2s.Size]byte
@ -372,6 +373,11 @@ func (device *Device) ConsumeMessageInitiation(msg *MessageInitiation) *Peer {
// lookup peer
initEP, ok := endpoint.(conn.InitiationAwareEndpoint)
if ok {
initEP.InitiationMessagePublicKey(peerPK)
}
peer := device.LookupPeer(peerPK)
if peer == nil || !peer.isRunning.Load() {
return nil

30
device/noise_test.go
View file

@ -8,6 +8,7 @@ package device
import (
"bytes"
"encoding/binary"
"net/netip"
"testing"
"github.com/tailscale/wireguard-go/conn"
@ -56,6 +57,26 @@ func assertEqual(t *testing.T, a, b []byte) {
}
}
type initAwareEP struct {
calledWith *[32]byte
}
var _ conn.Endpoint = (*initAwareEP)(nil)
var _ conn.InitiationAwareEndpoint = (*initAwareEP)(nil)
func (i *initAwareEP) ClearSrc() {}
func (i *initAwareEP) SrcToString() string { return "" }
func (i *initAwareEP) DstToString() string { return "" }
func (i *initAwareEP) DstToBytes() []byte { return nil }
func (i *initAwareEP) DstIP() netip.Addr { return netip.Addr{} }
func (i *initAwareEP) SrcIP() netip.Addr { return netip.Addr{} }
func (i *initAwareEP) InitiationMessagePublicKey(peerPublicKey [32]byte) {
calledWith := [32]byte{}
copy(calledWith[:], peerPublicKey[:])
i.calledWith = &calledWith
}
func TestNoiseHandshake(t *testing.T) {
dev1 := randDevice(t)
dev2 := randDevice(t)
@ -93,10 +114,17 @@ func TestNoiseHandshake(t *testing.T) {
writer := bytes.NewBuffer(packet)
err = binary.Write(writer, binary.LittleEndian, msg1)
assertNil(t, err)
peer := dev2.ConsumeMessageInitiation(msg1)
initEP := &initAwareEP{}
peer := dev2.ConsumeMessageInitiation(msg1, initEP)
if peer == nil {
t.Fatal("handshake failed at initiation message")
}
if initEP.calledWith == nil {
t.Fatal("initAwareEP never called")
}
if *initEP.calledWith != dev1.staticIdentity.publicKey {
t.Fatal("initAwareEP called with unexpected public key")
}
assertEqual(
t,

2
device/receive.go
View file

@ -359,7 +359,7 @@ func (device *Device) RoutineHandshake(id int) {
// consume initiation
peer := device.ConsumeMessageInitiation(&msg)
peer := device.ConsumeMessageInitiation(&msg, elem.endpoint)
if peer == nil {
device.log.Verbosef("Received invalid initiation message from %s", elem.endpoint.DstToString())
goto skip