Skip to content

Commit

Permalink
Merge pull request #1353 from netbirdio/feature/extend-add-peer-event…
Browse files Browse the repository at this point in the history
…-with-setup-key

Extend add peer event meta with setup key name
  • Loading branch information
pascal-fischer authored Dec 4, 2023
2 parents e37a337 + 92adf57 commit 755ffcf
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions management/server/peer.go
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,7 @@ func (am *DefaultAccountManager) AddPeer(setupKey, userID string, peer *Peer) (*
}

var ephemeral bool
setupKeyName := ""
if !addedByUser {
// validate the setup key if adding with a key
sk, err := account.FindSetupKey(upperKey)
Expand All @@ -525,6 +526,7 @@ func (am *DefaultAccountManager) AddPeer(setupKey, userID string, peer *Peer) (*
opEvent.InitiatorID = sk.Id
opEvent.Activity = activity.PeerAddedWithSetupKey
ephemeral = sk.Ephemeral
setupKeyName = sk.Name
} else {
opEvent.InitiatorID = userID
opEvent.Activity = activity.PeerAddedByUser
Expand Down Expand Up @@ -599,6 +601,10 @@ func (am *DefaultAccountManager) AddPeer(setupKey, userID string, peer *Peer) (*

opEvent.TargetID = newPeer.ID
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.updateAccountPeers(account)
Expand Down

0 comments on commit 755ffcf

Please sign in to comment.