use warnings;
use strict;
+use POSIX;
use Data::Dumper;
use Digest::SHA;
use PVE::INotify;
use PVE::Tools qw(run_command lock_file);
use Encode;
+my $hostfw_conf_filename = "/etc/pve/local/host.fw";
my $clusterfw_conf_filename = "/etc/pve/firewall/cluster.fw";
-# dynamically include PVE::QemuServer and PVE::OpenVZ
+# dynamically include PVE::QemuServer and PVE::OpenVZ
# to avoid dependency problems
my $have_qemu_server;
eval {
$have_pve_manager = 1;
};
+my $feature_ipset_nomatch = 0;
+eval {
+ my (undef, undef, $release) = POSIX::uname();
+ if ($release =~ m/^(\d+)\.(\d+)\.\d+-/) {
+ my ($major, $minor) = ($1, $2);
+ $feature_ipset_nomatch = 1 if ($major > 3) ||
+ ($major == 3 && $minor >= 7);
+ }
+
+};
+
use Data::Dumper;
my $nodename = PVE::INotify::nodename();
{ action => 'DROP', dsttype => 'BROADCAST' },
{ action => 'DROP', dsttype => 'MULTICAST' },
{ action => 'DROP', dsttype => 'ANYCAST' },
- { action => 'DROP', dest => '224.0.0.0/4' },
+ { 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', source => '224.0.0.0/4' },
{ action => 'DROP', proto => 'icmp' },
"-p tcp -j REJECT --reject-with tcp-reset",
"-p udp -j REJECT --reject-with icmp-port-unreachable",
"-j REJECT --reject-with icmp-host-prohibited",
],
'PVEFW-Drop' => [
- # same as shorewall 'Drop', which is equal to DROP,
+ # same as shorewall 'Drop', which is equal to DROP,
# but REJECT/DROP some packages to reduce logging,
# and ACCEPT critical ICMP types
{ action => 'PVEFW-reject', proto => 'tcp', dport => '43' }, # REJECT 'auth'
{ action => 'DROP', proto => 'udp', sport => 53 },
],
'PVEFW-Reject' => [
- # same as shorewall 'Reject', which is equal to Reject,
+ # same as shorewall 'Reject', which is equal to Reject,
# but REJECT/DROP some packages to reduce logging,
# and ACCEPT critical ICMP types
{ action => 'PVEFW-reject', proto => 'tcp', dport => '43' }, # REJECT 'auth'
sub parse_address_list {
my ($str) = @_;
- my $nbaor = 0;
- foreach my $aor (split(/,/, $str)) {
- if (!Net::IP->new($aor)) {
+ return if $str !~ m/^(\+)(\S+)$/; # ipset ref
+
+ my $count = 0;
+ my $iprange = 0;
+ foreach my $elem (split(/,/, $str)) {
+ $count++;
+ if (!Net::IP->new($elem)) {
my $err = Net::IP::Error();
die "invalid IP address: $err\n";
- }else{
- $nbaor++;
}
+ $iprange = 1 if $elem =~ m/-/;
}
- return $nbaor;
+
+ die "you can use a range in a list\n" if $iprange && $count > 1;
}
sub parse_port_name_number_or_range {
my ($properties) = @_;
foreach my $k (keys %$rule_properties) {
- $properties->{$k} = $rule_properties->{$k};
+ my $h = $rule_properties->{$k};
+ # copy data, so that we can modify later without side effects
+ foreach my $opt (keys %$h) { $properties->{$k}->{$opt} = $h->{$opt}; }
}
-
+
return $properties;
}
my $rule_format = "%-15s %-30s %-30s %-15s %-15s %-15s\n";
-sub iptables {
- my ($cmd) = @_;
-
- run_command("/sbin/iptables $cmd", outfunc => sub {}, errfunc => sub {});
-}
-
sub iptables_restore_cmdlist {
my ($cmdlist) = @_;
sub ipset_restore_cmdlist {
my ($cmdlist) = @_;
- run_command(" /usr/sbin/ipset restore", input => $cmdlist);
+ run_command("/usr/sbin/ipset restore", input => $cmdlist);
}
sub iptables_get_chains {
return wantarray ? ($res, $hooks) : $res;
}
+sub iptables_chain_digest {
+ my ($rules) = @_;
+ my $digest = Digest::SHA->new('sha1');
+ foreach my $rule (@$rules) { # order is important
+ $digest->add($rule);
+ }
+ return $digest->b64digest;
+}
+
sub ipset_chain_digest {
my ($rules) = @_;
+
my $digest = Digest::SHA->new('sha1');
foreach my $rule (sort @$rules) { # note: sorted
$digest->add($rule);
return if $line =~ m/^#/;
return if $line =~ m/^\s*$/;
- if ($line =~ m/^(\S+)\s(\S+)\s(\S+)/) {
- push @{$chains->{$2}}, $line;
+ if ($line =~ m/^(?:\S+)\s(PVEFW-\S+)\s(?:\S+).*/) {
+ my $chain = $1;
+ $line =~ s/\s+$//; # delete trailing white space
+ push @{$chains->{$chain}}, $line;
} else {
# simply ignore the rest
return;
return $res;
}
-sub iptables_chain_exist {
- my ($chain) = @_;
-
- eval{
- iptables("-n --list $chain");
- };
- return undef if $@;
-
- return 1;
-}
-
-sub iptables_rule_exist {
- my ($rule) = @_;
-
- eval{
- iptables("-C $rule");
- };
- return undef if $@;
-
- return 1;
-}
-
sub ruleset_generate_cmdstr {
- my ($ruleset, $chain, $rule, $actions, $goto) = @_;
+ my ($ruleset, $chain, $rule, $actions, $goto, $cluster_conf) = @_;
return if defined($rule->{enable}) && !$rule->{enable};
my $nbdport = defined($rule->{dport}) ? parse_port_name_number_or_range($rule->{dport}) : 0;
my $nbsport = defined($rule->{sport}) ? parse_port_name_number_or_range($rule->{sport}) : 0;
- my $nbsource = $rule->{source} ? parse_address_list( $rule->{source}) : 0;
- my $nbdest = $rule->{dest} ? parse_address_list($rule->{dest}) : 0;
my @cmd = ();
push @cmd, "-i $rule->{iface_in}" if $rule->{iface_in};
push @cmd, "-o $rule->{iface_out}" if $rule->{iface_out};
- push @cmd, "-m iprange --src-range" if $nbsource > 1;
- push @cmd, "-s $rule->{source}" if $rule->{source};
- push @cmd, "-m iprange --dst-range" if $nbdest > 1;
- push @cmd, "-d $rule->{dest}" if $rule->{dest};
+ my $source = $rule->{source};
+ my $dest = $rule->{dest};
+
+ if ($source) {
+ if ($source =~ m/^(\+)(\S+)$/) {
+ die "no such ipset $2" if !$cluster_conf->{ipset}->{$2};
+ push @cmd, "-m set --match-set PVEFW-$2 src";
+
+ } elsif ($source =~ m/\-/){
+ push @cmd, "-m iprange --src-range $source";
+
+ } else {
+ push @cmd, "-s $source";
+ }
+ }
+
+ if ($dest) {
+ if ($dest =~ m/^(\+)(\S+)$/) {
+ die "no such ipset $2" if !$cluster_conf->{ipset}->{$2};
+ push @cmd, "-m set --match-set PVEFW-$2 dst";
+
+ } elsif ($dest =~ m/^(\d+)\.(\d+).(\d+).(\d+)\-(\d+)\.(\d+).(\d+).(\d+)$/){
+ push @cmd, "-m iprange --dst-range $dest";
+
+ } else {
+ push @cmd, "-s $dest";
+ }
+ }
if ($rule->{proto}) {
push @cmd, "-p $rule->{proto}";
push @cmd, "--match multiport" if $multiport;
- die "multiport: option '--sports' cannot be used together with '--dports'\n"
+ die "multiport: option '--sports' cannot be used together with '--dports'\n"
if ($multiport == 2) && ($rule->{dport} ne $rule->{sport});
if ($rule->{dport}) {
push @cmd, "-m addrtype --dst-type $rule->{dsttype}" if $rule->{dsttype};
if (my $action = $rule->{action}) {
- $action = $actions->{$action} if defined($actions->{$action});
+ $action = $actions->{$action} if defined($actions->{$action});
$goto = 1 if !defined($goto) && $action eq 'PVEFW-SET-ACCEPT-MARK';
push @cmd, $goto ? "-g $action" : "-j $action";
}
};
sub ruleset_generate_rule {
- my ($ruleset, $chain, $rule, $actions, $goto) = @_;
+ my ($ruleset, $chain, $rule, $actions, $goto, $cluster_conf) = @_;
my $rules;
$rules = [ $rule ];
}
- foreach my $tmp (@$rules) {
- if (my $cmdstr = ruleset_generate_cmdstr($ruleset, $chain, $tmp, $actions, $goto)) {
+ foreach my $tmp (@$rules) {
+ if (my $cmdstr = ruleset_generate_cmdstr($ruleset, $chain, $tmp, $actions, $goto, $cluster_conf)) {
ruleset_addrule($ruleset, $chain, $cmdstr);
}
}
sub get_log_rule_base {
my ($chain, $vmid, $msg, $loglevel) = @_;
-
+
die "internal error - no log level" if !defined($loglevel);
$vmid = 0 if !defined($vmid);
- # Note: we use special format for prefix to pass further
+ # Note: we use special format for prefix to pass further
# info to log daemon (VMID, LOGVELEL and CHAIN)
return "-j NFLOG --nflog-prefix \":$vmid:$loglevel:$chain: $msg\"";
if (!(defined($options->{dhcp}) && $options->{dhcp} == 0)) {
if ($direction eq 'OUT') {
- ruleset_generate_rule($ruleset, $chain, { action => 'PVEFW-SET-ACCEPT-MARK',
+ ruleset_generate_rule($ruleset, $chain, { action => 'PVEFW-SET-ACCEPT-MARK',
proto => 'udp', sport => 68, dport => 67 });
} else {
- ruleset_generate_rule($ruleset, $chain, { action => 'ACCEPT',
+ ruleset_generate_rule($ruleset, $chain, { action => 'ACCEPT',
proto => 'udp', sport => 67, dport => 68 });
}
}
}
ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate INVALID -j DROP");
- if($direction eq 'OUT'){
+ if ($direction eq 'OUT') {
ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate RELATED,ESTABLISHED -g PVEFW-SET-ACCEPT-MARK");
-
- }else{
+ } else {
ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate RELATED,ESTABLISHED -j $accept");
}
+
if ($direction eq 'OUT') {
if (defined($macaddr) && !(defined($options->{macfilter}) && $options->{macfilter} == 0)) {
ruleset_addrule($ruleset, $chain, "-m mac ! --mac-source $macaddr -j DROP");
}
ruleset_addrule($ruleset, $chain, "-j MARK --set-mark 0"); # clear mark
}
-
-
}
sub ruleset_generate_vm_rules {
next if $rule->{iface} && $rule->{iface} ne $netid;
next if !$rule->{enable};
if ($rule->{type} eq 'group') {
- my $group_chain = "GROUP-$rule->{action}-$direction";
+ my $group_chain = "GROUP-$rule->{action}-$direction";
if(!ruleset_chain_exist($ruleset, $group_chain)){
generate_group_rules($ruleset, $cluster_conf, $rule->{action});
}
} else {
next if $rule->{type} ne $lc_direction;
if ($direction eq 'OUT') {
- ruleset_generate_rule($ruleset, $chain, $rule,
- { ACCEPT => "PVEFW-SET-ACCEPT-MARK", REJECT => "PVEFW-reject" });
+ ruleset_generate_rule($ruleset, $chain, $rule,
+ { ACCEPT => "PVEFW-SET-ACCEPT-MARK", REJECT => "PVEFW-reject" }, undef, $cluster_conf);
} else {
my $accept = generate_nfqueue($options);
- ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept , REJECT => "PVEFW-reject" });
+ ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept , REJECT => "PVEFW-reject" }, undef, $cluster_conf);
}
}
}
foreach my $rule (@$rules) {
next if $rule->{type} ne 'in';
- ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" });
+ ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" }, undef, $cluster_conf);
}
# implement input policy
foreach my $rule (@$rules) {
next if $rule->{type} ne 'out';
- ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" });
+ ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" }, undef, $cluster_conf);
}
# implement output policy
foreach my $rule (@$rules) {
next if $rule->{type} ne 'in';
- ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => "PVEFW-SET-ACCEPT-MARK", REJECT => "PVEFW-reject" });
+ ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => "PVEFW-SET-ACCEPT-MARK", REJECT => "PVEFW-reject" }, undef, $cluster_conf);
}
$chain = "GROUP-${group}-OUT";
next if $rule->{type} ne 'out';
# we use PVEFW-SET-ACCEPT-MARK (Instead of ACCEPT) because we need to
# check also other tap rules later
- ruleset_generate_rule($ruleset, $chain, $rule,
- { ACCEPT => 'PVEFW-SET-ACCEPT-MARK', REJECT => "PVEFW-reject" });
+ ruleset_generate_rule($ruleset, $chain, $rule,
+ { ACCEPT => 'PVEFW-SET-ACCEPT-MARK', REJECT => "PVEFW-reject" }, undef, $cluster_conf);
}
}
die "wrong number of rule elements\n" if scalar(@data) != 3;
die "groups disabled\n" if !$allow_groups;
- die "invalid characters in group name\n" if $action !~ m/^[A-Za-z0-9_\-]+$/;
+ die "invalid characters in group name\n" if $action !~ m/^[A-Za-z0-9_\-]+$/;
} else {
die "unknown rule type '$type'\n";
}
parse_port_name_number_or_range($dport) if defined($dport);
parse_port_name_number_or_range($sport) if defined($sport);
-
+
parse_address_list($source) if $source;
parse_address_list($dest) if $dest;
warn "$prefix: $err";
next;
}
-
+
push @{$res->{$section}}, $rule;
}
- $res->{digest} = $digest->b64digest;
+$res->{digest} = $digest->b64digest;
return $res;
}
$section = 'rules';
next;
}
-
- if ($line =~ m/^\[ipgroup\s+(\S+)\]\s*$/i) {
- $section = 'ipset';
- $group = lc($1);
- $res->{$section}->{$group}->{type} = 'hash:ip family inet hashsize 1024 maxelem 65536 ';
- next;
- }
- if ($line =~ m/^\[netgroup\s+(\S+)\]\s*$/i) {
+ if ($line =~ m/^\[ipset\s+(\S+)\]\s*$/i) {
$section = 'ipset';
$group = lc($1);
- $res->{$section}->{$group}->{type} = 'hash:net family inet hashsize 1024 maxelem 65536 ';
next;
}
if (!$section) {
- warn "$prefix: skip line - no section";
+ warn "$prefix: skip line - no section\n";
next;
}
push @{$res->{$section}->{$group}}, $rule;
} elsif ($section eq 'ipset') {
chomp $line;
- my $ip;
- if (!Net::IP->new($line)) {
- warn "$prefix: $line is not an valid ip address";
+ $line =~ m/^(\!)?\s*((\d+)\.(\d+)\.(\d+)\.(\d+)(\/(\d+))?)/;
+ my $nomatch = $1;
+ my $ip = $2;
+
+ if(!$ip){
+ warn "$prefix: $line is not an valid ip address\n";
+ next;
+ }
+ if (!Net::IP->new($ip)) {
+ warn "$prefix: $line is not an valid ip address\n";
next;
}
- push @{$res->{$section}->{$group}->{ip}}, $line;
+
+ if ($nomatch) {
+ if ($feature_ipset_nomatch) {
+ push @{$res->{$section}->{$group}}, "$ip nomatch";
+ } else {
+ warn "$prefix: ignore $line - nomatch not supported by kernel\n";
+ }
+ } else {
+ push @{$res->{$section}->{$group}}, $ip;
+ }
}
}
$res->{digest} = $digest->b64digest;
-
return $res;
}
return $vmfw_conf;
}
+my $format_rules = sub {
+ my ($rules, $need_iface) = @_;
+
+ my $raw = '';
+
+ foreach my $rule (@$rules) {
+ if ($rule->{type} eq 'in' || $rule->{type} eq 'out') {
+ $raw .= '|' if defined($rule->{enable}) && !$rule->{enable};
+ $raw .= uc($rule->{type});
+ $raw .= " " . $rule->{action};
+ $raw .= " " . ($rule->{iface} || '-') if $need_iface;
+ $raw .= " " . ($rule->{source} || '-');
+ $raw .= " " . ($rule->{dest} || '-');
+ $raw .= " " . ($rule->{proto} || '-');
+ $raw .= " " . ($rule->{dport} || '-');
+ $raw .= " " . ($rule->{sport} || '-');
+ $raw .= " # " . encode('utf8', $rule->{comment})
+ if $rule->{comment} && $rule->{comment} !~ m/^\s*$/;
+ $raw .= "\n";
+ } else {
+ die "implement me '$rule->{type}'";
+ }
+ }
+
+ return $raw;
+};
+
+my $format_options = sub {
+ my ($options) = @_;
+
+ my $raw = '';
+
+ $raw .= "[OPTIONS]\n\n";
+ foreach my $opt (keys %$options) {
+ $raw .= "$opt: $options->{$opt}\n";
+ }
+ $raw .= "\n";
+
+ return $raw;
+};
+
+sub save_vmfw_conf {
+ my ($vmid, $vmfw_conf) = @_;
+
+ my $raw = '';
+
+ my $options = $vmfw_conf->{options};
+ $raw .= &$format_options($options) if scalar(keys %$options);
+
+ my $rules = $vmfw_conf->{rules};
+ if (scalar(@$rules)) {
+ $raw .= "[RULES]\n\n";
+ $raw .= &$format_rules($rules, 1);
+ $raw .= "\n";
+ }
+
+ my $filename = "/etc/pve/firewall/$vmid.fw";
+ PVE::Tools::file_set_contents($filename, $raw);
+}
+
sub read_vm_firewall_configs {
my ($vmdata) = @_;
my $vmfw_configs = {};
sub generate_std_chains {
my ($ruleset, $options) = @_;
-
+
my $loglevel = get_option_log_level($options, 'smurf_log_level');
# same as shorewall smurflog.
}
sub generate_ipset_chains {
- my ($ipset_ruleset, $options) = @_;
+ my ($ipset_ruleset, $fw_conf) = @_;
- foreach my $ipset (keys %{$options->{ipset}}) {
- generate_ipset($ipset_ruleset, $ipset, $options->{ipset}->{$ipset});
+ foreach my $ipset (keys %{$fw_conf->{ipset}}) {
+ generate_ipset($ipset_ruleset, "PVEFW-$ipset", $fw_conf->{ipset}->{$ipset});
}
}
sub generate_ipset {
my ($ipset_ruleset, $name, $options) = @_;
- push @{$ipset_ruleset->{$name}}, "create $name $options->{type}";
+ my $hashsize = scalar(@$options);
+ if ($hashsize <= 64) {
+ $hashsize = 64;
+ } else {
+ $hashsize = round_powerof2($hashsize);
+ }
- foreach my $ip (@{$options->{ip}}) {
+ push @{$ipset_ruleset->{$name}}, "create $name hash:net family inet hashsize $hashsize maxelem $hashsize";
+
+ foreach my $ip (@$options) {
push @{$ipset_ruleset->{$name}}, "add $name $ip";
}
}
+sub round_powerof2 {
+ my ($int) = @_;
+
+ $int--;
+ $int |= $int >> $_ foreach (1,2,4,8,16);
+ return ++$int;
+}
+
sub save_pvefw_status {
my ($status) = @_;
return $cluster_conf;
}
-my $rules_to_conf = sub {
- my ($rules, $need_iface) = @_;
-
- my $raw = '';
-
- foreach my $rule (@$rules) {
- if ($rule->{type} eq 'in' || $rule->{type} eq 'out') {
- $raw .= '|' if defined($rule->{enable}) && !$rule->{enable};
- $raw .= uc($rule->{type});
- $raw .= " " . $rule->{action};
- $raw .= " " . ($rule->{iface} || '-') if $need_iface;
- $raw .= " " . ($rule->{source} || '-');
- $raw .= " " . ($rule->{dest} || '-');
- $raw .= " " . ($rule->{proto} || '-');
- $raw .= " " . ($rule->{dport} || '-');
- $raw .= " " . ($rule->{sport} || '-');
- $raw .= " # " . encode('utf8', $rule->{comment})
- if $rule->{comment} && $rule->{comment} !~ m/^\s*$/;
- $raw .= "\n";
- } else {
- die "implement me '$rule->{type}'";
- }
- }
-
- return $raw;
-};
-
sub save_clusterfw_conf {
my ($cluster_conf) = @_;
my $raw = '';
my $options = $cluster_conf->{options};
- if (scalar(keys %$options)) {
- $raw .= "[OPTIONS]\n\n";
- foreach my $opt (keys %$options) {
- $raw .= "$opt: $options->{$opt}\n";
- }
- $raw .= "\n";
- }
+ $raw .= &$format_options($options) if scalar(keys %$options);
# fixme: save ipset
my $rules = $cluster_conf->{rules};
if (scalar(@$rules)) {
$raw .= "[RULES]\n\n";
- $raw .= &$rules_to_conf($rules, 1);
+ $raw .= &$format_rules($rules, 1);
$raw .= "\n";
}
foreach my $group (sort keys %{$cluster_conf->{groups}}) {
my $rules = $cluster_conf->{groups}->{$group};
$raw .= "[group $group]\n\n";
- $raw .= &$rules_to_conf($rules, 0);
+ $raw .= &$format_rules($rules, 0);
$raw .= "\n";
}
sub load_hostfw_conf {
my $hostfw_conf = {};
- my $filename = "/etc/pve/local/host.fw";
- if (my $fh = IO::File->new($filename, O_RDONLY)) {
- $hostfw_conf = parse_host_fw_rules($filename, $fh);
+ if (my $fh = IO::File->new($hostfw_conf_filename, O_RDONLY)) {
+ $hostfw_conf = parse_host_fw_rules($hostfw_conf_filename, $fh);
}
return $hostfw_conf;
}
+sub save_hostfw_conf {
+ my ($hostfw_conf) = @_;
+
+ my $raw = '';
+
+ my $options = $hostfw_conf->{options};
+ $raw .= &$format_options($options) if scalar(keys %$options);
+
+ my $rules = $hostfw_conf->{rules};
+ if (scalar(@$rules)) {
+ $raw .= "[RULES]\n\n";
+ $raw .= &$format_rules($rules, 1);
+ $raw .= "\n";
+ }
+
+ PVE::Tools::file_set_contents($hostfw_conf_filename, $raw);
+}
+
sub compile {
my $vmdata = read_local_vm_config();
my $vmfw_configs = read_vm_firewall_configs($vmdata);
generate_bridge_chains($ruleset, $hostfw_conf, $bridge, $routing_table);
my $macaddr = $net->{macaddr};
- generate_tap_rules_direction($ruleset, $cluster_conf, $iface, $netid, $macaddr,
+ generate_tap_rules_direction($ruleset, $cluster_conf, $iface, $netid, $macaddr,
$vmfw_conf, $vmid, $bridge, 'IN');
- generate_tap_rules_direction($ruleset, $cluster_conf, $iface, $netid, $macaddr,
+ generate_tap_rules_direction($ruleset, $cluster_conf, $iface, $netid, $macaddr,
$vmfw_conf, $vmid, $bridge, 'OUT');
}
}
warn "no bridge device for CT $vmid iface '$netid'\n";
next; # fixme?
}
-
+
generate_bridge_chains($ruleset, $hostfw_conf, $bridge, $routing_table);
my $macaddr = $d->{mac};
my $iface = $d->{host_ifname};
- generate_tap_rules_direction($ruleset, $cluster_conf, $iface, $netid, $macaddr,
+ generate_tap_rules_direction($ruleset, $cluster_conf, $iface, $netid, $macaddr,
$vmfw_conf, $vmid, $bridge, 'IN');
- generate_tap_rules_direction($ruleset, $cluster_conf, $iface, $netid, $macaddr,
+ generate_tap_rules_direction($ruleset, $cluster_conf, $iface, $netid, $macaddr,
$vmfw_conf, $vmid, $bridge, 'OUT');
}
}
ruleset_addrule($ruleset, "PVEFW-FORWARD", "-i venet0 -j RETURN");
# disable interbridge routing
- ruleset_addrule($ruleset, "PVEFW-FORWARD", "-o vmbr+ -j PVEFW-Drop");
+ ruleset_addrule($ruleset, "PVEFW-FORWARD", "-o vmbr+ -j PVEFW-Drop");
ruleset_addrule($ruleset, "PVEFW-FORWARD", "-i vmbr+ -j PVEFW-Drop");
- ruleset_addlog($ruleset, "PVEFW-FORWARD", 0, "DROP: ", $loglevel, "-o vmbr+");
- ruleset_addlog($ruleset, "PVEFW-FORWARD", 0, "DROP: ", $loglevel, "-i vmbr+");
- ruleset_addrule($ruleset, "PVEFW-FORWARD", "-o vmbr+ -j DROP");
+ ruleset_addlog($ruleset, "PVEFW-FORWARD", 0, "DROP: ", $loglevel, "-o vmbr+");
+ ruleset_addlog($ruleset, "PVEFW-FORWARD", 0, "DROP: ", $loglevel, "-i vmbr+");
+ ruleset_addrule($ruleset, "PVEFW-FORWARD", "-o vmbr+ -j DROP");
ruleset_addrule($ruleset, "PVEFW-FORWARD", "-i vmbr+ -j DROP");
return wantarray ? ($ruleset, $hostfw_conf, $ipset_ruleset) : $ruleset;
}
sub get_ruleset_status {
- my ($ruleset, $verbose, $ipset) = @_;
-
- my $active_chains = undef;
- if($ipset){
- $active_chains = ipset_get_chains();
- }else{
- $active_chains = iptables_get_chains();
- }
+ my ($ruleset, $active_chains, $digest_fn, $verbose) = @_;
my $statushash = {};
foreach my $chain (sort keys %$ruleset) {
- my $sig = ipset_chain_digest($ruleset->{$chain});
+ my $sig = &$digest_fn($ruleset->{$chain});
+
$statushash->{$chain}->{sig} = $sig;
my $oldsig = $active_chains->{$chain};
print "delete $chain ($sig)\n" if $verbose;
}
}
-
+
return $statushash;
}
my $cmdlist = "*filter\n"; # we pass this to iptables-restore;
- my $statushash = get_ruleset_status($ruleset, $verbose);
+ my ($active_chains, $hooks) = iptables_get_chains();
+ my $statushash = get_ruleset_status($ruleset, $active_chains, \&iptables_chain_digest, $verbose);
# create missing chains first
foreach my $chain (sort keys %$ruleset) {
$cmdlist .= ":$chain - [0:0]\n";
}
- my $rule = "INPUT -j PVEFW-INPUT";
- if (!PVE::Firewall::iptables_rule_exist($rule)) {
- $cmdlist .= "-A $rule\n";
- }
- $rule = "OUTPUT -j PVEFW-OUTPUT";
- if (!PVE::Firewall::iptables_rule_exist($rule)) {
- $cmdlist .= "-A $rule\n";
- }
-
- $rule = "FORWARD -j PVEFW-FORWARD";
- if (!PVE::Firewall::iptables_rule_exist($rule)) {
- $cmdlist .= "-A $rule\n";
+ foreach my $h (qw(INPUT OUTPUT FORWARD)) {
+ if (!$hooks->{$h}) {
+ $cmdlist .= "-A $h -j PVEFW-$h\n";
+ }
}
foreach my $chain (sort keys %$ruleset) {
}
my $changes = $cmdlist ne "*filter\n" ? 1 : 0;
-
+
$cmdlist .= "COMMIT\n";
return wantarray ? ($cmdlist, $changes) : $cmdlist;
my $cmdlist = "";
- my $statushash = get_ruleset_status($ruleset, $verbose, 1);
+ my $delete_cmdlist = "";
+
+ my $active_chains = ipset_get_chains();
+ my $statushash = get_ruleset_status($ruleset, $active_chains, \&ipset_chain_digest, $verbose);
foreach my $chain (sort keys %$ruleset) {
my $stat = $statushash->{$chain};
foreach my $cmd (@{$ruleset->{$chain}}) {
$cmdlist .= "$cmd\n";
}
- }
+ }
if ($stat->{action} eq 'update') {
my $chain_swap = $chain."_swap";
foreach my $cmd (@{$ruleset->{$chain}}) {
$cmd =~ s/$chain/$chain_swap/;
$cmdlist .= "$cmd\n";
-
}
$cmdlist .= "swap $chain_swap $chain\n";
$cmdlist .= "flush $chain_swap\n";
$cmdlist .= "destroy $chain_swap\n";
- }
+ }
}
foreach my $chain (keys %$statushash) {
next if $statushash->{$chain}->{action} ne 'delete';
- $cmdlist .= "flush $chain\n";
- $cmdlist .= "destroy $chain\n";
+ $delete_cmdlist .= "flush $chain\n";
+ $delete_cmdlist .= "destroy $chain\n";
}
- my $changes = $cmdlist ? 1 : 0;
+ my $changes = ($cmdlist || $delete_cmdlist) ? 1 : 0;
- return wantarray ? ($cmdlist, $changes) : $cmdlist;
+ return ($cmdlist, $delete_cmdlist, $changes);
}
sub apply_ruleset {
update_nf_conntrack_max($hostfw_conf);
- my $ipsetcmdlist = get_ipset_cmdlist($ipset_ruleset, $verbose);
+ my ($ipset_create_cmdlist, $ipset_delete_cmdlist, $ipset_changes) =
+ get_ipset_cmdlist($ipset_ruleset, undef, $verbose);
- my $cmdlist = get_ruleset_cmdlist($ruleset, $verbose);
+ my ($cmdlist, $changes) = get_ruleset_cmdlist($ruleset, $verbose);
- print $ipsetcmdlist if $verbose;
+ if ($verbose) {
+ if ($ipset_changes) {
+ print "ipset changes:\n";
+ print $ipset_create_cmdlist if $ipset_create_cmdlist;
+ print $ipset_delete_cmdlist if $ipset_delete_cmdlist;
+ }
- print $cmdlist if $verbose;
+ if ($changes) {
+ print "iptables changes:\n";
+ print $cmdlist;
+ }
+ }
- ipset_restore_cmdlist($ipsetcmdlist);
+ ipset_restore_cmdlist($ipset_create_cmdlist);
iptables_restore_cmdlist($cmdlist);
+ ipset_restore_cmdlist($ipset_delete_cmdlist) if $ipset_delete_cmdlist;
+
# test: re-read status and check if everything is up to date
- my $statushash = get_ruleset_status($ruleset);
+ my $active_chains = iptables_get_chains();
+ my $statushash = get_ruleset_status($ruleset, $active_chains, \&iptables_chain_digest, 0);
my $errors;
foreach my $chain (sort keys %$ruleset) {
$cmdlist .= "-D $h -j PVEFW-$h\n";
}
}
-
+
foreach my $chain (keys %$chash) {
$cmdlist .= "-F $chain\n";
}
projects / pve-firewall.git / blobdiff