gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-11-11 01:01:05 +08:00
Code Issues Projects Releases Packages Wiki Activity

add back compatibility for encrypt message (#3246)

Browse source
This commit is contained in:
Yabin Ma 2024-12-10 09:47:05 +01:00 • committed by GitHub
parent 7093373c77
commit 9024aead60
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
mq/migrate.go
View file

@ -88,15 +88,32 @@ func SendPullSYN() error {
Host: host, Host: host,
} }
msg, _ := json.Marshal(hostUpdate) msg, _ := json.Marshal(hostUpdate)
zipped, err := compressPayload(msg) var encrypted []byte
var encryptErr error
vlt, err := logic.VersionLessThan(host.Version, "v0.30.0")
if err != nil { if err != nil {
return err slog.Warn("error checking version less than", "warn", err)
}
encrypted, encryptErr := encryptAESGCM(host.TrafficKeyPublic[0:32], zipped)
if encryptErr != nil {
continue continue
} }
if vlt {
encrypted, encryptErr = encryptMsg(&host, msg)
if encryptErr != nil {
slog.Warn("error encrypt with encryptMsg", "warn", encryptErr)
continue
}
} else {
zipped, err := compressPayload(msg)
if err != nil {
slog.Warn("error compressing message", "warn", err)
continue
}
encrypted, encryptErr = encryptAESGCM(host.TrafficKeyPublic[0:32], zipped)
if encryptErr != nil {
slog.Warn("error encrypt with encryptMsg", "warn", encryptErr)
continue
}
}
logger.Log(0, "sending pull syn to", host.Name) logger.Log(0, "sending pull syn to", host.Name)
mqclient.Publish(fmt.Sprintf("host/update/%s/%s", hostUpdate.Host.ID.String(), servercfg.GetServer()), 0, true, encrypted) mqclient.Publish(fmt.Sprintf("host/update/%s/%s", hostUpdate.Host.ID.String(), servercfg.GetServer()), 0, true, encrypted)
} }