gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-27 23:45:45 +08:00
Code Issues Projects Releases Packages Wiki Activity

fixed ee user pwd change err, fixed ee license free tier limit err

Browse source
This commit is contained in:
0xdcarns 2022-12-09 14:20:00 -05:00
parent 07a251fd0e
commit 8b49ea7fa5
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ee/initialize.go
View file

@ -48,6 +48,9 @@ func setControllerLimits() {
logic.Clients_Limit = Limits.Clients
logic.Free_Tier = Limits.FreeTier
servercfg.Is_EE = true
if logic.Free_Tier {
logic.Networks_Limit = 3
}
}
func resetFailover() {

1
ee/types.go
View file

@ -17,6 +17,7 @@ var Limits = GlobalLimits{
Users: 0,
Nodes: 0,
Clients: 0,
Networks: 0,
FreeTier: false,
}

3
logic/pro/networkuser.go
View file

@ -217,10 +217,9 @@ func IsUserClientAllowed(clients []models.ExtClient, network, userID, clientID s
// IsUserNetAdmin - checks if a user is a net admin or not
func IsUserNetAdmin(network, userID string) bool {
var isAdmin bool
user, err := GetNetworkUser(network, promodels.NetworkUserID(userID))
if err != nil {
return isAdmin
return false
}
return user.AccessLevel == NET_ADMIN
}

6
logic/security.go
View file

@ -159,10 +159,10 @@ func UserPermissions(reqAdmin bool, netname string, token string) ([]string, str
return []string{ALL_NETWORK_ACCESS}, username, nil
}
// check network admin access
if len(netname) > 0 && (!authenticateNetworkUser(netname, userNetworks) || len(userNetworks) == 0) {
if len(netname) > 0 && (len(userNetworks) == 0 || !authenticateNetworkUser(netname, userNetworks)) {
return nil, username, Unauthorized_Err
}
if isEE && !pro.IsUserNetAdmin(netname, username) {
if isEE && len(netname) > 0 && !pro.IsUserNetAdmin(netname, username) {
return nil, "", Unauthorized_Err
}
return userNetworks, username, nil
@ -181,7 +181,7 @@ func authenticateNetworkUser(network string, userNetworks []string) bool {
return StringSliceContains(userNetworks, network)
}
//Consider a more secure way of setting master key
// Consider a more secure way of setting master key
func authenticateDNSToken(tokenString string) bool {
tokens := strings.Split(tokenString, " ")
if len(tokens) < 2 {