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

fix(NET-1055): fix auto-relay with enrollment key (#2887)

Browse source
This commit is contained in:
Aceix 2024-04-11 12:44:15 +00:00 • committed by GitHub
parent 8404523c6d
commit 08efea73ac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
auth/host_session.go
View file

@ -248,12 +248,20 @@ func CheckNetRegAndHostUpdate(networks []string, h *models.Host, relayNodeId uui
// check if relay node exists and acting as relay // check if relay node exists and acting as relay
relaynode, err := logic.GetNodeByID(relayNodeId.String()) relaynode, err := logic.GetNodeByID(relayNodeId.String())
if err == nil && relaynode.IsRelay { if err == nil && relaynode.IsRelay {
slog.Info(fmt.Sprintf("adding relayed node %s to relay %s on network %s", newNode.ID.String(), relayNodeId.String(), network))
newNode.IsRelayed = true newNode.IsRelayed = true
newNode.RelayedBy = relayNodeId.String() newNode.RelayedBy = relayNodeId.String()
slog.Info(fmt.Sprintf("adding relayed node %s to relay %s on network %s", newNode.ID.String(), relayNodeId.String(), network)) updatedRelayNode := relaynode
updatedRelayNode.RelayedNodes = append(updatedRelayNode.RelayedNodes, newNode.ID.String())
logic.UpdateRelayed(&relaynode, &updatedRelayNode)
if err := logic.UpsertNode(&updatedRelayNode); err != nil {
slog.Error("failed to update node", "nodeid", relayNodeId.String())
}
if err := logic.UpsertNode(newNode); err != nil { if err := logic.UpsertNode(newNode); err != nil {
slog.Error("failed to update node", "nodeid", relayNodeId.String()) slog.Error("failed to update node", "nodeid", relayNodeId.String())
} }
} else {
slog.Error("failed to relay node. maybe specified relay node is actually not a relay?", "err", err)
} }
} }
logger.Log(1, "added new node", newNode.ID.String(), "to host", h.Name) logger.Log(1, "added new node", newNode.ID.String(), "to host", h.Name)