diff options
| author | Daniil Baturin <daniil@vyos.io> | 2025-06-02 10:42:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-02 10:42:53 +0100 |
| commit | 474f367604c3f2471b295ab5702a103e62a41313 (patch) | |
| tree | b4145abede261cbd6b214346a04d77a12e2eea58 | |
| parent | b8cd453177feebc44aee53657bfd2bbcea7a8d66 (diff) | |
| parent | ba6f88830e3075c32438787fa897116e0233e086 (diff) | |
| download | vyos-1x-474f367604c3f2471b295ab5702a103e62a41313.tar.gz vyos-1x-474f367604c3f2471b295ab5702a103e62a41313.zip | |
Merge pull request #4539 from indrajitr/firewall-bridge-vlan-aware
T7512: firewall: Modify accepting invalid traffic for VLAN aware bridge
| -rwxr-xr-x | data/templates/firewall/nftables.j2 | 2 | ||||
| -rw-r--r-- | interface-definitions/include/firewall/global-options.xml.i | 2 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_firewall.py | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/data/templates/firewall/nftables.j2 b/data/templates/firewall/nftables.j2 index a78119a80..f5cd801e4 100755 --- a/data/templates/firewall/nftables.j2 +++ b/data/templates/firewall/nftables.j2 @@ -414,6 +414,8 @@ table bridge vyos_filter { {% if 'invalid_connections' in global_options.apply_to_bridged_traffic %} ct state invalid udp sport 67 udp dport 68 counter accept ct state invalid ether type arp counter accept + ct state invalid ether type 8021q counter accept + ct state invalid ether type 8021ad counter accept ct state invalid ether type 0x8864 counter accept {% endif %} {% endif %} diff --git a/interface-definitions/include/firewall/global-options.xml.i b/interface-definitions/include/firewall/global-options.xml.i index 7393ff5c9..01ea16bc6 100644 --- a/interface-definitions/include/firewall/global-options.xml.i +++ b/interface-definitions/include/firewall/global-options.xml.i @@ -51,7 +51,7 @@ <children> <leafNode name="invalid-connections"> <properties> - <help>Accept ARP, DHCP and PPPoE despite they are marked as invalid connection</help> + <help>Accept ARP, 802.1q, 802.1ad, DHCP and PPPoE despite being marked as invalid connections</help> <valueless/> </properties> </leafNode> diff --git a/smoketest/scripts/cli/test_firewall.py b/smoketest/scripts/cli/test_firewall.py index bbe4de9df..0b2287f74 100755 --- a/smoketest/scripts/cli/test_firewall.py +++ b/smoketest/scripts/cli/test_firewall.py @@ -783,6 +783,8 @@ class TestFirewall(VyOSUnitTestSHIM.TestCase): ['type filter hook output priority filter; policy accept;'], ['ct state invalid', 'udp sport 67', 'udp dport 68', 'accept'], ['ct state invalid', 'ether type arp', 'accept'], + ['ct state invalid', 'ether type 8021q', 'accept'], + ['ct state invalid', 'ether type 8021ad', 'accept'], ['ct state invalid', 'ether type 0x8864', 'accept'], ['chain VYOS_PREROUTING_filter'], ['type filter hook prerouting priority filter; policy accept;'], |