Merge pull request #3178 from gravitl/NET-1732

fix all networks user grp
gravitl · Nov 4, 2024 · 7dcc866 · 7dcc866
2 parents 3448d63 + c07b32d
commit 7dcc866
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/logic/acls.go b/logic/acls.go
@@ -292,7 +292,7 @@ func GetDefaultPolicy(netID models.NetworkID, ruleType models.AclPolicyType) (mo
 		}
 		if policy.RuleType == ruleType {
 			dstMap := convAclTagToValueMap(policy.Dst)
-			srcMap := convAclTagToValueMap(policy.Dst)
+			srcMap := convAclTagToValueMap(policy.Src)
 			if _, ok := srcMap["*"]; ok {
 				if _, ok := dstMap["*"]; ok {
 					return policy, nil

diff --git a/pro/logic/user_mgmt.go b/pro/logic/user_mgmt.go
@@ -640,13 +640,18 @@ func GetUserNetworkRolesWithRemoteVPNAccess(user models.User) (gwAccess map[mode
 	}
 	if _, ok := user.NetworkRoles[models.AllNetworks]; ok {
 		gwAccess[models.NetworkID("*")] = make(map[models.RsrcID]models.RsrcPermissionScope)
+		return
 	}
 	if len(user.UserGroups) > 0 {
 		for gID := range user.UserGroups {
 			userG, err := GetUserGroup(gID)
 			if err != nil {
 				continue
 			}
+			if _, ok := userG.NetworkRoles[models.AllNetworks]; ok {
+				gwAccess[models.NetworkID("*")] = make(map[models.RsrcID]models.RsrcPermissionScope)
+				return
+			}
 			for netID, roleMap := range userG.NetworkRoles {
 				for roleID := range roleMap {
 					role, err := logic.GetRole(roleID)