X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=blobdiff_plain;f=src%2FPVE%2FFirewall.pm;h=f294d365545facc005c3a6195ba699eaf4674bce;hp=545216724614f3e21e73ef27c3d8eaa7474583f0;hb=e17d3eec6b9bd7427a67ceb0ca21dd4fc6d6f54e;hpb=151c209e05a9e15d5d7a9402391ca936e562a173 diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm index 5452167..f294d36 100644 --- a/src/PVE/Firewall.pm +++ b/src/PVE/Firewall.pm @@ -1049,12 +1049,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 +1181,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', @@ -1235,6 +1242,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 +1369,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', @@ -1831,20 +1853,14 @@ sub ebtables_get_chains { my $res = {}; my $chains = {}; - my $parser = sub { my $line = shift; return if $line =~ m/^#/; return if $line =~ m/^\s*$/; - if ($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+).*/) { + if ($line =~ m/^:(\S+)\s\S+$/) { + # Make sure we know chains exist even if they're empty. + $chains->{$1} //= []; + } elsif ($line =~ m/^(?:\S+)\s(\S+)\s(?:\S+).*/) { my $chain = $1; $line =~ s/\s+$//; push @{$chains->{$chain}}, $line; @@ -1855,10 +1871,10 @@ sub ebtables_get_chains { }; run_command("/sbin/ebtables-save", outfunc => $parser); - - # compute digest for each chain + # 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; } @@ -2001,8 +2017,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"; @@ -2010,7 +2028,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; @@ -2023,7 +2041,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); @@ -2057,15 +2075,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"; - } - 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 { @@ -2085,7 +2106,7 @@ sub get_log_rule_base { # 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 "-m limit --limit 1/sec -j NFLOG --nflog-prefix \":$vmid:$loglevel:$chain: $msg\""; } sub ruleset_add_chain_policy { @@ -2105,7 +2126,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'"; @@ -2125,9 +2146,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"); } @@ -2137,7 +2160,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"); @@ -2223,7 +2246,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); @@ -2240,12 +2263,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 $@; @@ -2306,7 +2330,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); @@ -2316,7 +2340,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); @@ -2330,10 +2354,10 @@ sub generate_tap_rules_direction { # plug the tap chain to bridge chain if ($direction eq 'IN') { ruleset_addrule($ruleset, "PVEFW-FWBR-IN", - "-m physdev --physdev-is-bridged --physdev-out $iface", "-j $tapchain"); + "-m physdev --physdev-is-bridged --physdev-out $iface", "-j $tapchain", $loglevel, 'FWBR-IN: ', $vmid); } else { ruleset_addrule($ruleset, "PVEFW-FWBR-OUT", - "-m physdev --physdev-is-bridged --physdev-in $iface", "-j $tapchain"); + "-m physdev --physdev-is-bridged --physdev-in $iface", "-j $tapchain", $loglevel, 'FWBR-OUT: ', $vmid); } } @@ -2353,7 +2377,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); @@ -2374,7 +2398,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 $@; @@ -2411,7 +2435,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'; @@ -2426,11 +2450,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 $@; @@ -2569,6 +2594,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; } @@ -2635,7 +2664,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) { @@ -2662,6 +2691,9 @@ 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); @@ -3018,6 +3050,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}) @@ -3176,9 +3209,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"; @@ -3211,7 +3242,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"; } @@ -3417,7 +3448,7 @@ sub compile { $vmfw_configs = read_vm_firewall_configs($cluster_conf, $vmdata, undef, $verbose); } - return ({},{},{}) if !$cluster_conf->{options}->{enable}; + return ({},{},{},{}) if !$cluster_conf->{options}->{enable}; my $localnet; if ($cluster_conf->{aliases}->{local_network}) { @@ -3426,7 +3457,7 @@ 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 }; } @@ -3455,7 +3486,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); @@ -3652,13 +3684,14 @@ sub compile_ipsets { sub compile_ebtables_filter { my ($cluster_conf, $hostfw_conf, $vmfw_configs, $vmdata, $verbose) = @_; - 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'); @@ -3666,41 +3699,58 @@ 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); + } + } + push(@$arpfilter, $net->{ip}) if $net->{ip} && $vmfw_conf->{options}->{ipfilter}; + generate_tap_layer2filter($ruleset, $iface, $macaddr, $vmfw_conf, $vmid, $arpfilter); } }; warn $@ if $@; # just to be sure - should not happen @@ -3710,7 +3760,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"; @@ -3725,29 +3775,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, $verbose, $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 { @@ -3757,19 +3832,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; @@ -3844,35 +3926,42 @@ 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 $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, $verbose, + $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->{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'); + next if ($stat->{action} eq 'delete'); + $changes = 1 if ($stat->{action} !~ 'ignore|exists'); - 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; } @@ -4020,7 +4109,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, + 0, $pve_ebtables_chainname_regex); foreach my $chain (sort keys %$ebtables_ruleset) { my $stat = $ebtables_statushash->{$chain}; @@ -4036,6 +4127,7 @@ sub apply_ruleset { update_nf_conntrack_tcp_timeout_established($hostfw_conf); + update_nf_conntrack_logging($hostfw_conf); } sub update_nf_conntrack_max { @@ -4072,6 +4164,23 @@ 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); + + PVE::Tools::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");