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

Merge pull request #1353 from netbirdio/feature/extend-add-peer-event-with-setup-key

Browse Source 
Extend add peer event meta with setup key name
This commit is contained in:
pascal-fischer 2023-12-04 17:33:50 +01:00 committed by GitHub
commit 755ffcfc73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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,6 +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
setupKeyName = sk.Name
} else { } else {
opEvent.InitiatorID = userID opEvent.InitiatorID = userID
opEvent.Activity = activity.PeerAddedByUser opEvent.Activity = activity.PeerAddedByUser
@ -599,6 +601,10 @@ func (am *DefaultAccountManager) AddPeer(setupKey, userID string, peer *Peer) (*
opEvent.TargetID = newPeer.ID opEvent.TargetID = newPeer.ID
opEvent.Meta = newPeer.EventMeta(am.GetDNSDomain()) opEvent.Meta = newPeer.EventMeta(am.GetDNSDomain())
if !addedByUser {
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)
am.updateAccountPeers(account) am.updateAccountPeers(account)