sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-18 08:16:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/peer-approval

Browse Source
This commit is contained in:
pascal-fischer
2023-12-01 18:12:59 +01:00
committed by GitHub
parent 4bf574037f d7efea74b6
commit d5bf79bc51
16 changed files with 409 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
management/server/peer.go
View File

@@ -53,7 +53,7 @@ func (am *DefaultAccountManager) GetPeers(accountID, userID string) ([]*nbpeer.P
peers := make([]*nbpeer.Peer, 0)
peersMap := make(map[string]*nbpeer.Peer)
for _, peer := range account.Peers {
if !user.IsAdmin() && user.Id != peer.UserID {
if !user.HasAdminPower() && user.Id != peer.UserID {
// only display peers that belong to the current user if the current user is not an admin
continue
}
@@ -701,7 +701,7 @@ func (am *DefaultAccountManager) GetPeer(accountID, peerID, userID string) (*nbp
}
// if admin or user owns this peer, return peer
if user.IsAdmin() || peer.UserID == userID {
if user.HasAdminPower() || peer.UserID == userID {
return peer, nil
}