sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-10-01 19:19:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Add sha prefix for peer id in protocol

Browse Source 
- Add magic cookie in hello msg
- Add tests
This commit is contained in:
Zoltán Papp
2024-06-25 17:36:04 +02:00
parent 0a67f5be1a
commit 085d072b17
6 changed files with 107 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
relay/messages/message.go
+21 -17
View File
@@ -1,6 +1,7 @@
package messages
import (
"bytes"
"fmt"
log "github.com/sirupsen/logrus"
@@ -11,10 +12,15 @@ const (
MsgTypeHelloResponse MsgType = 1
MsgTypeTransport MsgType = 2
MsgClose MsgType = 3
headerSizeTransport = 1 + IDSize // 1 byte for msg type, IDSize for peerID
headerSizeHello = 1 + 4 + IDSize // 1 byte for msg type, 4 byte for magic header, IDSize for peerID
)
var (
ErrInvalidMessageLength = fmt.Errorf("invalid message length")
magicHeader = []byte{0x21, 0x12, 0xA4, 0x42}
)
type MsgType byte
@@ -35,7 +41,6 @@ func (m MsgType) String() string {
}
func DetermineClientMsgType(msg []byte) (MsgType, error) {
// todo: validate magic byte
msgType := MsgType(msg[0])
switch msgType {
case MsgTypeHello:
@@ -50,7 +55,6 @@ func DetermineClientMsgType(msg []byte) (MsgType, error) {
}
func DetermineServerMsgType(msg []byte) (MsgType, error) {
// todo: validate magic byte
msgType := MsgType(msg[0])
switch msgType {
case MsgTypeHelloResponse:
@@ -67,19 +71,21 @@ func DetermineServerMsgType(msg []byte) (MsgType, error) {
// MarshalHelloMsg initial hello message
func MarshalHelloMsg(peerID []byte) ([]byte, error) {
if len(peerID) != IDSize {
return nil, fmt.Errorf("invalid peerID length")
return nil, fmt.Errorf("invalid peerID length: %d", len(peerID))
}
msg := make([]byte, 1, 1+len(peerID))
msg := make([]byte, 5, headerSizeHello)
msg[0] = byte(MsgTypeHello)
copy(msg[1:5], magicHeader)
msg = append(msg, peerID...)
return msg, nil
}
func UnmarshalHelloMsg(msg []byte) ([]byte, error) {
if len(msg) < 2 {
if len(msg) < headerSizeHello {
return nil, fmt.Errorf("invalid 'hello' messge")
}
return msg[1:], nil
bytes.Equal(msg[1:5], magicHeader)
return msg[5:], nil
}
func MarshalHelloResponse() []byte {
@@ -98,34 +104,32 @@ func MarshalCloseMsg() []byte {
// Transport message
func MarshalTransportMsg(peerID []byte, payload []byte) []byte {
func MarshalTransportMsg(peerID []byte, payload []byte) ([]byte, error) {
if len(peerID) != IDSize {
return nil
return nil, fmt.Errorf("invalid peerID length: %d", len(peerID))
}
msg := make([]byte, 1+IDSize, 1+IDSize+len(payload))
msg := make([]byte, headerSizeTransport, headerSizeTransport+len(payload))
msg[0] = byte(MsgTypeTransport)
copy(msg[1:], peerID)
msg = append(msg, payload...)
return msg
return msg, nil
}
func UnmarshalTransportMsg(buf []byte) ([]byte, []byte, error) {
headerSize := 1 + IDSize
if len(buf) < headerSize {
if len(buf) < headerSizeTransport {
return nil, nil, ErrInvalidMessageLength
}
return buf[1:headerSize], buf[headerSize:], nil
return buf[1:headerSizeTransport], buf[headerSizeTransport:], nil
}
func UnmarshalTransportID(buf []byte) ([]byte, error) {
headerSize := 1 + IDSize
if len(buf) < headerSize {
log.Debugf("invalid message length: %d, expected: %d, %x", len(buf), headerSize, buf)
if len(buf) < headerSizeTransport {
log.Debugf("invalid message length: %d, expected: %d, %x", len(buf), headerSizeTransport, buf)
return nil, ErrInvalidMessageLength
}
return buf[1:headerSize], nil
return buf[1:headerSizeTransport], nil
}
func UpdateTransportMsg(msg []byte, peerID []byte) error {