use warnings;
use strict;
-use POSIX;
-use Data::Dumper;
+
use Digest::SHA;
+use Encode;
+use File::Basename;
+use File::Path;
+use IO::File;
+use Net::IP;
+use POSIX;
use Socket qw(AF_INET6 inet_ntop inet_pton);
-use PVE::INotify;
+use Storable qw(dclone);
+
+use PVE::Cluster;
use PVE::Exception qw(raise raise_param_exc);
+use PVE::INotify;
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::ProcFSTools;
use PVE::SafeSyslog;
-use File::Basename;
-use File::Path;
-use IO::File;
-use Net::IP;
+use PVE::Tools qw($IPV4RE $IPV6RE);
use PVE::Tools qw(run_command lock_file dir_glob_foreach);
-use Encode;
-use Storable qw(dclone);
-my $hostfw_conf_filename = "/etc/pve/local/host.fw";
my $pvefw_conf_dir = "/etc/pve/firewall";
my $clusterfw_conf_filename = "$pvefw_conf_dir/cluster.fw";
$have_lxc = 1;
};
-
my $pve_fw_status_dir = "/var/lib/pve-firewall";
mkdir $pve_fw_status_dir; # make sure this exists
};
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,
emerg => 0,
};
+my $verbose = 0;
+sub set_verbose {
+ $verbose = shift;
+}
+
# %rule
#
# name => optional
],
'Razor' => [
"Razor Antispam System",
- { action => 'ACCEPT', proto => 'tcp', dport => '2703' },
+ { action => 'PARAM', proto => 'tcp', dport => '2703' },
],
'Rdate' => [
"Remote time retrieval (rdate)",
#{ 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,
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 = {
default => 0,
optional => 1,
},
+ log_nf_conntrack => {
+ description => "Enable logging of conntrack information.",
+ type => 'boolean',
+ default => 0,
+ optional => 1
+ },
};
our $vm_option_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',
}
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";
}
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;
# 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);
}
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 {
$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 {
} 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'";
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");
}
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);
} 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 $@;
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);
# 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);
}
}
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 $@;
$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 $@;
}
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;
$rule->{dest} = $1;
next;
}
+ if ($line =~ s/^-log (emerg|alert|crit|err|warning|notice|info|debug|nolog)\s*//) {
+ $rule->{log} = $1;
+ next;
+ }
last;
}
} 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"
}
}
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)) {
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;
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;
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) = @_;
};
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;
}
$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})
}
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;
}
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";
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";
}
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;
}
}
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 {
}
sub compile {
- my ($cluster_conf, $hostfw_conf, $vmdata, $verbose) = @_;
+ my ($cluster_conf, $hostfw_conf, $vmdata) = @_;
my $vmfw_configs;
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, $verbose) if !$hostfw_conf;
+ $hostfw_conf = load_hostfw_conf($cluster_conf, undef) if !$hostfw_conf;
$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};
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, 4);
+ my $rulesetv6 = compile_iptables_filter($cluster_conf, $hostfw_conf, $vmfw_configs, $vmdata, 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, $ipversion) = @_;
my $ruleset = {};
# 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", $hostfw_options->{nf_conntrack_allow_invalid}, "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);
}
sub compile_ebtables_filter {
- my ($cluster_conf, $hostfw_conf, $vmfw_configs, $vmdata, $verbose) = @_;
+ my ($cluster_conf, $hostfw_conf, $vmfw_configs, $vmdata) = @_;
if (!($cluster_conf->{options}->{ebtables} // 1)) {
return {};
my $conf = $vmdata->{qemu}->{$vmid};
my $vmfw_conf = $vmfw_configs->{$vmid};
return if !$vmfw_conf;
+ my $ipsets = $vmfw_conf->{ipset};
foreach my $netid (sort keys %$conf) {
next if $netid !~ m/^net(\d+)$/;
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
my $vmfw_conf = $vmfw_configs->{$vmid};
return if !$vmfw_conf || !$vmfw_conf->{options}->{enable};
+ my $ipsets = $vmfw_conf->{ipset};
foreach my $netid (sort keys %$conf) {
next if $netid !~ m/^net(\d+)$/;
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 (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
}
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";
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");
}
# * 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, $change_only_regex) = @_;
+ my ($ruleset, $active_chains, $digest_fn, $change_only_regex) = @_;
my $statushash = {};
}
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) {
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 = ebtables_get_chains();
my $statushash = get_ruleset_status($ruleset, $active_chains,
- \&iptables_chain_digest, $verbose,
+ \&iptables_chain_digest,
$pve_ebtables_chainname_regex);
# create chains first and make sure PVE rules are evaluated if active
}
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) {
}
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) {
# 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) {
}
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};
my $active_ebtables_chains = ebtables_get_chains();
my $ebtables_statushash = get_ruleset_status($ebtables_ruleset,
$active_ebtables_chains, \&iptables_chain_digest,
- 0, $pve_ebtables_chainname_regex);
+ $pve_ebtables_chainname_regex);
foreach my $chain (sort keys %$ebtables_ruleset) {
my $stat = $ebtables_statushash->{$chain};