X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=blobdiff_plain;f=src%2FPVE%2FFirewall.pm;h=c946040404a2636812407013a684d6bea12fe2d7;hp=96cf9bd915b900ad73ecca18ebad22da62bcaebb;hb=c1031ab16cda7208eb161c891eceac31976a74b9;hpb=518f67dcda991c52fe6c033f913e9199eb40cd80 diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm index 96cf9bd..c946040 100644 --- a/src/PVE/Firewall.pm +++ b/src/PVE/Firewall.pm @@ -2,27 +2,28 @@ package PVE::Firewall; use warnings; use strict; -use POSIX; -use Data::Dumper; + use Digest::SHA; -use Socket qw(AF_INET6 inet_ntop inet_pton); -use PVE::INotify; -use PVE::Exception qw(raise raise_param_exc); -use PVE::JSONSchema qw(register_standard_option get_standard_option); -use PVE::Cluster; -use PVE::ProcFSTools; -use PVE::Tools qw($IPV4RE $IPV6RE); -use PVE::Network; -use PVE::SafeSyslog; +use Encode; use File::Basename; use File::Path; use IO::File; use Net::IP; -use PVE::Tools qw(run_command lock_file dir_glob_foreach); -use Encode; +use POSIX; +use Socket qw(AF_INET AF_INET6 inet_ntop inet_pton); use Storable qw(dclone); -my $hostfw_conf_filename = "/etc/pve/local/host.fw"; +use PVE::Cluster; +use PVE::Corosync; +use PVE::Exception qw(raise raise_param_exc); +use PVE::INotify; +use PVE::JSONSchema qw(register_standard_option get_standard_option); +use PVE::Network; +use PVE::ProcFSTools; +use PVE::SafeSyslog; +use PVE::Tools qw($IPV4RE $IPV6RE); +use PVE::Tools qw(run_command lock_file dir_glob_foreach); + my $pvefw_conf_dir = "/etc/pve/firewall"; my $clusterfw_conf_filename = "$pvefw_conf_dir/cluster.fw"; @@ -41,7 +42,6 @@ eval { $have_lxc = 1; }; - my $pve_fw_status_dir = "/var/lib/pve-firewall"; mkdir $pve_fw_status_dir; # make sure this exists @@ -127,10 +127,12 @@ eval { }; my $nodename = PVE::INotify::nodename(); +my $hostfw_conf_filename = "/etc/pve/nodes/$nodename/host.fw"; my $pve_fw_lock_filename = "/var/lock/pvefw.lck"; my $default_log_level = 'nolog'; # avoid logs by default +my $global_log_ratelimit = '--limit 1/sec'; my $log_level_hash = { debug => 7, @@ -143,6 +145,11 @@ my $log_level_hash = { emerg => 0, }; +my $verbose = 0; +sub set_verbose { + $verbose = shift; +} + # %rule # # name => optional @@ -423,7 +430,7 @@ my $pve_fw_macros = { ], 'Razor' => [ "Razor Antispam System", - { action => 'ACCEPT', proto => 'tcp', dport => '2703' }, + { action => 'PARAM', proto => 'tcp', dport => '2703' }, ], 'Rdate' => [ "Remote time retrieval (rdate)", @@ -660,14 +667,10 @@ $pve_std_chains_conf->{6} = { #{ action => 'DROP', dest => '224.0.0.0/4' }, ], 'PVEFW-reject' => [ - # same as shorewall 'reject' - #{ action => 'DROP', dsttype => 'BROADCAST' }, - #{ action => 'DROP', source => '224.0.0.0/4' }, { action => 'DROP', proto => 'icmpv6' }, { match => '-p tcp', target => '-j REJECT --reject-with tcp-reset' }, - #"-p udp -j REJECT --reject-with icmp-port-unreachable", - #"-p icmp -j REJECT --reject-with icmp-host-unreachable", - #"-j REJECT --reject-with icmp-host-prohibited", + { match => '-p udp', target => '-j REJECT --reject-with icmp6-port-unreachable' }, + { target => '-j REJECT --reject-with icmp6-adm-prohibited' }, ], 'PVEFW-Drop' => [ # same as shorewall 'Drop', which is equal to DROP, @@ -1049,12 +1052,13 @@ sub parse_port_name_number_or_range { my @elements = split(/,/, $str); die "extraneous commas in list\n" if $str ne join(',', @elements); foreach my $item (@elements) { - if ($item =~ m/^(\d+):(\d+)$/) { + if ($item =~ m/^([0-9]+):([0-9]+)$/) { $count += 2; my ($port1, $port2) = ($1, $2); die "invalid port '$port1'\n" if $port1 > 65535; die "invalid port '$port2'\n" if $port2 > 65535; - } elsif ($item =~ m/^(\d+)$/) { + die "backwards range '$port1:$port2' not allowed, did you mean '$port2:$port1'?\n" if $port1 > $port2; + } elsif ($item =~ m/^([0-9]+)$/) { $count += 1; my $port = $1; die "invalid port '$port'\n" if $port > 65535; @@ -1180,6 +1184,12 @@ our $cluster_option_properties = { minimum => 0, optional => 1, }, + ebtables => { + description => "Enable ebtables rules cluster wide.", + type => 'boolean', + default => 1, + optional => 1, + }, policy_in => { description => "Input policy.", type => 'string', @@ -1192,6 +1202,33 @@ our $cluster_option_properties = { optional => 1, enum => ['ACCEPT', 'REJECT', 'DROP'], }, + log_ratelimit => { + description => "Log ratelimiting settings", + type => 'string', format => { + enable => { + default_key => 1, + description => 'Enable or disable log rate limiting', + type => 'boolean', + default => '1', + }, + rate => { + type => 'string', + description => 'Frequency with which the burst bucket gets refilled', + optional => 1, + pattern => '[1-9][0-9]*\/(second|minute|hour|day)', + format_description => 'rate', + default => '1/second', + }, + burst => { + type => 'integer', + minimum => 0, + optional => 1, + description => 'Inital burst of packages which will get logged', + default => 5, + }, + }, + optional => 1, + }, }; our $host_option_properties = { @@ -1235,6 +1272,18 @@ our $host_option_properties = { type => 'boolean', optional => 1, }, + nf_conntrack_allow_invalid => { + description => "Allow invalid packets on connection tracking.", + type => 'boolean', + default => 0, + optional => 1, + }, + log_nf_conntrack => { + description => "Enable logging of conntrack information.", + type => 'boolean', + default => 0, + optional => 1 + }, }; our $vm_option_properties = { @@ -1350,6 +1399,9 @@ my $rule_properties = { minimum => 0, optional => 1, }, + log => get_standard_option('pve-fw-loglevel', { + description => "Log level for firewall rule.", + }), sport => { description => "Restrict TCP/UDP source port. $port_descr", type => 'string', format => 'pve-fw-sport-spec', @@ -1696,25 +1748,25 @@ sub enable_bridge_firewall { sub iptables_restore_cmdlist { my ($cmdlist) = @_; - run_command("/sbin/iptables-restore -n", input => $cmdlist, errmsg => "iptables_restore_cmdlist"); + run_command(['iptables-restore', '-n'], input => $cmdlist, errmsg => "iptables_restore_cmdlist"); } sub ip6tables_restore_cmdlist { my ($cmdlist) = @_; - run_command("/sbin/ip6tables-restore -n", input => $cmdlist, errmsg => "iptables_restore_cmdlist"); + run_command(['ip6tables-restore', '-n'], input => $cmdlist, errmsg => "iptables_restore_cmdlist"); } sub ipset_restore_cmdlist { my ($cmdlist) = @_; - run_command("/sbin/ipset restore", input => $cmdlist, errmsg => "ipset_restore_cmdlist"); + run_command(['ipset restore'], input => $cmdlist, errmsg => "ipset_restore_cmdlist"); } sub ebtables_restore_cmdlist { my ($cmdlist) = @_; - run_command("/sbin/ebtables-restore", input => $cmdlist, errmsg => "ebtables_restore_cmdlist"); + run_command(['ebtables-restore'], input => $cmdlist, errmsg => "ebtables_restore_cmdlist"); } sub iptables_get_chains { @@ -1773,7 +1825,7 @@ sub iptables_get_chains { } }; - run_command("/sbin/$iptablescmd-save", outfunc => $parser); + run_command(["$iptablescmd-save"], outfunc => $parser); return wantarray ? ($res, $hooks) : $res; } @@ -1817,7 +1869,7 @@ sub ipset_get_chains { } }; - run_command("/sbin/ipset save", outfunc => $parser); + run_command(['ipset', 'save'], outfunc => $parser); # compute digest for each chain foreach my $chain (keys %$chains) { @@ -1831,7 +1883,6 @@ sub ebtables_get_chains { my $res = {}; my $chains = {}; - my $parser = sub { my $line = shift; return if $line =~ m/^#/; @@ -1839,15 +1890,7 @@ sub ebtables_get_chains { if ($line =~ m/^:(\S+)\s\S+$/) { # Make sure we know chains exist even if they're empty. $chains->{$1} //= []; - } elsif ($line =~ m/^(?:\S+)\s(PVEFW-\S+)\s(?:\S+).*/) { - my $chain = $1; - $line =~ s/\s+$//; - push @{$chains->{$chain}}, $line; - } elsif ($line =~ m/^(?:\S+)\s(tap\d+i\d+-(:?IN|OUT))\s(?:\S+).*/) { - my $chain = $1; - $line =~ s/\s+$//; - push @{$chains->{$chain}}, $line; - } elsif ($line =~ m/^(?:\S+)\s(veth\d+i\d+-(:?IN|OUT))\s(?:\S+).*/) { + } elsif ($line =~ m/^(?:\S+)\s(\S+)\s(?:\S+).*/) { my $chain = $1; $line =~ s/\s+$//; push @{$chains->{$chain}}, $line; @@ -1857,11 +1900,11 @@ sub ebtables_get_chains { } }; - run_command("/sbin/ebtables-save", outfunc => $parser); - - # compute digest for each chain + run_command(['ebtables-save'], outfunc => $parser); + # compute digest for each chain and store rules as well foreach my $chain (keys %$chains) { - $res->{$chain} = iptables_chain_digest($chains->{$chain}); + $res->{$chain}->{rules} = $chains->{$chain}; + $res->{$chain}->{sig} = iptables_chain_digest($chains->{$chain}); } return $res; } @@ -2004,8 +2047,10 @@ sub ipt_rule_to_cmds { } my @iptcmds; - if (defined $rule->{log} && $rule->{log}) { - my $logaction = get_log_rule_base($chain, $vmid, $rule->{logmsg}, $rule->{log}); + my $log = $rule->{log}; + if (defined($log) && $log ne 'nolog') { + my $loglevel = $log_level_hash->{$log}; + my $logaction = get_log_rule_base($chain, $vmid, $rule->{logmsg}, $loglevel); push @iptcmds, "-A $chain $matchstr $logaction"; } push @iptcmds, "-A $chain $matchstr $targetstr"; @@ -2013,7 +2058,7 @@ sub ipt_rule_to_cmds { } sub ruleset_generate_rule { - my ($ruleset, $chain, $ipversion, $rule, $cluster_conf, $fw_conf) = @_; + my ($ruleset, $chain, $ipversion, $rule, $cluster_conf, $fw_conf, $vmid) = @_; my $rules; @@ -2026,7 +2071,7 @@ sub ruleset_generate_rule { # update all or nothing my @ipt_rule_cmds; foreach my $r (@$rules) { - push @ipt_rule_cmds, ipt_rule_to_cmds($r, $chain, $ipversion, $cluster_conf, $fw_conf); + push @ipt_rule_cmds, ipt_rule_to_cmds($r, $chain, $ipversion, $cluster_conf, $fw_conf, $vmid); } foreach my $c (@ipt_rule_cmds) { ruleset_add_ipt_cmd($ruleset, $chain, $c); @@ -2060,17 +2105,18 @@ sub ruleset_add_ipt_cmd { } sub ruleset_addrule { - my ($ruleset, $chain, $match, $action, $log, $logmsg, $vmid) = @_; + my ($ruleset, $chain, $match, $action, $log, $logmsg, $vmid) = @_; - die "no such chain '$chain'\n" if !$ruleset->{$chain}; + die "no such chain '$chain'\n" if !$ruleset->{$chain}; - if (defined($log) && $log) { - my $logaction = get_log_rule_base($chain, $vmid, $logmsg, $log); + if ($log) { + my $loglevel = $log_level_hash->{$log}; + my $logaction = get_log_rule_base($chain, $vmid, $logmsg, $loglevel); push @{$ruleset->{$chain}}, "-A $chain $match $logaction"; - } - # for stable ebtables digests avoid double-spaces to match ebtables-save output - $match .= ' ' if length($match); - push @{$ruleset->{$chain}}, "-A $chain ${match}$action"; + } + # for stable ebtables digests avoid double-spaces to match ebtables-save output + $match .= ' ' if length($match); + push @{$ruleset->{$chain}}, "-A $chain ${match}$action"; } sub ruleset_insertrule { @@ -2087,10 +2133,14 @@ sub get_log_rule_base { $vmid = 0 if !defined($vmid); $msg = "" if !defined($msg); + my $rlimit = ''; + if (defined($global_log_ratelimit)) { + $rlimit = "-m limit $global_log_ratelimit "; + } + # Note: we use special format for prefix to pass further # info to log daemon (VMID, LOGLEVEL and CHAIN) - - return "-j NFLOG --nflog-prefix \":$vmid:$loglevel:$chain: $msg\""; + return "${rlimit}-j NFLOG --nflog-prefix \":$vmid:$loglevel:$chain: $msg\""; } sub ruleset_add_chain_policy { @@ -2110,7 +2160,7 @@ sub ruleset_add_chain_policy { } elsif ($policy eq 'REJECT') { ruleset_addrule($ruleset, $chain, "", "-j PVEFW-Reject"); - ruleset_addrule($ruleset, $chain, "", "-g PVEFW-reject", $loglevel, "policy $policy:", $vmid); + ruleset_addrule($ruleset, $chain, "", "-g PVEFW-reject", $loglevel, "policy $policy: ", $vmid); } else { # should not happen die "internal error: unknown policy '$policy'"; @@ -2130,9 +2180,11 @@ sub ruleset_chain_add_ndp { } sub ruleset_chain_add_conn_filters { - my ($ruleset, $chain, $accept) = @_; + my ($ruleset, $chain, $allow_invalid, $accept) = @_; - ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate INVALID", "-j DROP"); + if (!$allow_invalid) { + ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate INVALID", "-j DROP"); + } ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate RELATED,ESTABLISHED", "-j $accept"); } @@ -2142,7 +2194,7 @@ sub ruleset_chain_add_input_filters { if ($cluster_conf->{ipset}->{blacklist}){ if (!ruleset_chain_exist($ruleset, "PVEFW-blacklist")) { ruleset_create_chain($ruleset, "PVEFW-blacklist"); - ruleset_addrule($ruleset, "PVEFW-blacklist", "", "-j DROP", $loglevel, "DROP: "); + ruleset_addrule($ruleset, "PVEFW-blacklist", "", "-j DROP", $loglevel, "DROP: ", 0); } my $ipset_chain = compute_ipset_chain_name(0, 'blacklist', $ipversion); ruleset_addrule($ruleset, $chain, "-m set --match-set ${ipset_chain} src", "-j PVEFW-blacklist"); @@ -2228,7 +2280,7 @@ sub ruleset_add_group_rule { } sub ruleset_generate_vm_rules { - my ($ruleset, $rules, $cluster_conf, $vmfw_conf, $chain, $netid, $direction, $options, $ipversion) = @_; + my ($ruleset, $rules, $cluster_conf, $vmfw_conf, $chain, $netid, $direction, $options, $ipversion, $vmid) = @_; my $lc_direction = lc($direction); @@ -2245,12 +2297,13 @@ sub ruleset_generate_vm_rules { } else { next if $rule->{type} ne $lc_direction; eval { + $rule->{logmsg} = "$rule->{action}: "; if ($direction eq 'OUT') { rule_substitude_action($rule, { ACCEPT => "PVEFW-SET-ACCEPT-MARK", REJECT => "PVEFW-reject" }); - ruleset_generate_rule($ruleset, $chain, $ipversion, $rule, $cluster_conf, $vmfw_conf); + ruleset_generate_rule($ruleset, $chain, $ipversion, $rule, $cluster_conf, $vmfw_conf, $vmid); } else { rule_substitude_action($rule, { ACCEPT => $in_accept , REJECT => "PVEFW-reject" }); - ruleset_generate_rule($ruleset, $chain, $ipversion, $rule, $cluster_conf, $vmfw_conf); + ruleset_generate_rule($ruleset, $chain, $ipversion, $rule, $cluster_conf, $vmfw_conf, $vmid); } }; warn $@ if $@; @@ -2311,7 +2364,7 @@ sub generate_tap_rules_direction { ruleset_create_vm_chain($ruleset, $tapchain, $ipversion, $options, $macaddr, $ipfilter_ipset, $direction); if ($options->{enable}) { - ruleset_generate_vm_rules($ruleset, $rules, $cluster_conf, $vmfw_conf, $tapchain, $netid, $direction, $options, $ipversion); + ruleset_generate_vm_rules($ruleset, $rules, $cluster_conf, $vmfw_conf, $tapchain, $netid, $direction, $options, $ipversion, $vmid); ruleset_generate_vm_ipsrules($ruleset, $options, $direction, $iface); @@ -2321,7 +2374,7 @@ sub generate_tap_rules_direction { if ($direction eq 'OUT') { $policy = $options->{policy_out} || 'ACCEPT'; # allow everything by default } else { - $policy = $options->{policy_in} || 'DROP'; # allow nothing by default + $policy = $options->{policy_in} || 'DROP'; # allow nothing by default } my $accept = generate_nfqueue($options); @@ -2343,13 +2396,32 @@ sub generate_tap_rules_direction { } sub enable_host_firewall { - my ($ruleset, $hostfw_conf, $cluster_conf, $ipversion) = @_; + my ($ruleset, $hostfw_conf, $cluster_conf, $ipversion, $corosync_conf) = @_; my $options = $hostfw_conf->{options}; my $cluster_options = $cluster_conf->{options}; my $rules = $hostfw_conf->{rules}; my $cluster_rules = $cluster_conf->{rules}; + # corosync preparation + my $corosync_rule = "-p udp --dport 5404:5405"; + my $corosync_local_addresses = {}; + my $multicast_enabled; + my $local_hostname = PVE::INotify::nodename(); + if (defined($corosync_conf)) { + PVE::Corosync::for_all_corosync_addresses($corosync_conf, $ipversion, sub { + my ($node_name, $node_ip, $node_ipversion, $key) = @_; + + if ($node_name eq $local_hostname) { + $corosync_local_addresses->{$key} = $node_ip; + } + }); + + # allow multicast only if enabled in config + my $corosync_transport = $corosync_conf->{main}->{totem}->{transport}; + $multicast_enabled = defined($corosync_transport) && $corosync_transport eq 'udp'; + } + # host inbound firewall my $chain = "PVEFW-HOST-IN"; ruleset_create_chain($ruleset, $chain); @@ -2358,7 +2430,7 @@ sub enable_host_firewall { ruleset_addrule($ruleset, $chain, "-i lo", "-j ACCEPT"); - ruleset_chain_add_conn_filters($ruleset, $chain, 'ACCEPT'); + ruleset_chain_add_conn_filters($ruleset, $chain, 0, 'ACCEPT'); ruleset_chain_add_ndp($ruleset, $chain, $ipversion, $options, 'IN', '-j RETURN'); ruleset_chain_add_input_filters($ruleset, $chain, $ipversion, $options, $cluster_conf, $loglevel); @@ -2379,7 +2451,7 @@ sub enable_host_firewall { ruleset_add_group_rule($ruleset, $cluster_conf, $chain, $rule, 'IN', $accept_action, $ipversion); } elsif ($rule->{type} eq 'in') { rule_substitude_action($rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" }); - ruleset_generate_rule($ruleset, $chain, $ipversion, $rule, $cluster_conf, $hostfw_conf); + ruleset_generate_rule($ruleset, $chain, $ipversion, $rule, $cluster_conf, $hostfw_conf, 0); } }; warn $@ if $@; @@ -2394,14 +2466,20 @@ sub enable_host_firewall { ruleset_addrule($ruleset, $chain, "$mngmntsrc -p tcp --dport 3128", "-j $accept_action"); # SPICE Proxy ruleset_addrule($ruleset, $chain, "$mngmntsrc -p tcp --dport 22", "-j $accept_action"); # SSH - my $localnet = $cluster_conf->{aliases}->{local_network}->{cidr}; - my $localnet_ver = $cluster_conf->{aliases}->{local_network}->{ipversion}; + # corosync inbound rules + if (defined($corosync_conf)) { + ruleset_addrule($ruleset, $chain, "-m addrtype --dst-type MULTICAST $corosync_rule", "-j $accept_action") + if $multicast_enabled; - # corosync - if ($localnet && ($ipversion == $localnet_ver)) { - my $corosync_rule = "-p udp --dport 5404:5405"; - ruleset_addrule($ruleset, $chain, "-s $localnet -d $localnet $corosync_rule", "-j $accept_action"); - ruleset_addrule($ruleset, $chain, "-s $localnet -m addrtype --dst-type MULTICAST $corosync_rule", "-j $accept_action"); + PVE::Corosync::for_all_corosync_addresses($corosync_conf, $ipversion, sub { + my ($node_name, $node_ip, $node_ipversion, $key) = @_; + my $destination = $corosync_local_addresses->{$key}; + + if ($node_name ne $local_hostname && defined($destination)) { + # accept only traffic on same ring + ruleset_addrule($ruleset, $chain, "-d $destination -s $node_ip $corosync_rule", "-j $accept_action"); + } + }); } # implement input policy @@ -2416,7 +2494,7 @@ sub enable_host_firewall { ruleset_addrule($ruleset, $chain, "-o lo", "-j ACCEPT"); - ruleset_chain_add_conn_filters($ruleset, $chain, 'ACCEPT'); + ruleset_chain_add_conn_filters($ruleset, $chain, 0, 'ACCEPT'); # we use RETURN because we may want to check other thigs later $accept_action = 'RETURN'; @@ -2431,11 +2509,12 @@ sub enable_host_firewall { $rule->{iface_out} = $rule->{iface} if $rule->{iface}; eval { + $rule->{logmsg} = "$rule->{action}: "; if ($rule->{type} eq 'group') { ruleset_add_group_rule($ruleset, $cluster_conf, $chain, $rule, 'OUT', $accept_action, $ipversion); } elsif ($rule->{type} eq 'out') { rule_substitude_action($rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" }); - ruleset_generate_rule($ruleset, $chain, $ipversion, $rule, $cluster_conf, $hostfw_conf); + ruleset_generate_rule($ruleset, $chain, $ipversion, $rule, $cluster_conf, $hostfw_conf, 0); } }; warn $@ if $@; @@ -2443,15 +2522,30 @@ sub enable_host_firewall { } # allow standard traffic on cluster network + my $localnet = $cluster_conf->{aliases}->{local_network}->{cidr}; + my $localnet_ver = $cluster_conf->{aliases}->{local_network}->{ipversion}; + if ($localnet && ($ipversion == $localnet_ver)) { ruleset_addrule($ruleset, $chain, "-d $localnet -p tcp --dport 8006", "-j $accept_action"); # PVE API ruleset_addrule($ruleset, $chain, "-d $localnet -p tcp --dport 22", "-j $accept_action"); # SSH ruleset_addrule($ruleset, $chain, "-d $localnet -p tcp --dport 5900:5999", "-j $accept_action"); # PVE VNC Console ruleset_addrule($ruleset, $chain, "-d $localnet -p tcp --dport 3128", "-j $accept_action"); # SPICE Proxy + } + + # corosync outbound rules + if (defined($corosync_conf)) { + ruleset_addrule($ruleset, $chain, "-m addrtype --dst-type MULTICAST $corosync_rule", "-j $accept_action") + if $multicast_enabled; - my $corosync_rule = "-p udp --dport 5404:5405"; - ruleset_addrule($ruleset, $chain, "-d $localnet $corosync_rule", "-j $accept_action"); - ruleset_addrule($ruleset, $chain, "-m addrtype --dst-type MULTICAST $corosync_rule", "-j $accept_action"); + PVE::Corosync::for_all_corosync_addresses($corosync_conf, $ipversion, sub { + my ($node_name, $node_ip, $node_ipversion, $key) = @_; + my $source = $corosync_local_addresses->{$key}; + + if ($node_name ne $local_hostname && defined($source)) { + # accept only traffic on same ring + ruleset_addrule($ruleset, $chain, "-s $source -d $node_ip $corosync_rule", "-j $accept_action"); + } + }); } # implement output policy @@ -2516,7 +2610,7 @@ sub get_mark_values { } sub parse_fw_rule { - my ($prefix, $line, $cluster_conf, $fw_conf, $rule_env, $verbose) = @_; + my ($prefix, $line, $cluster_conf, $fw_conf, $rule_env) = @_; my $orig_line = $line; @@ -2574,6 +2668,10 @@ sub parse_fw_rule { $rule->{dest} = $1; next; } + if ($line =~ s/^-log (emerg|alert|crit|err|warning|notice|info|debug|nolog)\s*//) { + $rule->{log} = $1; + next; + } last; } @@ -2640,7 +2738,7 @@ sub parse_hostfw_option { my $loglevels = "emerg|alert|crit|err|warning|notice|info|debug|nolog"; - if ($line =~ m/^(enable|nosmurfs|tcpflags|ndp):\s*(0|1)\s*$/i) { + if ($line =~ m/^(enable|nosmurfs|tcpflags|ndp|log_nf_conntrack|nf_conntrack_allow_invalid):\s*(0|1)\s*$/i) { $opt = lc($1); $value = int($2); } elsif ($line =~ m/^(log_level_in|log_level_out|tcp_flags_log_level|smurf_log_level):\s*(($loglevels)\s*)?$/i) { @@ -2667,9 +2765,15 @@ sub parse_clusterfw_option { if (($value > 1) && ((time() - $value) > 60)) { $value = 0 } + } elsif ($line =~ m/^(ebtables):\s*(0|1)\s*$/i) { + $opt = lc($1); + $value = int($2); } elsif ($line =~ m/^(policy_(in|out)):\s*(ACCEPT|DROP|REJECT)\s*$/i) { $opt = lc($1); $value = uc($3); + } elsif ($line =~ m/^(log_ratelimit):\s*(\S+)\s*$/) { + $opt = lc($1); + $value = $2; } else { die "can't parse option '$line'\n" } @@ -2732,20 +2836,29 @@ sub parse_alias { } sub generic_fw_config_parser { - my ($filename, $fh, $verbose, $cluster_conf, $empty_conf, $rule_env) = @_; + my ($filename, $cluster_conf, $empty_conf, $rule_env) = @_; my $section; my $group; my $res = $empty_conf; - while (defined(my $line = <$fh>)) { + my $raw; + if ($filename =~ m!^/etc/pve/(.*)$!) { + $raw = PVE::Cluster::get_config($1); + } else { + $raw = eval { PVE::Tools::file_get_contents($filename) }; # ignore errors + } + return {} if !$raw; + + my $linenr = 0; + while ($raw =~ /^\h*(.*?)\h*$/gm) { + my $line = $1; + $linenr++; next if $line =~ m/^#/; next if $line =~ m/^\s*$/; - chomp $line; - my $linenr = $fh->input_line_number(); my $prefix = "$filename (line $linenr)"; if ($empty_conf->{options} && ($line =~ m/^\[options\]$/i)) { @@ -2829,7 +2942,7 @@ sub generic_fw_config_parser { warn "$prefix: $@" if $@; } elsif ($section eq 'rules') { my $rule; - eval { $rule = parse_fw_rule($prefix, $line, $cluster_conf, $res, $rule_env, $verbose); }; + eval { $rule = parse_fw_rule($prefix, $line, $cluster_conf, $res, $rule_env); }; if (my $err = $@) { warn "$prefix: $err"; next; @@ -2837,7 +2950,7 @@ sub generic_fw_config_parser { push @{$res->{$section}}, $rule; } elsif ($section eq 'groups') { my $rule; - eval { $rule = parse_fw_rule($prefix, $line, $cluster_conf, undef, 'group', $verbose); }; + eval { $rule = parse_fw_rule($prefix, $line, $cluster_conf, undef, 'group'); }; if (my $err = $@) { warn "$prefix: $err"; next; @@ -2894,47 +3007,6 @@ sub generic_fw_config_parser { return $res; } -sub parse_hostfw_config { - my ($filename, $fh, $cluster_conf, $verbose) = @_; - - my $empty_conf = { rules => [], options => {}}; - - return generic_fw_config_parser($filename, $fh, $verbose, $cluster_conf, $empty_conf, 'host'); -} - -sub parse_vmfw_config { - my ($filename, $fh, $cluster_conf, $rule_env, $verbose) = @_; - - my $empty_conf = { - rules => [], - options => {}, - aliases => {}, - ipset => {} , - ipset_comments => {}, - }; - - return generic_fw_config_parser($filename, $fh, $verbose, $cluster_conf, $empty_conf, $rule_env); -} - -sub parse_clusterfw_config { - my ($filename, $fh, $verbose) = @_; - - my $section; - my $group; - - my $empty_conf = { - rules => [], - options => {}, - aliases => {}, - groups => {}, - group_comments => {}, - ipset => {} , - ipset_comments => {}, - }; - - return generic_fw_config_parser($filename, $fh, $verbose, $empty_conf, $empty_conf, 'cluster'); -} - sub run_locked { my ($code, @param) = @_; @@ -2984,17 +3056,21 @@ sub read_local_vm_config { }; sub load_vmfw_conf { - my ($cluster_conf, $rule_env, $vmid, $dir, $verbose) = @_; - - my $vmfw_conf = {}; + my ($cluster_conf, $rule_env, $vmid, $dir) = @_; $dir = $pvefw_conf_dir if !defined($dir); - my $filename = "$dir/$vmid.fw"; - if (my $fh = IO::File->new($filename, O_RDONLY)) { - $vmfw_conf = parse_vmfw_config($filename, $fh, $cluster_conf, $rule_env, $verbose); - $vmfw_conf->{vmid} = $vmid; - } + + my $empty_conf = { + rules => [], + options => {}, + aliases => {}, + ipset => {} , + ipset_comments => {}, + }; + + my $vmfw_conf = generic_fw_config_parser($filename, $cluster_conf, $empty_conf, $rule_env); + $vmfw_conf->{vmid} = $vmid; return $vmfw_conf; } @@ -3023,6 +3099,7 @@ my $format_rules = sub { $raw .= " -p $rule->{proto}" if $rule->{proto}; $raw .= " -dport $rule->{dport}" if $rule->{dport}; $raw .= " -sport $rule->{sport}" if $rule->{sport}; + $raw .= " -log $rule->{log}" if $rule->{log}; } $raw .= " # " . encode('utf8', $rule->{comment}) @@ -3155,17 +3232,17 @@ sub clone_vmfw_conf { } sub read_vm_firewall_configs { - my ($cluster_conf, $vmdata, $dir, $verbose) = @_; + my ($cluster_conf, $vmdata, $dir) = @_; my $vmfw_configs = {}; foreach my $vmid (keys %{$vmdata->{qemu}}) { - my $vmfw_conf = load_vmfw_conf($cluster_conf, 'vm', $vmid, $dir, $verbose); + my $vmfw_conf = load_vmfw_conf($cluster_conf, 'vm', $vmid, $dir); next if !$vmfw_conf->{options}; # skip if file does not exists $vmfw_configs->{$vmid} = $vmfw_conf; } foreach my $vmid (keys %{$vmdata->{lxc}}) { - my $vmfw_conf = load_vmfw_conf($cluster_conf, 'ct', $vmid, $dir, $verbose); + my $vmfw_conf = load_vmfw_conf($cluster_conf, 'ct', $vmid, $dir); next if !$vmfw_conf->{options}; # skip if file does not exists $vmfw_configs->{$vmid} = $vmfw_conf; } @@ -3181,9 +3258,7 @@ sub get_option_log_level { return undef if $v eq '' || $v eq 'nolog'; - $v = $log_level_hash->{$v} if defined($log_level_hash->{$v}); - - return $v if ($v >= 0) && ($v <= 7); + return $v if defined($log_level_hash->{$v}); warn "unknown log level ($k = '$v')\n"; @@ -3216,7 +3291,7 @@ sub generate_std_chains { ruleset_create_chain($ruleset, $chain); foreach my $rule (@{$std_chains->{$chain}}) { if (ref($rule)) { - ruleset_generate_rule($ruleset, $chain, $ipversion, $rule); + ruleset_generate_rule($ruleset, $chain, $ipversion, $rule, 0); } else { die "rule $rule as string - should not happen"; } @@ -3306,15 +3381,43 @@ sub round_powerof2 { return ++$int; } +my $set_global_log_ratelimit = sub { + my $cluster_opts = shift; + + $global_log_ratelimit = '--limit 1/sec'; + if (defined(my $log_rlimit = $cluster_opts->{log_ratelimit})) { + my $ll_format = $cluster_option_properties->{log_ratelimit}->{format}; + my $limit = PVE::JSONSchema::parse_property_string($ll_format, $log_rlimit); + + if ($limit->{enable}) { + if (my $rate = $limit->{rate}) { + $global_log_ratelimit = "--limit $rate"; + } + if (my $burst = $limit->{burst}) { + $global_log_ratelimit .= " --limit-burst $burst"; + } + } else { + $global_log_ratelimit = undef; + } + } +}; + sub load_clusterfw_conf { - my ($filename, $verbose) = @_; + my ($filename) = @_; $filename = $clusterfw_conf_filename if !defined($filename); + my $empty_conf = { + rules => [], + options => {}, + aliases => {}, + groups => {}, + group_comments => {}, + ipset => {} , + ipset_comments => {}, + }; - my $cluster_conf = {}; - if (my $fh = IO::File->new($filename, O_RDONLY)) { - $cluster_conf = parse_clusterfw_config($filename, $fh, $verbose); - } + my $cluster_conf = generic_fw_config_parser($filename, $empty_conf, $empty_conf, 'cluster'); + $set_global_log_ratelimit->($cluster_conf->{options}); return $cluster_conf; } @@ -3363,15 +3466,12 @@ sub save_clusterfw_conf { } sub load_hostfw_conf { - my ($cluster_conf, $filename, $verbose) = @_; + my ($cluster_conf, $filename) = @_; $filename = $hostfw_conf_filename if !defined($filename); - my $hostfw_conf = {}; - if (my $fh = IO::File->new($filename, O_RDONLY)) { - $hostfw_conf = parse_hostfw_config($filename, $fh, $cluster_conf, $verbose); - } - return $hostfw_conf; + my $empty_conf = { rules => [], options => {}}; + return generic_fw_config_parser($filename, $cluster_conf, $empty_conf, 'host'); } sub save_hostfw_conf { @@ -3397,7 +3497,7 @@ sub save_hostfw_conf { } sub compile { - my ($cluster_conf, $hostfw_conf, $vmdata, $verbose) = @_; + my ($cluster_conf, $hostfw_conf, $vmdata, $corosync_conf) = @_; my $vmfw_configs; @@ -3407,22 +3507,26 @@ sub compile { if ($vmdata) { # test mode my $testdir = $vmdata->{testdir} || die "no test directory specified"; my $filename = "$testdir/cluster.fw"; - $cluster_conf = load_clusterfw_conf($filename, $verbose); + $cluster_conf = load_clusterfw_conf($filename); $filename = "$testdir/host.fw"; - $hostfw_conf = load_hostfw_conf($cluster_conf, $filename, $verbose); + $hostfw_conf = load_hostfw_conf($cluster_conf, $filename); - $vmfw_configs = read_vm_firewall_configs($cluster_conf, $vmdata, $testdir, $verbose); + $vmfw_configs = read_vm_firewall_configs($cluster_conf, $vmdata, $testdir); } else { # normal operation - $cluster_conf = load_clusterfw_conf(undef, $verbose) if !$cluster_conf; + $cluster_conf = load_clusterfw_conf(undef) if !$cluster_conf; + + $hostfw_conf = load_hostfw_conf($cluster_conf, undef) if !$hostfw_conf; - $hostfw_conf = load_hostfw_conf($cluster_conf, undef, $verbose) if !$hostfw_conf; + # cfs_update is handled by daemon or API + $corosync_conf = PVE::Cluster::cfs_read_file("corosync.conf") + if !defined($corosync_conf) && PVE::Corosync::check_conf_exists(1); $vmdata = read_local_vm_config(); - $vmfw_configs = read_vm_firewall_configs($cluster_conf, $vmdata, undef, $verbose); + $vmfw_configs = read_vm_firewall_configs($cluster_conf, $vmdata, undef); } - return ({},{},{}) if !$cluster_conf->{options}->{enable}; + return ({},{},{},{}) if !$cluster_conf->{options}->{enable}; my $localnet; if ($cluster_conf->{aliases}->{local_network}) { @@ -3431,22 +3535,22 @@ sub compile { my $localnet_ver; ($localnet, $localnet_ver) = parse_ip_or_cidr(local_network() || '127.0.0.0/8'); - $cluster_conf->{aliases}->{local_network} = { + $cluster_conf->{aliases}->{local_network} = { name => 'local_network', cidr => $localnet, ipversion => $localnet_ver }; } push @{$cluster_conf->{ipset}->{management}}, { cidr => $localnet }; - my $ruleset = compile_iptables_filter($cluster_conf, $hostfw_conf, $vmfw_configs, $vmdata, 4, $verbose); - my $rulesetv6 = compile_iptables_filter($cluster_conf, $hostfw_conf, $vmfw_configs, $vmdata, 6, $verbose); - my $ebtables_ruleset = compile_ebtables_filter($cluster_conf, $hostfw_conf, $vmfw_configs, $vmdata, $verbose); + my $ruleset = compile_iptables_filter($cluster_conf, $hostfw_conf, $vmfw_configs, $vmdata, $corosync_conf, 4); + my $rulesetv6 = compile_iptables_filter($cluster_conf, $hostfw_conf, $vmfw_configs, $vmdata, $corosync_conf, 6); + my $ebtables_ruleset = compile_ebtables_filter($cluster_conf, $hostfw_conf, $vmfw_configs, $vmdata); my $ipset_ruleset = compile_ipsets($cluster_conf, $vmfw_configs, $vmdata); return ($ruleset, $ipset_ruleset, $rulesetv6, $ebtables_ruleset); } sub compile_iptables_filter { - my ($cluster_conf, $hostfw_conf, $vmfw_configs, $vmdata, $ipversion, $verbose) = @_; + my ($cluster_conf, $hostfw_conf, $vmfw_configs, $vmdata, $corosync_conf, $ipversion) = @_; my $ruleset = {}; @@ -3460,7 +3564,8 @@ sub compile_iptables_filter { # fixme: what log level should we use here? my $loglevel = get_option_log_level($hostfw_options, "log_level_out"); - ruleset_chain_add_conn_filters($ruleset, "PVEFW-FORWARD", "ACCEPT"); + my $conn_allow_invalid = $hostfw_options->{nf_conntrack_allow_invalid} // 0; + ruleset_chain_add_conn_filters($ruleset, "PVEFW-FORWARD", $conn_allow_invalid, "ACCEPT"); ruleset_create_chain($ruleset, "PVEFW-FWBR-IN"); ruleset_chain_add_input_filters($ruleset, "PVEFW-FWBR-IN", $ipversion, $hostfw_options, $cluster_conf, $loglevel); @@ -3475,7 +3580,7 @@ sub compile_iptables_filter { my $hostfw_enable = !(defined($hostfw_options->{enable}) && ($hostfw_options->{enable} == 0)); if ($hostfw_enable) { - eval { enable_host_firewall($ruleset, $hostfw_conf, $cluster_conf, $ipversion); }; + eval { enable_host_firewall($ruleset, $hostfw_conf, $cluster_conf, $ipversion, $corosync_conf); }; warn $@ if $@; # just to be sure - should not happen } @@ -3655,15 +3760,16 @@ sub compile_ipsets { } sub compile_ebtables_filter { - my ($cluster_conf, $hostfw_conf, $vmfw_configs, $vmdata, $verbose) = @_; + my ($cluster_conf, $hostfw_conf, $vmfw_configs, $vmdata) = @_; - return ({}, {}) if !$cluster_conf->{options}->{enable}; + if (!($cluster_conf->{options}->{ebtables} // 1)) { + return {}; + } my $ruleset = {}; ruleset_create_chain($ruleset, "PVEFW-FORWARD"); - ruleset_create_chain($ruleset, "PVEFW-FWBR-OUT"); #for ipv4 and ipv6, check macaddress in iptables, so we use conntrack 'ESTABLISHED', to speedup rules ruleset_addrule($ruleset, 'PVEFW-FORWARD', '-p IPv4', '-j ACCEPT'); @@ -3671,41 +3777,63 @@ sub compile_ebtables_filter { ruleset_addrule($ruleset, 'PVEFW-FORWARD', '-o fwln+', '-j PVEFW-FWBR-OUT'); # generate firewall rules for QEMU VMs - foreach my $vmid (keys %{$vmdata->{qemu}}) { + foreach my $vmid (sort keys %{$vmdata->{qemu}}) { eval { my $conf = $vmdata->{qemu}->{$vmid}; my $vmfw_conf = $vmfw_configs->{$vmid}; return if !$vmfw_conf; + my $ipsets = $vmfw_conf->{ipset}; - foreach my $netid (keys %$conf) { + foreach my $netid (sort keys %$conf) { next if $netid !~ m/^net(\d+)$/; my $net = PVE::QemuServer::parse_net($conf->{$netid}); next if !$net->{firewall}; my $iface = "tap${vmid}i$1"; my $macaddr = $net->{macaddr}; - - generate_tap_layer2filter($ruleset, $iface, $macaddr, $vmfw_conf, $vmid); - + my $arpfilter = []; + if (defined(my $ipset = $ipsets->{"ipfilter-$netid"})) { + foreach my $ipaddr (@$ipset) { + my($ip, $version) = parse_ip_or_cidr($ipaddr->{cidr}); + next if !$ip || ($version && $version != 4); + push(@$arpfilter, $ip); + } + } + generate_tap_layer2filter($ruleset, $iface, $macaddr, $vmfw_conf, $vmid, $arpfilter); } }; warn $@ if $@; # just to be sure - should not happen } # generate firewall rules for LXC containers - foreach my $vmid (keys %{$vmdata->{lxc}}) { + foreach my $vmid (sort keys %{$vmdata->{lxc}}) { eval { my $conf = $vmdata->{lxc}->{$vmid}; my $vmfw_conf = $vmfw_configs->{$vmid}; return if !$vmfw_conf || !$vmfw_conf->{options}->{enable}; + my $ipsets = $vmfw_conf->{ipset}; - foreach my $netid (keys %$conf) { + foreach my $netid (sort keys %$conf) { next if $netid !~ m/^net(\d+)$/; my $net = PVE::LXC::Config->parse_lxc_network($conf->{$netid}); next if !$net->{firewall}; my $iface = "veth${vmid}i$1"; my $macaddr = $net->{hwaddr}; - generate_tap_layer2filter($ruleset, $iface, $macaddr, $vmfw_conf, $vmid); + my $arpfilter = []; + if (defined(my $ipset = $ipsets->{"ipfilter-$netid"})) { + foreach my $ipaddr (@$ipset) { + my($ip, $version) = parse_ip_or_cidr($ipaddr->{cidr}); + next if !$ip || ($version && $version != 4); + push(@$arpfilter, $ip); + } + } + if (defined(my $ip = $net->{ip}) && $vmfw_conf->{options}->{ipfilter}) { + # ebtables changes this to a .0/MASK network but we just + # want the address here, no network - see #2193 + $ip =~ s|/(\d+)$||; + push @$arpfilter, $ip; + } + generate_tap_layer2filter($ruleset, $iface, $macaddr, $vmfw_conf, $vmid, $arpfilter); } }; warn $@ if $@; # just to be sure - should not happen @@ -3715,7 +3843,7 @@ sub compile_ebtables_filter { } sub generate_tap_layer2filter { - my ($ruleset, $iface, $macaddr, $vmfw_conf, $vmid) = @_; + my ($ruleset, $iface, $macaddr, $vmfw_conf, $vmid, $arpfilter) = @_; my $options = $vmfw_conf->{options}; my $tapchain = $iface."-OUT"; @@ -3730,29 +3858,54 @@ sub generate_tap_layer2filter { ruleset_addrule($ruleset, $tapchain, "-s ! $macaddr", '-j DROP'); } + if (@$arpfilter){ + my $arpchain = $tapchain."-ARP"; + ruleset_addrule($ruleset, $tapchain, "-p ARP", "-j $arpchain"); + ruleset_create_chain($ruleset, $arpchain); + + foreach my $ip (@{$arpfilter}) { + ruleset_addrule($ruleset, $arpchain, "-p ARP --arp-ip-src $ip", '-j RETURN'); + } + ruleset_addrule($ruleset, $arpchain, '', '-j DROP'); + } + if (defined($options->{layer2_protocols})){ + my $protochain = $tapchain."-PROTO"; + ruleset_addrule($ruleset, $tapchain, '', "-j $protochain"); + ruleset_create_chain($ruleset, $protochain); + foreach my $proto (split(/,/, $options->{layer2_protocols})) { - ruleset_addrule($ruleset, $tapchain, "-p $proto", '-j ACCEPT'); + ruleset_addrule($ruleset, $protochain, "-p $proto", '-j RETURN'); } - ruleset_addrule($ruleset, $tapchain, '', "-j DROP"); - } else { - ruleset_addrule($ruleset, $tapchain, '', '-j ACCEPT'); + ruleset_addrule($ruleset, $protochain, '', '-j DROP'); } + ruleset_addrule($ruleset, $tapchain, '', '-j ACCEPT'); + ruleset_addrule($ruleset, 'PVEFW-FWBR-OUT', "-i $iface", "-j $tapchain"); } +# the parameter $change_only_regex changes two things if defined: +# * all chains not matching it will be left intact +# * both the $active_chains hash and the returned status_hash have different +# structure (they contain a key named 'rules'). sub get_ruleset_status { - my ($ruleset, $active_chains, $digest_fn, $verbose) = @_; + my ($ruleset, $active_chains, $digest_fn, $change_only_regex) = @_; my $statushash = {}; foreach my $chain (sort keys %$ruleset) { - my $sig = &$digest_fn($ruleset->{$chain}); + my $rules = $ruleset->{$chain}; + my $sig = &$digest_fn($rules); + my $oldsig; $statushash->{$chain}->{sig} = $sig; - - my $oldsig = $active_chains->{$chain}; + if (defined($change_only_regex)) { + $oldsig = $active_chains->{$chain}->{sig}; + $statushash->{$chain}->{rules} = $rules; + } else { + $oldsig = $active_chains->{$chain}; + } if (!defined($oldsig)) { $statushash->{$chain}->{action} = 'create'; } else { @@ -3762,19 +3915,26 @@ sub get_ruleset_status { $statushash->{$chain}->{action} = 'update'; } } - print "$statushash->{$chain}->{action} $chain ($sig)\n" if $verbose; - foreach my $cmd (@{$ruleset->{$chain}}) { - print "\t$cmd\n" if $verbose; + if ($verbose) { + print "$statushash->{$chain}->{action} $chain ($sig)\n"; + foreach my $cmd (@{$rules}) { + print "\t$cmd\n"; + } } } foreach my $chain (sort keys %$active_chains) { - if (!defined($ruleset->{$chain})) { - my $sig = $active_chains->{$chain}; - $statushash->{$chain}->{action} = 'delete'; - $statushash->{$chain}->{sig} = $sig; - print "delete $chain ($sig)\n" if $verbose; + next if defined($ruleset->{$chain}); + my $action = 'delete'; + my $sig = $active_chains->{$chain}; + if (defined($change_only_regex)) { + $action = 'ignore' if ($chain !~ m/$change_only_regex/); + $statushash->{$chain}->{rules} = $active_chains->{$chain}->{rules}; + $sig = $sig->{sig}; } + $statushash->{$chain}->{action} = $action; + $statushash->{$chain}->{sig} = $sig; + print "$action $chain ($sig)\n" if $verbose; } return $statushash; @@ -3788,12 +3948,12 @@ sub print_sig_rule { } sub get_ruleset_cmdlist { - my ($ruleset, $verbose, $iptablescmd) = @_; + my ($ruleset, $iptablescmd) = @_; my $cmdlist = "*filter\n"; # we pass this to iptables-restore; my ($active_chains, $hooks) = iptables_get_chains($iptablescmd); - my $statushash = get_ruleset_status($ruleset, $active_chains, \&iptables_chain_digest, $verbose); + my $statushash = get_ruleset_status($ruleset, $active_chains, \&iptables_chain_digest); # create missing chains first foreach my $chain (sort keys %$ruleset) { @@ -3849,48 +4009,55 @@ sub get_ruleset_cmdlist { return wantarray ? ($cmdlist, $changes) : $cmdlist; } +my $pve_ebtables_chainname_regex = qr/PVEFW-\S+|(?:tap|veth)\d+i\d+-(?:IN|OUT)/; + sub get_ebtables_cmdlist { - my ($ruleset, $verbose) = @_; + my ($ruleset) = @_; my $changes = 0; my $cmdlist = "*filter\n"; - my ($active_chains, $hooks) = ebtables_get_chains(); - my $statushash = get_ruleset_status($ruleset, $active_chains, \&iptables_chain_digest, $verbose); + my $active_chains = ebtables_get_chains(); + my $statushash = get_ruleset_status($ruleset, $active_chains, + \&iptables_chain_digest, + $pve_ebtables_chainname_regex); - # create chains first - foreach my $chain (sort keys %$ruleset) { - my $stat = $statushash->{$chain}; - die "internal error" if !$stat; + # create chains first and make sure PVE rules are evaluated if active + my $append_pve_to_forward = '-A FORWARD -j PVEFW-FORWARD'; + my $pve_include = 0; + foreach my $chain (sort keys %$statushash) { + next if ($statushash->{$chain}->{action} eq 'delete'); $cmdlist .= ":$chain ACCEPT\n"; + $pve_include = 1 if ($chain eq 'PVEFW-FORWARD'); } - if ($ruleset->{'PVEFW-FORWARD'}) { - $cmdlist .= "-A FORWARD -j PVEFW-FORWARD\n"; - } - - foreach my $chain (sort keys %$ruleset) { + foreach my $chain (sort keys %$statushash) { my $stat = $statushash->{$chain}; - die "internal error" if !$stat; - $changes = 1 if ($stat->{action} ne 'exists'); + $changes = 1 if ($stat->{action} !~ 'ignore|exists'); + next if ($stat->{action} eq 'delete'); - foreach my $cmd (@{$ruleset->{$chain}}) { + foreach my $cmd (@{$statushash->{$chain}->{'rules'}}) { + if ($chain eq 'FORWARD' && $cmd eq $append_pve_to_forward) { + next if ! $pve_include; + $pve_include = 0; + } $cmdlist .= "$cmd\n"; } } + $cmdlist .= "$append_pve_to_forward\n" if $pve_include; return wantarray ? ($cmdlist, $changes) : $cmdlist; } sub get_ipset_cmdlist { - my ($ruleset, $verbose) = @_; + my ($ruleset) = @_; my $cmdlist = ""; my $delete_cmdlist = ""; my $active_chains = ipset_get_chains(); - my $statushash = get_ruleset_status($ruleset, $active_chains, \&ipset_chain_digest, $verbose); + my $statushash = get_ruleset_status($ruleset, $active_chains, \&ipset_chain_digest); # remove stale _swap chains foreach my $chain (keys %$active_chains) { @@ -3941,16 +4108,16 @@ sub get_ipset_cmdlist { } sub apply_ruleset { - my ($ruleset, $hostfw_conf, $ipset_ruleset, $rulesetv6, $ebtables_ruleset, $verbose) = @_; + my ($ruleset, $hostfw_conf, $ipset_ruleset, $rulesetv6, $ebtables_ruleset) = @_; enable_bridge_firewall(); my ($ipset_create_cmdlist, $ipset_delete_cmdlist, $ipset_changes) = - get_ipset_cmdlist($ipset_ruleset, $verbose); + get_ipset_cmdlist($ipset_ruleset); - my ($cmdlist, $changes) = get_ruleset_cmdlist($ruleset, $verbose); - my ($cmdlistv6, $changesv6) = get_ruleset_cmdlist($rulesetv6, $verbose, "ip6tables"); - my ($ebtables_cmdlist, $ebtables_changes) = get_ebtables_cmdlist($ebtables_ruleset, $verbose); + my ($cmdlist, $changes) = get_ruleset_cmdlist($ruleset); + my ($cmdlistv6, $changesv6) = get_ruleset_cmdlist($rulesetv6, "ip6tables"); + my ($ebtables_cmdlist, $ebtables_changes) = get_ebtables_cmdlist($ebtables_ruleset); if ($verbose) { if ($ipset_changes) { @@ -4002,7 +4169,7 @@ sub apply_ruleset { # test: re-read status and check if everything is up to date my $active_chains = iptables_get_chains(); - my $statushash = get_ruleset_status($ruleset, $active_chains, \&iptables_chain_digest, 0); + my $statushash = get_ruleset_status($ruleset, $active_chains, \&iptables_chain_digest); my $errors; foreach my $chain (sort keys %$ruleset) { @@ -4014,7 +4181,7 @@ sub apply_ruleset { } my $active_chainsv6 = iptables_get_chains("ip6tables"); - my $statushashv6 = get_ruleset_status($rulesetv6, $active_chainsv6, \&iptables_chain_digest, 0); + my $statushashv6 = get_ruleset_status($rulesetv6, $active_chainsv6, \&iptables_chain_digest); foreach my $chain (sort keys %$rulesetv6) { my $stat = $statushashv6->{$chain}; @@ -4025,7 +4192,9 @@ sub apply_ruleset { } my $active_ebtables_chains = ebtables_get_chains(); - my $ebtables_statushash = get_ruleset_status($ebtables_ruleset, $active_ebtables_chains, \&iptables_chain_digest, 0); + my $ebtables_statushash = get_ruleset_status($ebtables_ruleset, + $active_ebtables_chains, \&iptables_chain_digest, + $pve_ebtables_chainname_regex); foreach my $chain (sort keys %$ebtables_ruleset) { my $stat = $ebtables_statushash->{$chain}; @@ -4041,6 +4210,7 @@ sub apply_ruleset { update_nf_conntrack_tcp_timeout_established($hostfw_conf); + update_nf_conntrack_logging($hostfw_conf); } sub update_nf_conntrack_max { @@ -4077,11 +4247,29 @@ sub update_nf_conntrack_tcp_timeout_established { PVE::ProcFSTools::write_proc_entry("/proc/sys/net/netfilter/nf_conntrack_tcp_timeout_established", $value); } +my $log_nf_conntrack_enabled = undef; +sub update_nf_conntrack_logging { + my ($hostfw_conf) = @_; + + my $options = $hostfw_conf->{options} || {}; + my $value = $options->{log_nf_conntrack} || 0; + if (!defined($log_nf_conntrack_enabled) + || $value != $log_nf_conntrack_enabled) + { + my $tmpfile = "$pve_fw_status_dir/log_nf_conntrack"; + PVE::Tools::file_set_contents($tmpfile, $value); + + run_command([qw(systemctl try-reload-or-restart pvefw-logger.service)]); + $log_nf_conntrack_enabled = $value; + } +} + sub remove_pvefw_chains { PVE::Firewall::remove_pvefw_chains_iptables("iptables"); PVE::Firewall::remove_pvefw_chains_iptables("ip6tables"); PVE::Firewall::remove_pvefw_chains_ipset(); + PVE::Firewall::remove_pvefw_chains_ebtables(); } @@ -4127,6 +4315,11 @@ sub remove_pvefw_chains_ipset { ipset_restore_cmdlist($cmdlist) if $cmdlist; } +sub remove_pvefw_chains_ebtables { + # apply empty ruleset = remove all our chains + ebtables_restore_cmdlist(get_ebtables_cmdlist({})); +} + sub init { my $cluster_conf = load_clusterfw_conf(); my $cluster_options = $cluster_conf->{options};