From 1cd5a66575695324b86e0cda6804e573f789a851 Mon Sep 17 00:00:00 2001 From: Pascal Fischer Date: Mon, 4 Dec 2023 13:00:13 +0100 Subject: [PATCH 1/2] adding setup key name to the event meta for adding peers by setup key --- management/server/peer.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/management/server/peer.go b/management/server/peer.go index 67076921b..356353db6 100644 --- a/management/server/peer.go +++ b/management/server/peer.go @@ -525,6 +525,7 @@ func (am *DefaultAccountManager) AddPeer(setupKey, userID string, peer *Peer) (* opEvent.InitiatorID = sk.Id opEvent.Activity = activity.PeerAddedWithSetupKey ephemeral = sk.Ephemeral + opEvent.Meta["setup_key_name"] = sk.Name } else { opEvent.InitiatorID = userID opEvent.Activity = activity.PeerAddedByUser @@ -598,7 +599,11 @@ func (am *DefaultAccountManager) AddPeer(setupKey, userID string, peer *Peer) (* } opEvent.TargetID = newPeer.ID - opEvent.Meta = newPeer.EventMeta(am.GetDNSDomain()) + peerMeta := newPeer.EventMeta(am.GetDNSDomain()) + for k, v := range peerMeta { + opEvent.Meta[k] = v + } + am.StoreEvent(opEvent.InitiatorID, opEvent.TargetID, opEvent.AccountID, opEvent.Activity, opEvent.Meta) am.updateAccountPeers(account) From 92adf57fea25258726f75d0b510659def823db52 Mon Sep 17 00:00:00 2001 From: Pascal Fischer Date: Mon, 4 Dec 2023 13:49:46 +0100 Subject: [PATCH 2/2] fix map assignment --- management/server/peer.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/management/server/peer.go b/management/server/peer.go index 356353db6..dcfe26410 100644 --- a/management/server/peer.go +++ b/management/server/peer.go @@ -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) @@ -525,7 +526,7 @@ func (am *DefaultAccountManager) AddPeer(setupKey, userID string, peer *Peer) (* opEvent.InitiatorID = sk.Id opEvent.Activity = activity.PeerAddedWithSetupKey ephemeral = sk.Ephemeral - opEvent.Meta["setup_key_name"] = sk.Name + setupKeyName = sk.Name } else { opEvent.InitiatorID = userID opEvent.Activity = activity.PeerAddedByUser @@ -599,9 +600,9 @@ func (am *DefaultAccountManager) AddPeer(setupKey, userID string, peer *Peer) (* } opEvent.TargetID = newPeer.ID - peerMeta := newPeer.EventMeta(am.GetDNSDomain()) - for k, v := range peerMeta { - opEvent.Meta[k] = v + 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)