mirror of
https://github.com/netbirdio/netbird.git
synced 2024-11-28 19:13:31 +01:00
0c039274a4
This update adds new relay integration for NetBird clients. The new relay is based on web sockets and listens on a single port. - Adds new relay implementation with websocket with single port relaying mechanism - refactor peer connection logic, allowing upgrade and downgrade from/to P2P connection - peer connections are faster since it connects first to relay and then upgrades to P2P - maintains compatibility with old clients by not using the new relay - updates infrastructure scripts with new relay service
77 lines
2.1 KiB
Go
77 lines
2.1 KiB
Go
package client
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"strings"
|
|
|
|
"github.com/netbirdio/netbird/signal/proto"
|
|
"github.com/netbirdio/netbird/version"
|
|
|
|
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
|
|
)
|
|
|
|
// A set of tools to exchange connection details (Wireguard endpoints) with the remote peer.
|
|
|
|
// Status is the status of the client
|
|
type Status string
|
|
|
|
const StreamConnected Status = "Connected"
|
|
const StreamDisconnected Status = "Disconnected"
|
|
|
|
const (
|
|
// DirectCheck indicates support to direct mode checks
|
|
DirectCheck uint32 = 1
|
|
)
|
|
|
|
type Client interface {
|
|
io.Closer
|
|
StreamConnected() bool
|
|
GetStatus() Status
|
|
Receive(ctx context.Context, msgHandler func(msg *proto.Message) error) error
|
|
Ready() bool
|
|
IsHealthy() bool
|
|
WaitStreamConnected()
|
|
SendToStream(msg *proto.EncryptedMessage) error
|
|
Send(msg *proto.Message) error
|
|
}
|
|
|
|
// UnMarshalCredential parses the credentials from the message and returns a Credential instance
|
|
func UnMarshalCredential(msg *proto.Message) (*Credential, error) {
|
|
|
|
credential := strings.Split(msg.GetBody().GetPayload(), ":")
|
|
if len(credential) != 2 {
|
|
return nil, fmt.Errorf("error parsing message body %s", msg.Body)
|
|
}
|
|
return &Credential{
|
|
UFrag: credential[0],
|
|
Pwd: credential[1],
|
|
}, nil
|
|
}
|
|
|
|
// MarshalCredential marshal a Credential instance and returns a Message object
|
|
func MarshalCredential(myKey wgtypes.Key, myPort int, remoteKey string, credential *Credential, t proto.Body_Type, rosenpassPubKey []byte, rosenpassAddr string, relaySrvAddress string) (*proto.Message, error) {
|
|
return &proto.Message{
|
|
Key: myKey.PublicKey().String(),
|
|
RemoteKey: remoteKey,
|
|
Body: &proto.Body{
|
|
Type: t,
|
|
Payload: fmt.Sprintf("%s:%s", credential.UFrag, credential.Pwd),
|
|
WgListenPort: uint32(myPort),
|
|
NetBirdVersion: version.NetbirdVersion(),
|
|
RosenpassConfig: &proto.RosenpassConfig{
|
|
RosenpassPubKey: rosenpassPubKey,
|
|
RosenpassServerAddr: rosenpassAddr,
|
|
},
|
|
RelayServerAddress: relaySrvAddress,
|
|
},
|
|
}, nil
|
|
}
|
|
|
|
// Credential is an instance of a GrpcClient's Credential
|
|
type Credential struct {
|
|
UFrag string
|
|
Pwd string
|
|
}
|