fix interface in rules for host-in and host-out

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>

diff --git a/debian/example/host.fw b/debian/example/host.fw
index 04ab001583347cb55f99e42abb482c098d3a6b3b..96eacc6b9dcb5d61f49bae5f1300b3ebddec483b 100644 (file)
--- a/debian/example/host.fw
+++ b/debian/example/host.fw
@@ -22,5 +22,5 @@ tcpflags: 1
 
 [RULES]
 
-IN  SSH(ACCEPT) net0
-OUT SSH(ACCEPT) net0
+IN  SSH(ACCEPT) -
+OUT SSH(ACCEPT) -

diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index 62f0bcfa14ee29364eeb0ed693524b98d1ab3a0a..e291b85b040187e1a3bb3244f7932a29e97062c4 100644 (file)
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -1666,6 +1666,7 @@ sub enable_host_firewall {
     # add host rules first, so that cluster wide rules can be overwritten
     foreach my $rule (@$rules, @$cluster_rules) {
        next if $rule->{type} ne 'in';
+       $rule->{iface_in} = $rule->{iface} if $rule->{iface};
        ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" }, undef, $cluster_conf);
     }
 
@@ -1693,6 +1694,7 @@ sub enable_host_firewall {
     # add host rules first, so that cluster wide rules can be overwritten
     foreach my $rule (@$rules, @$cluster_rules) {
        next if $rule->{type} ne 'out';
+       $rule->{iface_out} = $rule->{iface} if $rule->{iface};
        ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" }, undef, $cluster_conf);
     }