Firewall: Use `meta secpath exists` to match xfrm associations.

Marking incoming ESP packets and matching decapsulated packets doesn't
work with NAT traverslate (UDP encapsulation aka MOBIKE).

1 files changed, 12 insertions, 9 deletions

diff --git a/roles/common/templates/etc/nftables.conf.j2 b/roles/common/templates/etc/nftables.conf.j2
index 3104a4a..2261994 100755
--- a/roles/common/templates/etc/nftables.conf.j2
+++ b/roles/common/templates/etc/nftables.conf.j2
@@ -39,47 +39,49 @@ define out-tcp-ports = {
   , 2703    # Razor2
 {% endif %}
 }
 
 
 ###############################################################################
 
 flush ruleset
 
 table inet filter {
     # blackholes
     set fail2ban  { type ipv4_addr; timeout 10m; }
     set fail2ban6 { type ipv6_addr; timeout 10m; }
 
     chain input {
         type filter hook input priority 0
         policy drop
 
         iif lo accept
 
-        # XXX Bullseye: this is a hack for the lack of reqid matches in
-        # nftables: we mark the esp packet and accept after decapsulation
+        # XXX Bullseye: this is a rather crude match as nftables 0.9.0 lacks support for ipsec expressions
+        # to match match inbound resp. outbound policies and source resp. destination tunnel addresses.
         # https://serverfault.com/questions/971735/how-to-match-reqid-in-nftables
         # https://blog.fraggod.net/2016/09/25/nftables-re-injected-ipsec-matching-without-xt_policy.html
-        define IPsec.mark = 0x220
-        meta l4proto esp mark set mark | $IPsec.mark accept
-        ip saddr 172.16.0.0/24 ip daddr {{ ipsec[inventory_hostname_short] }} mark & $IPsec.mark == $IPsec.mark accept
+        # (We can't use marks to match post-ESP decapsulation here because that doesn't work well with UDP
+        # encapsulation.)
+        meta l4proto esp accept
+        # ipsec in ip saddr {{ ipsec_subnet }} ip daddr {{ ipsec[inventory_hostname_short] }} accept
+        ip saddr {{ ipsec_subnet }} ip daddr {{ ipsec[inventory_hostname_short] }} meta secpath exists accept
 
         # rate-limiting is done directly by the kernel (net.ipv4.icmp_{ratelimit,ratemask} runtime options)
         icmp   type { echo-reply, echo-request, destination-unreachable } counter accept
         icmpv6 type { echo-reply, echo-request, destination-unreachable,
                       packet-too-big, time-exceeded, parameter-problem } counter accept
 
         # accept neighbour discovery for autoconfiguration, RFC 4890 sec. 4.4.1
         icmpv6 type { 133,134,135,136,141,142 } ip6 hoplimit 255 counter accept
 
         jump martian
         jump invalid
 
         udp sport  123 udp dport  123 ct state     related,established accept
 {% if groups.all | length > 1 %}
         udp sport  500 udp dport  500 ct state new,related,established accept
 {% if groups.NATed | length > 0 %}
         udp sport 4500 udp dport 4500 ct state new,related,established accept
 {% endif %}
 {% endif %}
 
@@ -87,45 +89,46 @@ table inet filter {
         tcp sport 53 ct state related,established accept
 {% if 'dhclient' in group_names %}
         ip  version 4 udp sport  67 udp dport  68 ct state related,established accept
         ip6 version 6 udp sport 547 udp dport 546 ct state related,established accept
 {% endif %}
 
         meta l4proto tcp ip  saddr @fail2ban  counter drop
         meta l4proto tcp ip6 saddr @fail2ban6 counter drop
 
         tcp dport $in-tcp-ports  ct state related,established accept
         tcp dport $in-tcp-ports  ct state new counter accept
         tcp sport $out-tcp-ports ct state related,established accept
     }
 
     chain output {
         type filter hook output priority 0
         policy drop
 
         oif lo accept
 
-        # XXX Bullseye: unlike for input we can't use marks here,
-        # because by the time we see a packet to 172.16.0.0/24 we don't
-        # know if it'll be encapsulated
+        # XXX Bullseye: unlike for input we can't use marks or test for
+        # secpath existence here, because by the time we see a packet to
+        # 172.16.0.0/24 we don't know if it'll be encapsulated
         meta l4proto esp accept
-        ip saddr {{ ipsec[inventory_hostname_short] }} ip daddr 172.16.0.0/24 accept
+        # ipsec out ip saddr {{ ipsec[inventory_hostname_short] }} ip daddr {{ ipsec_subnet }} accept
+        ip saddr {{ ipsec[inventory_hostname_short] }} ip daddr {{ ipsec_subnet }} accept
 
         meta l4proto { icmp, icmpv6 } accept
 
         jump martian
         jump invalid
 
         udp sport  123 udp dport  123 ct state new,related,established accept
 {% if groups.all | length > 1 %}
         udp sport  500 udp dport  500 ct state new,related,established accept
 {% if groups.NATed | length > 0 %}
         udp sport 4500 udp dport 4500 ct state new,related,established accept
 {% endif %}
 {% endif %}
 
         udp dport 53 ct state new,related,established accept
         tcp dport 53 ct state new,related,established accept
 {% if 'dhclient' in group_names %}
         ip  version 4 udp sport  68 udp dport  67 ct state new,related,established accept
         ip6 version 6 udp sport 546 udp dport 547 ct state new,related,established accept
 {% endif %}