sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-10-08 06:29:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

[management] Fix invalid port range sync (#3571)

Browse Source 
We should not send port range when a port is set or when protocol is all or icmp
This commit is contained in:
Maycon Santos
2025-03-24 00:56:51 +01:00
committed by GitHub
parent bd8f0c1ef3
commit 9cbcf7531f
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
management/server/policy.go
+11 -2
View File
@@ -255,15 +255,24 @@ func toProtocolFirewallRules(rules []*types.FirewallRule) []*proto.FirewallRule
for i := range rules { for i := range rules {
rule := rules[i] rule := rules[i]
result[i] = &proto.FirewallRule{ fwRule := &proto.FirewallRule{
PolicyID: []byte(rule.PolicyID), PolicyID: []byte(rule.PolicyID),
PeerIP: rule.PeerIP, PeerIP: rule.PeerIP,
Direction: getProtoDirection(rule.Direction), Direction: getProtoDirection(rule.Direction),
Action: getProtoAction(rule.Action), Action: getProtoAction(rule.Action),
Protocol: getProtoProtocol(rule.Protocol), Protocol: getProtoProtocol(rule.Protocol),
Port: rule.Port, Port: rule.Port,
PortInfo: rule.PortRange.ToProto(),
} }
if shouldUsePortRange(fwRule) {
fwRule.PortInfo = rule.PortRange.ToProto()
}
result[i] = fwRule
} }
return result return result
} }
func shouldUsePortRange(rule *proto.FirewallRule) bool {
return rule.Port == "" && (rule.Protocol == proto.RuleProtocol_UDP || rule.Protocol == proto.RuleProtocol_TCP)
}