portmap: ensure nftables backend only intercept local traffic

This aligns the behavior with the iptables backend.

Fixes 9296c5f
Fixes 01a94e1

Signed-off-by: Etienne Champetier <[email protected]>

Author: champtar

plugins/meta/portmap/portmap_nftables.go

@@ -123,14 +123,11 @@ func (pmNFT *portMapperNFTables) forwardPorts(config *PortMapConf, containerNet
 		Chain: "prerouting",
 		Rule: knftables.Concat(
 			conditions,
-			"jump", hostIPHostPortsChain,
-		),
-	})
-	tx.Add(&knftables.Rule{
-		Chain: "prerouting",
-		Rule: knftables.Concat(
-			conditions,
-			"jump", hostPortsChain,
+			"fib daddr type local",
+			"jump {",
+			"jump", hostIPHostPortsChain, ";",
+			"jump", hostPortsChain, ";",
+			"}",
 		),
 	})
 
@@ -143,19 +140,15 @@ func (pmNFT *portMapperNFTables) forwardPorts(config *PortMapConf, containerNet
 	tx.Flush(&knftables.Chain{
 		Name: "output",
 	})
-	tx.Add(&knftables.Rule{
-		Chain: "output",
-		Rule: knftables.Concat(
-			conditions,
-			"jump", hostIPHostPortsChain,
-		),
-	})
 	tx.Add(&knftables.Rule{
 		Chain: "output",
 		Rule: knftables.Concat(
 			conditions,
 			"fib daddr type local",
-			"jump", hostPortsChain,
+			"jump {",
+			"jump", hostIPHostPortsChain, ";",
+			"jump", hostPortsChain, ";",
+			"}",
 		),
 	})
 

plugins/meta/portmap/portmap_nftables_test.go

@@ -93,10 +93,8 @@ add rule ip cni_hostport hostports udp dport 8082 dnat to 10.0.0.2:82 comment "i
 add rule ip cni_hostport hostports tcp dport 8084 dnat to 10.0.0.2:84 comment "icee6giejonei6so"
 add rule ip cni_hostport masquerading ip saddr 10.0.0.2 ip daddr 10.0.0.2 masquerade comment "icee6giejonei6so"
 add rule ip cni_hostport masquerading ip saddr 127.0.0.1 ip daddr 10.0.0.2 masquerade comment "icee6giejonei6so"
-add rule ip cni_hostport output a b jump hostip_hostports
-add rule ip cni_hostport output a b fib daddr type local jump hostports
-add rule ip cni_hostport prerouting a b jump hostip_hostports
-add rule ip cni_hostport prerouting a b jump hostports
+add rule ip cni_hostport output a b fib daddr type local jump { jump hostip_hostports ; jump hostports ; }
+add rule ip cni_hostport prerouting a b fib daddr type local jump { jump hostip_hostports ; jump hostports ; }
 `)
 				actualRules := strings.TrimSpace(ipv4Fake.Dump())
 				Expect(actualRules).To(Equal(expectedRules))
@@ -121,10 +119,8 @@ add rule ip6 cni_hostport hostports tcp dport 8081 dnat to [2001:db8::2]:80 comm
 add rule ip6 cni_hostport hostports udp dport 8080 dnat to [2001:db8::2]:81 comment "icee6giejonei6so"
 add rule ip6 cni_hostport hostports udp dport 8082 dnat to [2001:db8::2]:82 comment "icee6giejonei6so"
 add rule ip6 cni_hostport hostports tcp dport 8086 dnat to [2001:db8::2]:86 comment "icee6giejonei6so"
-add rule ip6 cni_hostport output c d jump hostip_hostports
-add rule ip6 cni_hostport output c d fib daddr type local jump hostports
-add rule ip6 cni_hostport prerouting c d jump hostip_hostports
-add rule ip6 cni_hostport prerouting c d jump hostports
+add rule ip6 cni_hostport output c d fib daddr type local jump { jump hostip_hostports ; jump hostports ; }
+add rule ip6 cni_hostport prerouting c d fib daddr type local jump { jump hostip_hostports ; jump hostports ; }
 `)
 				actualRules = strings.TrimSpace(ipv6Fake.Dump())
 				Expect(actualRules).To(Equal(expectedRules))