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

Merge pull request #3493 from gravitl/v0.99_fixes

Browse source 
V0.99 fixes
This commit is contained in:
Abhishek K 2025-06-09 17:03:14 +05:30 • committed by GitHub
commit e3de513b92
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
logic/egress.go
View file

@ -39,16 +39,12 @@ func ValidateEgressReq(e *schema.Egress) error {
func DoesNodeHaveAccessToEgress(node *models.Node, e *schema.Egress, acls []models.Acl) bool { func DoesNodeHaveAccessToEgress(node *models.Node, e *schema.Egress, acls []models.Acl) bool {
nodeTags := maps.Clone(node.Tags) nodeTags := maps.Clone(node.Tags)
nodeTags[models.TagID(node.ID.String())] = struct{}{} nodeTags[models.TagID(node.ID.String())] = struct{}{}
nodeTags[models.TagID("*")] = struct{}{}
for _, acl := range acls { for _, acl := range acls {
if !acl.Enabled { if !acl.Enabled {
continue continue
} }
srcVal := ConvAclTagToValueMap(acl.Src) srcVal := ConvAclTagToValueMap(acl.Src)
if acl.AllowedDirection == models.TrafficDirectionBi {
if _, ok := srcVal["*"]; ok {
return true
}
}
for _, dstI := range acl.Dst { for _, dstI := range acl.Dst {
if dstI.ID == models.NodeTagID && dstI.Value == "*" { if dstI.ID == models.NodeTagID && dstI.Value == "*" {

4
logic/gateway.go
View file

@ -190,9 +190,7 @@ func CreateIngressGateway(netid string, nodeid string, ingress models.IngressReq
} }
node.IsIngressGateway = true node.IsIngressGateway = true
node.IsGw = true node.IsGw = true
if !servercfg.IsPro { node.IsInternetGateway = ingress.IsInternetGateway
node.IsInternetGateway = ingress.IsInternetGateway
}
node.IngressGatewayRange = network.AddressRange node.IngressGatewayRange = network.AddressRange
node.IngressGatewayRange6 = network.AddressRange6 node.IngressGatewayRange6 = network.AddressRange6
node.IngressDNS = ingress.ExtclientDNS node.IngressDNS = ingress.ExtclientDNS