mirror of
https://github.com/netbirdio/netbird.git
synced 2026-04-21 09:46:40 +00:00
Compare commits
7 Commits
send-ssh-r
...
test/abc2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
480e00ce43 | ||
|
|
01e88ed6ab | ||
|
|
be209e7841 | ||
|
|
7c22a4ba9b | ||
|
|
f86aa47933 | ||
|
|
aafa342786 | ||
|
|
042141db06 |
@@ -109,6 +109,7 @@ See a complete [architecture overview](https://docs.netbird.io/about-netbird/how
|
|||||||
- [NetBird installer script](https://github.com/physk/netbird-installer)
|
- [NetBird installer script](https://github.com/physk/netbird-installer)
|
||||||
- [NetBird ansible collection by Dominion Solutions](https://galaxy.ansible.com/ui/repo/published/dominion_solutions/netbird/)
|
- [NetBird ansible collection by Dominion Solutions](https://galaxy.ansible.com/ui/repo/published/dominion_solutions/netbird/)
|
||||||
|
|
||||||
|
|
||||||
**Note**: The `main` branch may be in an *unstable or even broken state* during development.
|
**Note**: The `main` branch may be in an *unstable or even broken state* during development.
|
||||||
For stable versions, see [releases](https://github.com/netbirdio/netbird/releases).
|
For stable versions, see [releases](https://github.com/netbirdio/netbird/releases).
|
||||||
|
|
||||||
@@ -124,3 +125,6 @@ We use open-source technologies like [WireGuard®](https://www.wireguard.com/),
|
|||||||
### Legal
|
### Legal
|
||||||
_WireGuard_ and the _WireGuard_ logo are [registered trademarks](https://www.wireguard.com/trademark-policy/) of Jason A. Donenfeld.
|
_WireGuard_ and the _WireGuard_ logo are [registered trademarks](https://www.wireguard.com/trademark-policy/) of Jason A. Donenfeld.
|
||||||
|
|
||||||
|
dddd
|
||||||
|
|
||||||
|
ccc
|
||||||
@@ -1361,6 +1361,8 @@ func (am *DefaultAccountManager) removeUserFromCache(accountID, userID string) e
|
|||||||
func (am *DefaultAccountManager) updateAccountDomainAttributes(account *Account, claims jwtclaims.AuthorizationClaims,
|
func (am *DefaultAccountManager) updateAccountDomainAttributes(account *Account, claims jwtclaims.AuthorizationClaims,
|
||||||
primaryDomain bool,
|
primaryDomain bool,
|
||||||
) error {
|
) error {
|
||||||
|
|
||||||
|
if claims.Domain != "" {
|
||||||
account.IsDomainPrimaryAccount = primaryDomain
|
account.IsDomainPrimaryAccount = primaryDomain
|
||||||
|
|
||||||
lowerDomain := strings.ToLower(claims.Domain)
|
lowerDomain := strings.ToLower(claims.Domain)
|
||||||
@@ -1372,6 +1374,9 @@ func (am *DefaultAccountManager) updateAccountDomainAttributes(account *Account,
|
|||||||
if account.Domain == lowerDomain {
|
if account.Domain == lowerDomain {
|
||||||
account.DomainCategory = claims.DomainCategory
|
account.DomainCategory = claims.DomainCategory
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
log.Errorf("claims don't contain a valid domain, skipping domain attributes update. Received claims: %v", claims)
|
||||||
|
}
|
||||||
|
|
||||||
err := am.Store.SaveAccount(account)
|
err := am.Store.SaveAccount(account)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user