extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2024-11-28 11:03:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Always lock the store when getting an account (#551)

Browse Source
This commit is contained in:
Misha Bragin 2022-11-07 19:09:22 +01:00 committed by GitHub
parent ed7ac81027
commit a768a0aa8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
management/server/file_store.go
View File

@ -181,6 +181,9 @@ func (s *FileStore) SaveAccount(account *Account) error {
// GetAccountByPrivateDomain returns account by private domain // GetAccountByPrivateDomain returns account by private domain
func (s *FileStore) GetAccountByPrivateDomain(domain string) (*Account, error) { func (s *FileStore) GetAccountByPrivateDomain(domain string) (*Account, error) {
s.mux.Lock()
defer s.mux.Unlock()
accountID, accountIDFound := s.PrivateDomain2AccountID[strings.ToLower(domain)] accountID, accountIDFound := s.PrivateDomain2AccountID[strings.ToLower(domain)]
if !accountIDFound { if !accountIDFound {
return nil, status.Errorf( return nil, status.Errorf(
@ -189,17 +192,20 @@ func (s *FileStore) GetAccountByPrivateDomain(domain string) (*Account, error) {
) )
} }
return s.GetAccount(accountID) return s.getAccount(accountID)
} }
// GetAccountBySetupKey returns account by setup key id // GetAccountBySetupKey returns account by setup key id
func (s *FileStore) GetAccountBySetupKey(setupKey string) (*Account, error) { func (s *FileStore) GetAccountBySetupKey(setupKey string) (*Account, error) {
s.mux.Lock()
defer s.mux.Unlock()
accountID, accountIDFound := s.SetupKeyID2AccountID[strings.ToUpper(setupKey)] accountID, accountIDFound := s.SetupKeyID2AccountID[strings.ToUpper(setupKey)]
if !accountIDFound { if !accountIDFound {
return nil, status.Errorf(codes.NotFound, "account not found: provided setup key doesn't exists") return nil, status.Errorf(codes.NotFound, "account not found: provided setup key doesn't exists")
} }
return s.GetAccount(accountID) return s.getAccount(accountID)
} }
// GetAllAccounts returns all accounts // GetAllAccounts returns all accounts
@ -213,8 +219,7 @@ func (s *FileStore) GetAllAccounts() (all []*Account) {
return all return all
} }
// GetAccount returns an account for id func (s *FileStore) getAccount(accountID string) (*Account, error) {
func (s *FileStore) GetAccount(accountID string) (*Account, error) {
account, accountFound := s.Accounts[accountID] account, accountFound := s.Accounts[accountID]
if !accountFound { if !accountFound {
return nil, status.Errorf(codes.NotFound, "account not found") return nil, status.Errorf(codes.NotFound, "account not found")
@ -223,6 +228,14 @@ func (s *FileStore) GetAccount(accountID string) (*Account, error) {
return account.Copy(), nil return account.Copy(), nil
} }
// GetAccount returns an account for ID
func (s *FileStore) GetAccount(accountID string) (*Account, error) {
s.mux.Lock()
defer s.mux.Unlock()
return s.getAccount(accountID)
}
// GetAccountByUser returns a user account // GetAccountByUser returns a user account
func (s *FileStore) GetAccountByUser(userID string) (*Account, error) { func (s *FileStore) GetAccountByUser(userID string) (*Account, error) {
s.mux.Lock() s.mux.Lock()
@ -233,7 +246,7 @@ func (s *FileStore) GetAccountByUser(userID string) (*Account, error) {
return nil, status.Errorf(codes.NotFound, "account not found") return nil, status.Errorf(codes.NotFound, "account not found")
} }
return s.GetAccount(accountID) return s.getAccount(accountID)
} }
// GetAccountByPeerPubKey returns an account for a given peer WireGuard public key // GetAccountByPeerPubKey returns an account for a given peer WireGuard public key
@ -246,7 +259,7 @@ func (s *FileStore) GetAccountByPeerPubKey(peerKey string) (*Account, error) {
return nil, status.Errorf(codes.NotFound, "Provided peer key doesn't exists %s", peerKey) return nil, status.Errorf(codes.NotFound, "Provided peer key doesn't exists %s", peerKey)
} }
return s.GetAccount(accountID) return s.getAccount(accountID)
} }
// GetInstallationID returns the installation ID from the store // GetInstallationID returns the installation ID from the store