mirrors/tailscale
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

control/noise: make message headers match the specification.

Browse Source 
Only the initiation message should carry a protocol version, all
others are just type+len.

Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson
2021-10-25 17:24:32 -07:00
committed by Dave Anderson
parent a63c4ab378
commit d3acd35a90
5 changed files with 65 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
control/noise/handshake_test.go
View File

@ -188,7 +188,7 @@ func TestTampering(t *testing.T) {
}
// Tamper with every byte of the server response message.
for i := 0; i < 53; i++ {
for i := 0; i < 51; i++ {
var (
clientRaw, serverConn = tsnettest.NewConn("noise", 128000)
clientConn = &readerConn{clientRaw, &tamperReader{clientRaw, i, 0}}
@ -213,10 +213,10 @@ func TestTampering(t *testing.T) {
}
// Tamper with every byte of the first server>client transport message.
for i := 0; i < 32; i++ {
for i := 0; i < 30; i++ {
var (
clientRaw, serverConn = tsnettest.NewConn("noise", 128000)
clientConn = &readerConn{clientRaw, &tamperReader{clientRaw, 53 + i, 0}}
clientConn = &readerConn{clientRaw, &tamperReader{clientRaw, 51 + i, 0}}
serverKey = key.NewMachine()
clientKey = key.NewMachine()
serverErr = make(chan error, 1)
@ -239,7 +239,7 @@ func TestTampering(t *testing.T) {
}
// The client needs a timeout if the tampering is hitting the length header.
if i == 3 || i == 4 {
if i == 1 || i == 2 {
client.SetReadDeadline(time.Now().Add(10 * time.Millisecond))
}
@ -254,7 +254,7 @@ func TestTampering(t *testing.T) {
}
// Tamper with every byte of the first client>server transport message.
for i := 0; i < 32; i++ {
for i := 0; i < 30; i++ {
var (
clientConn, serverRaw = tsnettest.NewConn("noise", 128000)
serverConn = &readerConn{serverRaw, &tamperReader{serverRaw, 101 + i, 0}}
@ -267,7 +267,7 @@ func TestTampering(t *testing.T) {
serverErr <- err
var bs [100]byte
// The server needs a timeout if the tampering is hitting the length header.
if i == 3 || i == 4 {
if i == 1 || i == 2 {
server.SetReadDeadline(time.Now().Add(10 * time.Millisecond))
}
n, err := server.Read(bs[:])