X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=blobdiff_plain;f=src%2FPVE%2FFirewall.pm;h=48e630004bf424c2db578aad3e60eb61db42f8e6;hp=7cdd08e6c7bfdb9d6c329c3db989ede967c2d843;hb=cc37e0005d0617e405883fd12b80faf65cedb153;hpb=d4a23c880d3ee3756d3b68d714d4d873da0aaaee diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm index 7cdd08e..48e6300 100644 --- a/src/PVE/Firewall.pm +++ b/src/PVE/Firewall.pm @@ -132,6 +132,8 @@ 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, info => 6, @@ -423,7 +425,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)", @@ -1049,12 +1051,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 +1183,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 +1201,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 +1271,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 +1398,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', @@ -1995,8 +2046,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"; @@ -2004,7 +2057,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; @@ -2017,7 +2070,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); @@ -2051,17 +2104,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 { @@ -2078,10 +2132,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 { @@ -2101,7 +2159,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'"; @@ -2121,9 +2179,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"); } @@ -2133,7 +2193,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"); @@ -2219,7 +2279,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); @@ -2236,12 +2296,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 $@; @@ -2302,7 +2363,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); @@ -2312,7 +2373,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); @@ -2326,10 +2387,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); } } @@ -2349,7 +2410,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); @@ -2370,7 +2431,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 $@; @@ -2407,7 +2468,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'; @@ -2422,11 +2483,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 $@; @@ -2565,6 +2627,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; } @@ -2631,7 +2697,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) { @@ -2658,12 +2724,15 @@ sub parse_clusterfw_option { if (($value > 1) && ((time() - $value) > 60)) { $value = 0 } - } elsif ($line =~ m/^(ebtables_enable):\s*(0|1)\s*$/i) { + } 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" } @@ -3017,6 +3086,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}) @@ -3175,9 +3245,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"; @@ -3210,7 +3278,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"; } @@ -3300,6 +3368,27 @@ 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) = @_; @@ -3308,6 +3397,8 @@ sub load_clusterfw_conf { my $cluster_conf = {}; if (my $fh = IO::File->new($filename, O_RDONLY)) { $cluster_conf = parse_clusterfw_config($filename, $fh, $verbose); + + $set_global_log_ratelimit->($cluster_conf->{options}); } return $cluster_conf; @@ -3454,7 +3545,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); @@ -3651,7 +3743,7 @@ sub compile_ipsets { sub compile_ebtables_filter { my ($cluster_conf, $hostfw_conf, $vmfw_configs, $vmdata, $verbose) = @_; - if (!($cluster_conf->{options}->{ebtables_enable} // 1)) { + if (!($cluster_conf->{options}->{ebtables} // 1)) { return {}; } @@ -3666,41 +3758,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 +3819,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,15 +3834,30 @@ 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"); } @@ -3778,11 +3902,12 @@ sub get_ruleset_status { foreach my $chain (sort keys %$active_chains) { 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}; } - my $sig = $active_chains->{$chain}->{sig}; $statushash->{$chain}->{action} = $action; $statushash->{$chain}->{sig} = $sig; print "$action $chain ($sig)\n" if $verbose; @@ -4061,6 +4186,7 @@ sub apply_ruleset { update_nf_conntrack_tcp_timeout_established($hostfw_conf); + update_nf_conntrack_logging($hostfw_conf); } sub update_nf_conntrack_max { @@ -4097,6 +4223,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");