gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2024-09-20 23:36:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge conflicts resolved

Browse source
This commit is contained in:
Abhishek Kondur 2023-01-12 15:22:48 +05:30
parent 0a5a48f80b da7ba76f22
commit 3bf69605e5
6 changed files with 107 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
.github/workflows/test.yml vendored
View file

@ -6,6 +6,7 @@ on:
types: [opened, synchronize, reopened]
jobs:
build:
runs-on: ubuntu-latest
steps:
@ -19,11 +20,7 @@ jobs:
run: |
env CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build main.go
env CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -tags=ee main.go
cd netclient
env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build main.go
env CGO_ENABLED=0 GOOS=freebsd GOARCH=amd64 go build main.go
env CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build main.go
env CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build main.go
nmctl:
runs-on: ubuntu-latest
steps:
@ -40,53 +37,8 @@ jobs:
GOOS=darwin GOARCH=amd64 go build -o nmctl
GOOS=darwin GOARCH=arm64 go build -o nmctl
GOOS=windows GOARCH=amd64 go build -o nmctl
linux-gui:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup Go
uses: actions/setup-go@v3
with:
go-version: 1.19
- name: Build
run: |
sudo apt-get update
sudo apt-get install -y gcc libgl1-mesa-dev xorg-dev
env CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -tags=gui main.go
mac-gui:
runs-on: macos-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup Go
uses: actions/setup-go@v3
with:
go-version: 1.19
- name: Build mac
run: |
env CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 go build -tags=gui main.go
win-gui:
runs-on: windows-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup Go
uses: actions/setup-go@v3
with:
go-version: 1.19
- name: Mysys2 setup
uses: msys2/setup-msys2@v2
with:
install: >-
git
mingw-w64-x86_64-toolchain
- name: Build win gui
run: |
env CGO_ENABLED=1 GOOS=windows GOARCH=amd64 go build -tags=gui main.go
tests:
env:
DATABASE: sqlite
runs-on: ubuntu-22.04
steps:
- name: Checkout
@ -97,11 +49,24 @@ jobs:
go-version: 1.19
- name: run tests
run: |
sudo apt update
sudo apt-get install -y gcc libgl1-mesa-dev xorg-dev
go test -p 1 ./... -v
go install honnef.co/go/tools/cmd/staticcheck@latest
{ ~/go/bin/staticcheck -tags=ee ./... ; }
env:
DATABASE: sqlite
CLIENT_MODE: "off"
staticcheck:
env:
DATABASE: sqlite
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup Go
uses: actions/setup-go@v3
with:
go-version: 1.19
- name: run static checks
run: |
sudo apt update
go install honnef.co/go/tools/cmd/staticcheck@latest
{ ~/go/bin/staticcheck -tags=ee ./... ; }

12
mq/dynsec_helper.go
View file

@ -178,6 +178,12 @@ func fetchHostAcls(hostID string) []Acl {
Priority: -1,
Allow: true,
},
{
AclType: "publishClientReceive",
Topic: fmt.Sprintf("host/update/%s", hostID),
Priority: -1,
Allow: true,
},
}
}
@ -353,6 +359,12 @@ func fetchServerAcls() []Acl {
Priority: -1,
Allow: true,
},
{
AclType: "publishClientReceive",
Topic: "host/update/#",
Priority: -1,
Allow: true,
},
}
}

39
mq/handlers.go
View file

@ -118,6 +118,45 @@ func UpdateNode(client mqtt.Client, msg mqtt.Message) {
}()
}
// UpdateHost message Handler -- handles updates from client hosts
func UpdateHost(client mqtt.Client, msg mqtt.Message) {
go func() {
id, err := getID(msg.Topic())
if err != nil {
logger.Log(1, "error getting host.ID sent on ", msg.Topic(), err.Error())
return
}
currentHost, err := logic.GetHost(id)
if err != nil {
logger.Log(1, "error getting node ", id, err.Error())
return
}
decrypted, decryptErr := decryptMsgWithHost(currentHost, msg.Payload())
if decryptErr != nil {
logger.Log(1, "failed to decrypt message for node ", id, decryptErr.Error())
return
}
var newHost models.Host
if err := json.Unmarshal(decrypted, &newHost); err != nil {
logger.Log(1, "error unmarshaling payload ", err.Error())
return
}
// ifaceDelta := logic.IfaceDelta(&currentHost, newNode)
// if servercfg.Is_EE && ifaceDelta {
// if err = logic.EnterpriseResetAllPeersFailovers(currentHost.ID.String(), currentHost.Network); err != nil {
// logger.Log(1, "failed to reset failover list during node update", currentHost.ID.String(), currentHost.Network)
// }
// }
logic.UpdateHost(&newHost, currentHost)
if err := logic.UpsertHost(&newHost); err != nil {
logger.Log(1, "error saving host", err.Error())
return
}
logger.Log(1, "updated host", newHost.ID.String())
}()
}
// UpdateMetrics message Handler -- handles updates from client nodes for metrics
func UpdateMetrics(client mqtt.Client, msg mqtt.Message) {
if servercfg.Is_EE {

4
mq/mq.go
View file

@ -83,6 +83,10 @@ func SetupMQTT() {
client.Disconnect(240)
logger.Log(0, "node update subscription failed")
}
if token := client.Subscribe("host/update/#", 0, mqtt.MessageHandler(UpdateHost)); token.WaitTimeout(MQ_TIMEOUT*time.Second) && token.Error() != nil {
client.Disconnect(240)
logger.Log(0, "host update subscription failed")
}
if token := client.Subscribe("signal/#", 0, mqtt.MessageHandler(ClientPeerUpdate)); token.WaitTimeout(MQ_TIMEOUT*time.Second) && token.Error() != nil {
client.Disconnect(240)
logger.Log(0, "node client subscription failed")

20
mq/publishers.go
View file

@ -92,6 +92,26 @@ func NodeUpdate(node *models.Node) error {
return nil
}
// HostUpdate -- publishes a host topic update
func HostUpdate(host *models.Host) error {
if !servercfg.IsMessageQueueBackend() {
return nil
}
logger.Log(3, "publishing host update to "+host.ID.String())
data, err := json.Marshal(host)
if err != nil {
logger.Log(2, "error marshalling node update ", err.Error())
return err
}
if err = publish(host, fmt.Sprintf("host/update/%s", host.ID.String()), data); err != nil {
logger.Log(2, "error publishing host update to", host.ID.String(), err.Error())
return err
}
return nil
}
// sendPeers - retrieve networks, send peer ports to all peers
func sendPeers() {

24
mq/util.go
View file

@ -11,15 +11,7 @@ import (
"github.com/gravitl/netmaker/netclient/ncutils"
)
func decryptMsg(node *models.Node, msg []byte) ([]byte, error) {
if len(msg) <= 24 { // make sure message is of appropriate length
return nil, fmt.Errorf("recieved invalid message from broker %v", msg)
}
host, err := logic.GetHost(node.HostID.String())
if err != nil {
return nil, err
}
func decryptMsgWithHost(host *models.Host, msg []byte) ([]byte, error) {
trafficKey, trafficErr := logic.RetrievePrivateTrafficKey() // get server private key
if trafficErr != nil {
return nil, trafficErr
@ -33,11 +25,19 @@ func decryptMsg(node *models.Node, msg []byte) ([]byte, error) {
return nil, err
}
if strings.Contains(host.Version, "0.10.0") {
return ncutils.BoxDecrypt(msg, nodePubTKey, serverPrivTKey)
return ncutils.DeChunk(msg, nodePubTKey, serverPrivTKey)
}
func decryptMsg(node *models.Node, msg []byte) ([]byte, error) {
if len(msg) <= 24 { // make sure message is of appropriate length
return nil, fmt.Errorf("recieved invalid message from broker %v", msg)
}
host, err := logic.GetHost(node.HostID.String())
if err != nil {
return nil, err
}
return ncutils.DeChunk(msg, nodePubTKey, serverPrivTKey)
return decryptMsgWithHost(host, msg)
}
func encryptMsg(host *models.Host, msg []byte) ([]byte, error) {