extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-06-25 12:12:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix map assignment

Browse Source
This commit is contained in:
Pascal Fischer 2023-12-04 13:49:46 +01:00
parent 1cd5a66575
commit 92adf57fea
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
management/server/peer.go
View File

@ -510,6 +510,7 @@ func (am *DefaultAccountManager) AddPeer(setupKey, userID string, peer *Peer) (*
} }
var ephemeral bool var ephemeral bool
setupKeyName := ""
if !addedByUser { if !addedByUser {
// validate the setup key if adding with a key // validate the setup key if adding with a key
sk, err := account.FindSetupKey(upperKey) sk, err := account.FindSetupKey(upperKey)
@ -525,7 +526,7 @@ func (am *DefaultAccountManager) AddPeer(setupKey, userID string, peer *Peer) (*
opEvent.InitiatorID = sk.Id opEvent.InitiatorID = sk.Id
opEvent.Activity = activity.PeerAddedWithSetupKey opEvent.Activity = activity.PeerAddedWithSetupKey
ephemeral = sk.Ephemeral ephemeral = sk.Ephemeral
opEvent.Meta["setup_key_name"] = sk.Name setupKeyName = sk.Name
} else { } else {
opEvent.InitiatorID = userID opEvent.InitiatorID = userID
opEvent.Activity = activity.PeerAddedByUser opEvent.Activity = activity.PeerAddedByUser
@ -599,9 +600,9 @@ func (am *DefaultAccountManager) AddPeer(setupKey, userID string, peer *Peer) (*
} }
opEvent.TargetID = newPeer.ID opEvent.TargetID = newPeer.ID
peerMeta := newPeer.EventMeta(am.GetDNSDomain()) opEvent.Meta = newPeer.EventMeta(am.GetDNSDomain())
for k, v := range peerMeta { if !addedByUser {
opEvent.Meta[k] = v opEvent.Meta["setup_key_name"] = setupKeyName
} }
am.StoreEvent(opEvent.InitiatorID, opEvent.TargetID, opEvent.AccountID, opEvent.Activity, opEvent.Meta) am.StoreEvent(opEvent.InitiatorID, opEvent.TargetID, opEvent.AccountID, opEvent.Activity, opEvent.Meta)