use PVE::ProcFSTools;
use PVE::Tools qw($IPV4RE $IPV6RE);
use PVE::Network;
+use PVE::SafeSyslog;
use File::Basename;
use File::Path;
use IO::File;
use Net::IP;
use PVE::Tools qw(run_command lock_file dir_glob_foreach);
use Encode;
+use Storable qw(dclone);
my $hostfw_conf_filename = "/etc/pve/local/host.fw";
my $pvefw_conf_dir = "/etc/pve/firewall";
my $max_ipset_name_length = 64;
my $max_group_name_length = 18;
+my $PROTOCOLS_WITH_PORTS = {
+ udp => 1, 17 => 1,
+ udplite => 1, 136 => 1,
+ tcp => 1, 6 => 1,
+ dccp => 1, 33 => 1,
+ sctp => 1, 132 => 1,
+};
+
PVE::JSONSchema::register_format('IPorCIDR', \&pve_verify_ip_or_cidr);
sub pve_verify_ip_or_cidr {
my ($cidr, $noerr) = @_;
emerg => 0,
};
+# %rule
+#
+# name => optional
+# enable => [0|1]
+# action =>
+# proto =>
+# sport => port[,port[,port]].. or port:port
+# dport => port[,port[,port]].. or port:port
+# log => optional, loglevel
+# logmsg => optional, logmsg - overwrites default
+# iface_in => incomin interface
+# iface_out => outgoing interface
+# match => optional, overwrites generation of match
+# target => optional, overwrites action
+
# we need to overwrite some macros for ipv6
my $pve_ipv6fw_macros = {
'Ping' => [
{ action => 'PARAM', proto => 'tcp', dport => '465' },
{ action => 'PARAM', proto => 'tcp', dport => '587' },
],
+ 'MDNS' => [
+ "Multicast DNS",
+ { action => 'PARAM', proto => 'udp', dport => '5353' },
+ ],
'Munin' => [
"Munin networked resource monitoring traffic",
{ action => 'PARAM', proto => 'tcp', dport => '4949' },
my $FWACCEPTMARK_OFF = "0x00000000/0x80000000";
my $pve_std_chains = {};
-$pve_std_chains->{4} = {
+my $pve_std_chains_conf = {};
+$pve_std_chains_conf->{4} = {
'PVEFW-SET-ACCEPT-MARK' => [
- "-j MARK --set-mark $FWACCEPTMARK_ON",
+ { target => "-j MARK --set-mark $FWACCEPTMARK_ON" },
],
'PVEFW-DropBroadcast' => [
# same as shorewall 'Broadcast'
{ action => 'DROP', dsttype => 'BROADCAST' },
{ 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",
- "-p icmp -j REJECT --reject-with icmp-host-unreachable",
- "-j REJECT --reject-with icmp-host-prohibited",
+ { match => '-p tcp', target => '-j REJECT --reject-with tcp-reset' },
+ { match => '-p udp', target => '-j REJECT --reject-with icmp-port-unreachable' },
+ { match => '-p icmp', target => '-j REJECT --reject-with icmp-host-unreachable' },
+ { target => '-j REJECT --reject-with icmp-host-prohibited' },
],
'PVEFW-Drop' => [
# same as shorewall 'Drop', which is equal to DROP,
{ action => 'ACCEPT', proto => 'icmp', dport => 'fragmentation-needed' },
{ action => 'ACCEPT', proto => 'icmp', dport => 'time-exceeded' },
# Drop packets with INVALID state
- "-m conntrack --ctstate INVALID -j DROP",
+ { action => 'DROP', match => '-m conntrack --ctstate INVALID', },
# Drop Microsoft SMB noise
- { action => 'DROP', proto => 'udp', dport => '135,445', nbdport => 2 },
- { action => 'DROP', proto => 'udp', dport => '137:139'},
+ { action => 'DROP', proto => 'udp', dport => '135,445' },
+ { action => 'DROP', proto => 'udp', dport => '137:139' },
{ action => 'DROP', proto => 'udp', dport => '1024:65535', sport => 137 },
- { action => 'DROP', proto => 'tcp', dport => '135,139,445', nbdport => 3 },
+ { action => 'DROP', proto => 'tcp', dport => '135,139,445' },
{ action => 'DROP', proto => 'udp', dport => 1900 }, # UPnP
# Drop new/NotSyn traffic so that it doesn't get logged
- "-p tcp -m tcp ! --tcp-flags FIN,SYN,RST,ACK SYN -j DROP",
+ { action => 'DROP', match => '-p tcp -m tcp ! --tcp-flags FIN,SYN,RST,ACK SYN' },
# Drop DNS replies
{ action => 'DROP', proto => 'udp', sport => 53 },
],
{ action => 'ACCEPT', proto => 'icmp', dport => 'fragmentation-needed' },
{ action => 'ACCEPT', proto => 'icmp', dport => 'time-exceeded' },
# Drop packets with INVALID state
- "-m conntrack --ctstate INVALID -j DROP",
+ { action => 'DROP', match => '-m conntrack --ctstate INVALID', },
# Drop Microsoft SMB noise
- { action => 'PVEFW-reject', proto => 'udp', dport => '135,445', nbdport => 2 },
+ { action => 'PVEFW-reject', proto => 'udp', dport => '135,445' },
{ action => 'PVEFW-reject', proto => 'udp', dport => '137:139'},
{ action => 'PVEFW-reject', proto => 'udp', dport => '1024:65535', sport => 137 },
- { action => 'PVEFW-reject', proto => 'tcp', dport => '135,139,445', nbdport => 3 },
+ { action => 'PVEFW-reject', proto => 'tcp', dport => '135,139,445' },
{ action => 'DROP', proto => 'udp', dport => 1900 }, # UPnP
# Drop new/NotSyn traffic so that it doesn't get logged
- "-p tcp -m tcp ! --tcp-flags FIN,SYN,RST,ACK SYN -j DROP",
+ { action => 'DROP', match => '-p tcp -m tcp ! --tcp-flags FIN,SYN,RST,ACK SYN' },
# Drop DNS replies
{ action => 'DROP', proto => 'udp', sport => 53 },
],
'PVEFW-tcpflags' => [
# same as shorewall tcpflags action.
# Packets arriving on this interface are checked for som illegal combinations of TCP flags
- "-p tcp -m tcp --tcp-flags FIN,SYN,RST,PSH,ACK,URG FIN,PSH,URG -g PVEFW-logflags",
- "-p tcp -m tcp --tcp-flags FIN,SYN,RST,PSH,ACK,URG NONE -g PVEFW-logflags",
- "-p tcp -m tcp --tcp-flags SYN,RST SYN,RST -g PVEFW-logflags",
- "-p tcp -m tcp --tcp-flags FIN,SYN FIN,SYN -g PVEFW-logflags",
- "-p tcp -m tcp --sport 0 --tcp-flags FIN,SYN,RST,ACK SYN -g PVEFW-logflags",
+ { match => '-p tcp -m tcp --tcp-flags FIN,SYN,RST,PSH,ACK,URG FIN,PSH,URG', target => '-g PVEFW-logflags' },
+ { match => '-p tcp -m tcp --tcp-flags FIN,SYN,RST,PSH,ACK,URG NONE', target => '-g PVEFW-logflags' },
+ { match => '-p tcp -m tcp --tcp-flags SYN,RST SYN,RST', target => '-g PVEFW-logflags' },
+ { match => '-p tcp -m tcp --tcp-flags FIN,SYN FIN,SYN', target => '-g PVEFW-logflags' },
+ { match => '-p tcp -m tcp --sport 0 --tcp-flags FIN,SYN,RST,ACK SYN', target => '-g PVEFW-logflags' },
],
'PVEFW-smurfs' => [
# same as shorewall smurfs action
# Filter packets for smurfs (packets with a broadcast address as the source).
- "-s 0.0.0.0/32 -j RETURN", # allow DHCP
- "-m addrtype --src-type BROADCAST -g PVEFW-smurflog",
- "-s 224.0.0.0/4 -g PVEFW-smurflog",
+ { match => '-s 0.0.0.0/32', target => '-j RETURN' }, # allow DHCP
+ { match => '-m addrtype --src-type BROADCAST', target => '-g PVEFW-smurflog' },
+ { match => '-s 224.0.0.0/4', target => '-g PVEFW-smurflog' },
+ ],
+ 'PVEFW-smurflog' => [
+ { action => 'DROP', logmsg => 'DROP: ' },
+ ],
+ 'PVEFW-logflags' => [
+ { action => 'DROP', logmsg => 'DROP: ' },
],
};
-$pve_std_chains->{6} = {
+$pve_std_chains_conf->{6} = {
'PVEFW-SET-ACCEPT-MARK' => [
- "-j MARK --set-mark $FWACCEPTMARK_ON",
+ { target => "-j MARK --set-mark $FWACCEPTMARK_ON" },
],
'PVEFW-DropBroadcast' => [
- # same as shorewall 'Broadcast'
- # simply DROP BROADCAST/MULTICAST/ANYCAST
- # we can use this to reduce logging
- #{ action => 'DROP', dsttype => 'BROADCAST' }, #no broadcast in ipv6
+ # same as shorewall 'Broadcast'
+ # simply DROP BROADCAST/MULTICAST/ANYCAST
+ # we can use this to reduce logging
+ #{ action => 'DROP', dsttype => 'BROADCAST' }, #no broadcast in ipv6
# ipv6 addrtype does not work with kernel 2.6.32
#{ action => 'DROP', dsttype => 'MULTICAST' },
- #{ action => 'DROP', dsttype => 'ANYCAST' },
- { action => 'DROP', dest => 'ff00::/8' },
- #{ action => 'DROP', dest => '224.0.0.0/4' },
+ #{ action => 'DROP', dsttype => 'ANYCAST' },
+ { action => 'DROP', dest => 'ff00::/8' },
+ #{ 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' },
+ # same as shorewall 'reject'
+ #{ action => 'DROP', dsttype => 'BROADCAST' },
+ #{ action => 'DROP', source => '224.0.0.0/4' },
{ action => 'DROP', proto => 'icmpv6' },
- "-p tcp -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 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",
],
'PVEFW-Drop' => [
- # same as shorewall 'Drop', which is equal to DROP,
- # but REJECT/DROP some packages to reduce logging,
- # and ACCEPT critical ICMP types
+ # 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'
- # we are not interested in BROADCAST/MULTICAST/ANYCAST
- { action => 'PVEFW-DropBroadcast' },
- # ACCEPT critical ICMP types
- { action => 'ACCEPT', proto => 'icmpv6', dport => 'destination-unreachable' },
- { action => 'ACCEPT', proto => 'icmpv6', dport => 'time-exceeded' },
- { action => 'ACCEPT', proto => 'icmpv6', dport => 'packet-too-big' },
-
- # Drop packets with INVALID state
- "-m conntrack --ctstate INVALID -j DROP",
- # Drop Microsoft SMB noise
- { action => 'DROP', proto => 'udp', dport => '135,445', nbdport => 2 },
+ # we are not interested in BROADCAST/MULTICAST/ANYCAST
+ { action => 'PVEFW-DropBroadcast' },
+ # ACCEPT critical ICMP types
+ { action => 'ACCEPT', proto => 'icmpv6', dport => 'destination-unreachable' },
+ { action => 'ACCEPT', proto => 'icmpv6', dport => 'time-exceeded' },
+ { action => 'ACCEPT', proto => 'icmpv6', dport => 'packet-too-big' },
+ # Drop packets with INVALID state
+ { action => 'DROP', match => '-m conntrack --ctstate INVALID', },
+ # Drop Microsoft SMB noise
+ { action => 'DROP', proto => 'udp', dport => '135,445' },
{ action => 'DROP', proto => 'udp', dport => '137:139'},
{ action => 'DROP', proto => 'udp', dport => '1024:65535', sport => 137 },
- { action => 'DROP', proto => 'tcp', dport => '135,139,445', nbdport => 3 },
+ { action => 'DROP', proto => 'tcp', dport => '135,139,445' },
{ action => 'DROP', proto => 'udp', dport => 1900 }, # UPnP
- # Drop new/NotSyn traffic so that it doesn't get logged
- "-p tcp -m tcp ! --tcp-flags FIN,SYN,RST,ACK SYN -j DROP",
- # Drop DNS replies
+ # Drop new/NotSyn traffic so that it doesn't get logged
+ { action => 'DROP', match => '-p tcp -m tcp ! --tcp-flags FIN,SYN,RST,ACK SYN' },
+ # Drop DNS replies
{ action => 'DROP', proto => 'udp', sport => 53 },
],
'PVEFW-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'
- # we are not interested in BROADCAST/MULTICAST/ANYCAST
- { action => 'PVEFW-DropBroadcast' },
- # ACCEPT critical ICMP types
- { action => 'ACCEPT', proto => 'icmpv6', dport => 'destination-unreachable' },
- { action => 'ACCEPT', proto => 'icmpv6', dport => 'time-exceeded' },
- { action => 'ACCEPT', proto => 'icmpv6', dport => 'packet-too-big' },
-
- # Drop packets with INVALID state
- "-m conntrack --ctstate INVALID -j DROP",
- # Drop Microsoft SMB noise
- { action => 'PVEFW-reject', proto => 'udp', dport => '135,445', nbdport => 2 },
- { action => 'PVEFW-reject', proto => 'udp', dport => '137:139'},
- { action => 'PVEFW-reject', proto => 'udp', dport => '1024:65535', sport => 137 },
- { action => 'PVEFW-reject', proto => 'tcp', dport => '135,139,445', nbdport => 3 },
- { action => 'DROP', proto => 'udp', dport => 1900 }, # UPnP
- # Drop new/NotSyn traffic so that it doesn't get logged
- "-p tcp -m tcp ! --tcp-flags FIN,SYN,RST,ACK SYN -j DROP",
- # Drop DNS replies
- { action => 'DROP', proto => 'udp', sport => 53 },
+ # 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'
+ # we are not interested in BROADCAST/MULTICAST/ANYCAST
+ { action => 'PVEFW-DropBroadcast' },
+ # ACCEPT critical ICMP types
+ { action => 'ACCEPT', proto => 'icmpv6', dport => 'destination-unreachable' },
+ { action => 'ACCEPT', proto => 'icmpv6', dport => 'time-exceeded' },
+ { action => 'ACCEPT', proto => 'icmpv6', dport => 'packet-too-big' },
+ # Drop packets with INVALID state
+ { action => 'DROP', match => '-m conntrack --ctstate INVALID', },
+ # Drop Microsoft SMB noise
+ { action => 'PVEFW-reject', proto => 'udp', dport => '135,445' },
+ { action => 'PVEFW-reject', proto => 'udp', dport => '137:139' },
+ { action => 'PVEFW-reject', proto => 'udp', dport => '1024:65535', sport => 137 },
+ { action => 'PVEFW-reject', proto => 'tcp', dport => '135,139,445' },
+ { action => 'DROP', proto => 'udp', dport => 1900 }, # UPnP
+ # Drop new/NotSyn traffic so that it doesn't get logged
+ { action => 'DROP', match => '-p tcp -m tcp ! --tcp-flags FIN,SYN,RST,ACK SYN' },
+ # Drop DNS replies
+ { action => 'DROP', proto => 'udp', sport => 53 },
],
'PVEFW-tcpflags' => [
- # same as shorewall tcpflags action.
- # Packets arriving on this interface are checked for som illegal combinations of TCP flags
- "-p tcp -m tcp --tcp-flags FIN,SYN,RST,PSH,ACK,URG FIN,PSH,URG -g PVEFW-logflags",
- "-p tcp -m tcp --tcp-flags FIN,SYN,RST,PSH,ACK,URG NONE -g PVEFW-logflags",
- "-p tcp -m tcp --tcp-flags SYN,RST SYN,RST -g PVEFW-logflags",
- "-p tcp -m tcp --tcp-flags FIN,SYN FIN,SYN -g PVEFW-logflags",
- "-p tcp -m tcp --sport 0 --tcp-flags FIN,SYN,RST,ACK SYN -g PVEFW-logflags",
+ # same as shorewall tcpflags action.
+ # Packets arriving on this interface are checked for som illegal combinations of TCP flags
+ { match => '-p tcp -m tcp --tcp-flags FIN,SYN,RST,PSH,ACK,URG FIN,PSH,URG', target => '-g PVEFW-logflags' },
+ { match => '-p tcp -m tcp --tcp-flags FIN,SYN,RST,PSH,ACK,URG NONE', target => '-g PVEFW-logflags' },
+ { match => '-p tcp -m tcp --tcp-flags SYN,RST SYN,RST', target => '-g PVEFW-logflags' },
+ { match => '-p tcp -m tcp --tcp-flags FIN,SYN FIN,SYN', target => '-g PVEFW-logflags' },
+ { match => '-p tcp -m tcp --sport 0 --tcp-flags FIN,SYN,RST,ACK SYN', target => '-g PVEFW-logflags' },
+ ],
+ 'PVEFW-logflags' => [
+ { action => 'DROP', logmsg => 'DROP: ' },
],
};
next if $line =~m/^#/;
next if ($line =~m/^\s*$/);
- if ($line =~ m!^(\S+)\s+(\S+)/(tcp|udp).*$!) {
+ if ($line =~ m!^(\S+)\s+(\S+)/(tcp|udp|sctp).*$!) {
$services->{byid}->{$2}->{name} = $1;
$services->{byid}->{$2}->{port} = $2;
$services->{byid}->{$2}->{$3} = 1;
return $etc_services;
}
-my $etc_protocols;
-
-sub get_etc_protocols {
- return $etc_protocols if $etc_protocols;
-
- my $filename = "/etc/protocols";
+sub parse_protocol_file {
+ my ($filename) = @_;
my $fh = IO::File->new($filename, O_RDONLY);
if (!$fh) {
next if $line =~m/^#/;
next if ($line =~m/^\s*$/);
- if ($line =~ m!^(\S+)\s+(\d+)\s+.*$!) {
+ if ($line =~ m!^(\S+)\s+(\d+)(?:\s+.*)?$!) {
$protocols->{byid}->{$2}->{name} = $1;
$protocols->{byname}->{$1} = $protocols->{byid}->{$2};
}
close($fh);
+ return $protocols;
+}
+
+my $etc_protocols;
+
+sub get_etc_protocols {
+ return $etc_protocols if $etc_protocols;
+
+ my $protocols = parse_protocol_file('/etc/protocols');
+
# add special case for ICMP v6
$protocols->{byid}->{icmpv6}->{name} = "icmpv6";
$protocols->{byname}->{icmpv6} = $protocols->{byid}->{icmpv6};
return $etc_protocols;
}
+my $etc_ethertypes;
+
+sub get_etc_ethertypes {
+ $etc_ethertypes = parse_protocol_file('/etc/ethertypes')
+ if !$etc_ethertypes;
+ return $etc_ethertypes;
+}
+
my $__local_network;
sub local_network {
my $mask;
if ($isv6) {
$mask = $entry->{prefix};
+ next if !$mask; # skip the default route...
} else {
$mask = $PVE::Network::ipv4_mask_hash_localnet->{$entry->{mask}};
next if !defined($mask);
}
my $cidr = "$entry->{dest}/$mask";
my $testnet = Net::IP->new($cidr);
- if ($testnet->overlaps($testip) == $Net::IP::IP_B_IN_A_OVERLAP) {
+ my $overlap = $testnet->overlaps($testip);
+ if ($overlap == $Net::IP::IP_B_IN_A_OVERLAP ||
+ $overlap == $Net::IP::IP_IDENTICAL)
+ {
$__local_network = $cidr;
return;
}
my $iprange = 0;
my $ipversion;
- foreach my $elem (split(/,/, $str)) {
+ my @elements = split(/,/, $str);
+ die "extraneous commas in list\n" if $str ne join(',', @elements);
+ foreach my $elem (@elements) {
$count++;
my $ip = Net::IP->new($elem);
if (!$ip) {
my $count = 0;
my $icmp_port = 0;
- foreach my $item (split(/,/, $str)) {
- $count++;
+ my @elements = split(/,/, $str);
+ die "extraneous commas in list\n" if $str ne join(',', @elements);
+ foreach my $item (@elements) {
if ($item =~ m/^(\d+):(\d+)$/) {
+ $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+)$/) {
+ $count += 1;
my $port = $1;
die "invalid port '$port'\n" if $port > 65535;
} else {
}
}
- die "ICPM ports not allowed in port range\n" if $icmp_port && $count > 1;
+ die "ICPM ports not allowed in port range\n" if $icmp_port && $count > 0;
+
+ # I really don't like to use the word number here, but it's the only thing
+ # that makes sense in a literal way. The range 1:100 counts as 2, not as
+ # one and not as 100...
+ die "too many entries in port list (> 15 numbers)\n"
+ if $count > 15;
- return $count;
+ return (scalar(@elements) > 1);
}
PVE::JSONSchema::register_format('pve-fw-sport-spec', \&pve_fw_verify_sport_spec);
},
digest => get_standard_option('pve-config-digest'),
type => {
+ description => "Rule type.",
type => 'string',
optional => 1,
enum => ['in', 'out', 'group'],
minLength => 2,
},
macro => {
+ description => "Use predefined standard macro.",
type => 'string',
optional => 1,
maxLength => 128,
optional => 1,
},
enable => {
+ description => "Flag to enable/disable a rule.",
type => 'integer',
minimum => 0,
optional => 1,
optional => 1,
},
comment => {
+ description => "Descriptive comment.",
type => 'string',
optional => 1,
},
if ($rule->{dport}) {
eval { parse_port_name_number_or_range($rule->{dport}, 1); };
&$add_error('dport', $@) if $@;
+ my $proto = $rule->{proto};
&$add_error('proto', "missing property - 'dport' requires this property")
- if !$rule->{proto};
+ if !$proto;
+ &$add_error('dport', "protocol '$proto' does not support ports")
+ if !$PROTOCOLS_WITH_PORTS->{$proto} &&
+ $proto ne 'icmp' && $proto ne 'icmpv6'; # special cases
}
if ($rule->{sport}) {
eval { parse_port_name_number_or_range($rule->{sport}, 0); };
&$add_error('sport', $@) if $@;
+ my $proto = $rule->{proto};
&$add_error('proto', "missing property - 'sport' requires this property")
- if !$rule->{proto};
+ if !$proto;
+ &$add_error('sport', "protocol '$proto' does not support ports")
+ if !$PROTOCOLS_WITH_PORTS->{$proto};
}
if ($rule->{source}) {
$bridge_firewall_enabled = 1;
}
-my $rule_format = "%-15s %-30s %-30s %-15s %-15s %-15s\n";
-
sub iptables_restore_cmdlist {
my ($cmdlist) = @_;
run_command("/sbin/ipset restore", input => $cmdlist, errmsg => "ipset_restore_cmdlist");
}
+sub ebtables_restore_cmdlist {
+ my ($cmdlist) = @_;
+
+ run_command("/sbin/ebtables-restore", input => $cmdlist, errmsg => "ebtables_restore_cmdlist");
+}
+
sub iptables_get_chains {
my ($iptablescmd) = @_;
return $res;
}
-sub ruleset_generate_cmdstr {
- my ($ruleset, $chain, $ipversion, $rule, $actions, $goto, $cluster_conf, $fw_conf) = @_;
+sub ebtables_get_chains {
- return if defined($rule->{enable}) && !$rule->{enable};
- return if $rule->{errors};
+ my $res = {};
+ my $chains = {};
+ my $parser = sub {
+ my $line = shift;
+ return if $line =~ m/^#/;
+ return if $line =~ m/^\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;
+ } else {
+ # simply ignore the rest
+ return;
+ }
+ };
- die "unable to emit macro - internal error" if $rule->{macro}; # should not happen
+ run_command("/sbin/ebtables-save", outfunc => $parser);
+ # compute digest for each chain and store rules as well
+ foreach my $chain (keys %$chains) {
+ $res->{$chain}->{rules} = $chains->{$chain};
+ $res->{$chain}->{sig} = iptables_chain_digest($chains->{$chain});
+ }
+ return $res;
+}
- my $nbdport = defined($rule->{dport}) ? parse_port_name_number_or_range($rule->{dport}, 1) : 0;
- my $nbsport = defined($rule->{sport}) ? parse_port_name_number_or_range($rule->{sport}, 0) : 0;
+# substitude action of rule according to action hash
+sub rule_substitude_action {
+ my ($rule, $actions) = @_;
- my @cmd = ();
+ if (my $action = $rule->{action}) {
+ $rule->{action} = $actions->{$action} if defined($actions->{$action});
+ }
+}
- push @cmd, "-i $rule->{iface_in}" if $rule->{iface_in};
- push @cmd, "-o $rule->{iface_out}" if $rule->{iface_out};
+# generate a src or dst match
+# $dir(ection) is either d or s
+sub ipt_gen_src_or_dst_match {
+ my ($adr, $dir, $ipversion, $cluster_conf, $fw_conf) = @_;
- my $source = $rule->{source};
- my $dest = $rule->{dest};
+ my $srcdst;
+ if ($dir eq 's') {
+ $srcdst = "src";
+ } elsif ($dir eq 'd') {
+ $srcdst = "dst";
+ } else {
+ die "ipt_gen_src_or_dst_match: invalid direction $dir \n";
+ }
- if ($source) {
- if ($source =~ m/^\+/) {
- if ($source =~ m/^\+(${ipset_name_pattern})$/) {
- my $name = $1;
- if ($fw_conf && $fw_conf->{ipset}->{$name}) {
- my $ipset_chain = compute_ipset_chain_name($fw_conf->{vmid}, $name, $ipversion);
- push @cmd, "-m set --match-set ${ipset_chain} src";
- } elsif ($cluster_conf && $cluster_conf->{ipset}->{$name}) {
- my $ipset_chain = compute_ipset_chain_name(0, $name, $ipversion);
- push @cmd, "-m set --match-set ${ipset_chain} src";
- } else {
- die "no such ipset '$name'\n";
- }
+ my $match;
+ if ($adr =~ m/^\+/) {
+ if ($adr =~ m/^\+(${ipset_name_pattern})$/) {
+ my $name = $1;
+ my $ipset_chain;
+ if ($fw_conf && $fw_conf->{ipset}->{$name}) {
+ $ipset_chain = compute_ipset_chain_name($fw_conf->{vmid}, $name, $ipversion);
+ } elsif ($cluster_conf && $cluster_conf->{ipset}->{$name}) {
+ $ipset_chain = compute_ipset_chain_name(0, $name, $ipversion);
} else {
- die "invalid security group name '$source'\n";
+ die "no such ipset '$name'\n";
}
- } elsif ($source =~ m/^${ip_alias_pattern}$/){
- my $alias = lc($source);
- my $e = $fw_conf ? $fw_conf->{aliases}->{$alias} : undef;
- $e = $cluster_conf->{aliases}->{$alias} if !$e && $cluster_conf;
- die "no such alias '$source'\n" if !$e;
- push @cmd, "-s $e->{cidr}";
- } elsif ($source =~ m/\-/){
- push @cmd, "-m iprange --src-range $source";
+ $match = "-m set --match-set ${ipset_chain} ${srcdst}";
} else {
- push @cmd, "-s $source";
- }
+ die "invalid security group name '$adr'\n";
+ }
+ } elsif ($adr =~ m/^${ip_alias_pattern}$/){
+ my $alias = lc($adr);
+ my $e = $fw_conf ? $fw_conf->{aliases}->{$alias} : undef;
+ $e = $cluster_conf->{aliases}->{$alias} if !$e && $cluster_conf;
+ die "no such alias '$adr'\n" if !$e;
+ $match = "-${dir} $e->{cidr}";
+ } elsif ($adr =~ m/\-/){
+ $match = "-m iprange --${srcdst}-range $adr";
+ } else {
+ $match = "-${dir} $adr";
}
- if ($dest) {
- if ($dest =~ m/^\+/) {
- if ($dest =~ m/^\+(${ipset_name_pattern})$/) {
- my $name = $1;
- if ($fw_conf && $fw_conf->{ipset}->{$name}) {
- my $ipset_chain = compute_ipset_chain_name($fw_conf->{vmid}, $name, $ipversion);
- push @cmd, "-m set --match-set ${ipset_chain} dst";
- } elsif ($cluster_conf && $cluster_conf->{ipset}->{$name}) {
- my $ipset_chain = compute_ipset_chain_name(0, $name, $ipversion);
- push @cmd, "-m set --match-set ${ipset_chain} dst";
+ return $match;
+}
+
+# convert a %rule to an array of iptables commands
+sub ipt_rule_to_cmds {
+ my ($rule, $chain, $ipversion, $cluster_conf, $fw_conf, $vmid) = @_;
+
+ die "ipt_rule_to_cmds unable to handle macro" if $rule->{macro}; #should not happen
+
+ my @match = ();
+
+ if (defined $rule->{match}) {
+ push @match, $rule->{match};
+ } else {
+ push @match, "-i $rule->{iface_in}" if $rule->{iface_in};
+ push @match, "-o $rule->{iface_out}" if $rule->{iface_out};
+
+ if ($rule->{source}) {
+ push @match, ipt_gen_src_or_dst_match($rule->{source}, 's', $ipversion, $cluster_conf, $fw_conf);
+ }
+ if ($rule->{dest}) {
+ push @match, ipt_gen_src_or_dst_match($rule->{dest}, 'd', $ipversion, $cluster_conf, $fw_conf);
+ }
+
+ if (my $proto = $rule->{proto}) {
+ push @match, "-p $proto";
+
+ my $multidport = defined($rule->{dport}) && parse_port_name_number_or_range($rule->{dport}, 1);
+ my $multisport = defined($rule->{sport}) && parse_port_name_number_or_range($rule->{sport}, 0);
+
+ my $add_dport = sub {
+ return if !$rule->{dport};
+
+ if ($proto eq 'icmp') {
+ # Note: we use dport to store --icmp-type
+ die "unknown icmp-type '$rule->{dport}'\n"
+ if $rule->{dport} !~ /^\d+$/ && !defined($icmp_type_names->{$rule->{dport}});
+ push @match, "-m icmp --icmp-type $rule->{dport}";
+ } elsif ($proto eq 'icmpv6') {
+ # Note: we use dport to store --icmpv6-type
+ die "unknown icmpv6-type '$rule->{dport}'\n"
+ if $rule->{dport} !~ /^\d+$/ && !defined($icmpv6_type_names->{$rule->{dport}});
+ push @match, "-m icmpv6 --icmpv6-type $rule->{dport}";
+ } elsif (!$PROTOCOLS_WITH_PORTS->{$proto}) {
+ die "protocol $proto does not have ports\n";
+ } elsif ($multidport) {
+ push @match, "--match multiport", "--dports $rule->{dport}";
} else {
- die "no such ipset '$name'\n";
+ push @match, "--dport $rule->{dport}";
}
- } else {
- die "invalid security group name '$dest'\n";
- }
- } elsif ($dest =~ m/^${ip_alias_pattern}$/){
- my $alias = lc($dest);
- my $e = $fw_conf ? $fw_conf->{aliases}->{$alias} : undef;
- $e = $cluster_conf->{aliases}->{$alias} if !$e && $cluster_conf;
- die "no such alias '$dest'\n" if !$e;
- push @cmd, "-d $e->{cidr}";
- } elsif ($dest =~ m/^(\d+)\.(\d+).(\d+).(\d+)\-(\d+)\.(\d+).(\d+).(\d+)$/){
- push @cmd, "-m iprange --dst-range $dest";
- } else {
- push @cmd, "-d $dest";
- }
- }
+ };
- if ($rule->{proto}) {
- push @cmd, "-p $rule->{proto}";
-
- my $multiport = 0;
- $multiport++ if $nbdport > 1;
- $multiport++ if $nbsport > 1;
-
- push @cmd, "--match multiport" if $multiport;
-
- die "multiport: option '--sports' cannot be used together with '--dports'\n"
- if ($multiport == 2) && ($rule->{dport} ne $rule->{sport});
-
- if ($rule->{dport}) {
- if ($rule->{proto} && $rule->{proto} eq 'icmp') {
- # Note: we use dport to store --icmp-type
- die "unknown icmp-type '$rule->{dport}'\n"
- if $rule->{dport} !~ /^\d+$/ && !defined($icmp_type_names->{$rule->{dport}});
- push @cmd, "-m icmp --icmp-type $rule->{dport}";
- } elsif ($rule->{proto} && $rule->{proto} eq 'icmpv6') {
- # Note: we use dport to store --icmpv6-type
- die "unknown icmpv6-type '$rule->{dport}'\n"
- if $rule->{dport} !~ /^\d+$/ && !defined($icmpv6_type_names->{$rule->{dport}});
- push @cmd, "-m icmpv6 --icmpv6-type $rule->{dport}";
- } else {
- if ($nbdport > 1) {
- if ($multiport == 2) {
- push @cmd, "--ports $rule->{dport}";
- } else {
- push @cmd, "--dports $rule->{dport}";
- }
+ my $add_sport = sub {
+ return if !$rule->{sport};
+
+ die "protocol $proto does not have ports\n"
+ if !$PROTOCOLS_WITH_PORTS->{$proto};
+ if ($multisport) {
+ push @match, "--match multiport", "--sports $rule->{sport}";
} else {
- push @cmd, "--dport $rule->{dport}";
+ push @match, "--sport $rule->{sport}";
}
- }
- }
+ };
- if ($rule->{sport}) {
- if ($nbsport > 1) {
- push @cmd, "--sports $rule->{sport}" if $multiport != 2;
- } else {
- push @cmd, "--sport $rule->{sport}";
- }
+ # order matters - single port before multiport!
+ $add_dport->() if $multisport;
+ $add_sport->();
+ $add_dport->() if !$multisport;
+ } elsif ($rule->{dport} || $rule->{sport}) {
+ die "destination port '$rule->{dport}', but no protocol specified\n" if $rule->{dport};
+ die "source port '$rule->{sport}', but no protocol specified\n" if $rule->{sport};
}
- } elsif ($rule->{dport} || $rule->{sport}) {
- die "destination port '$rule->{dport}', but no protocol specified\n" if $rule->{dport};
- die "source port '$rule->{sport}', but no protocol specified\n" if $rule->{sport};
- }
- push @cmd, "-m addrtype --dst-type $rule->{dsttype}" if $rule->{dsttype};
+ push @match, "-m addrtype --dst-type $rule->{dsttype}" if $rule->{dsttype};
+ }
+ my $matchstr = scalar(@match) ? join(' ', @match) : "";
- if (my $action = $rule->{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";
+ my $targetstr;
+ if (defined $rule->{target}) {
+ $targetstr = $rule->{target};
+ } else {
+ my $action = (defined $rule->{action}) ? $rule->{action} : "";
+ my $goto = 1 if $action eq 'PVEFW-SET-ACCEPT-MARK';
+ $targetstr = ($goto) ? "-g $action" : "-j $action";
}
- return scalar(@cmd) ? join(' ', @cmd) : undef;
+ my @iptcmds;
+ if (defined $rule->{log} && $rule->{log}) {
+ my $logaction = get_log_rule_base($chain, $vmid, $rule->{logmsg}, $rule->{log});
+ push @iptcmds, "-A $chain $matchstr $logaction";
+ }
+ push @iptcmds, "-A $chain $matchstr $targetstr";
+ return @iptcmds;
}
sub ruleset_generate_rule {
- my ($ruleset, $chain, $ipversion, $rule, $actions, $goto, $cluster_conf, $fw_conf) = @_;
+ my ($ruleset, $chain, $ipversion, $rule, $cluster_conf, $fw_conf) = @_;
my $rules;
}
# update all or nothing
-
- my @cmds = ();
- foreach my $tmp (@$rules) {
- if (my $cmdstr = ruleset_generate_cmdstr($ruleset, $chain, $ipversion, $tmp, $actions, $goto, $cluster_conf, $fw_conf)) {
- push @cmds, $cmdstr;
- }
- }
-
- foreach my $cmdstr (@cmds) {
- ruleset_addrule($ruleset, $chain, $cmdstr);
+ my @ipt_rule_cmds;
+ foreach my $r (@$rules) {
+ push @ipt_rule_cmds, ipt_rule_to_cmds($r, $chain, $ipversion, $cluster_conf, $fw_conf);
}
-}
-
-sub ruleset_generate_rule_insert {
- my ($ruleset, $chain, $ipversion, $rule, $actions, $goto) = @_;
-
- die "implement me" if $rule->{macro}; # not implemented, because not needed so far
-
- if (my $cmdstr = ruleset_generate_cmdstr($ruleset, $chain, $ipversion, $rule, $actions, $goto)) {
- ruleset_insertrule($ruleset, $chain, $cmdstr);
+ foreach my $c (@ipt_rule_cmds) {
+ ruleset_add_ipt_cmd($ruleset, $chain, $c);
}
}
return $ruleset->{$chain} ? 1 : undef;
}
+# add an iptables command (like generated by ipt_rule_to_cmds) to a chain
+sub ruleset_add_ipt_cmd {
+ my ($ruleset, $chain, $iptcmd) = @_;
+
+ die "no such chain '$chain'\n" if !$ruleset->{$chain};
+
+ push @{$ruleset->{$chain}}, $iptcmd;
+}
+
sub ruleset_addrule {
- my ($ruleset, $chain, $rule) = @_;
+ my ($ruleset, $chain, $match, $action, $log, $logmsg, $vmid) = @_;
die "no such chain '$chain'\n" if !$ruleset->{$chain};
- push @{$ruleset->{$chain}}, "-A $chain $rule";
+ if (defined($log) && $log) {
+ my $logaction = get_log_rule_base($chain, $vmid, $logmsg, $log);
+ 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";
}
sub ruleset_insertrule {
- my ($ruleset, $chain, $rule) = @_;
+ my ($ruleset, $chain, $match, $action, $log) = @_;
die "no such chain '$chain'\n" if !$ruleset->{$chain};
- unshift @{$ruleset->{$chain}}, "-A $chain $rule";
+ unshift @{$ruleset->{$chain}}, "-A $chain $match $action";
}
sub get_log_rule_base {
my ($chain, $vmid, $msg, $loglevel) = @_;
- die "internal error - no log level" if !defined($loglevel);
-
$vmid = 0 if !defined($vmid);
+ $msg = "" if !defined($msg);
# Note: we use special format for prefix to pass further
- # info to log daemon (VMID, LOGVELEL and CHAIN)
+ # info to log daemon (VMID, LOGLEVEL and CHAIN)
return "-j NFLOG --nflog-prefix \":$vmid:$loglevel:$chain: $msg\"";
}
-sub ruleset_addlog {
- my ($ruleset, $chain, $vmid, $msg, $loglevel, $rule) = @_;
-
- return if !defined($loglevel);
-
- my $logrule = get_log_rule_base($chain, $vmid, $msg, $loglevel);
-
- $logrule = "$rule $logrule" if defined($rule);
-
- ruleset_addrule($ruleset, $chain, $logrule);
-}
-
sub ruleset_add_chain_policy {
my ($ruleset, $chain, $ipversion, $vmid, $policy, $loglevel, $accept_action) = @_;
if ($policy eq 'ACCEPT') {
- ruleset_generate_rule($ruleset, $chain, $ipversion, { action => 'ACCEPT' },
- { ACCEPT => $accept_action});
+ my $rule = { action => 'ACCEPT' };
+ rule_substitude_action($rule, { ACCEPT => $accept_action});
+ ruleset_generate_rule($ruleset, $chain, $ipversion, $rule);
} elsif ($policy eq 'DROP') {
- ruleset_addrule($ruleset, $chain, "-j PVEFW-Drop");
-
- ruleset_addlog($ruleset, $chain, $vmid, "policy $policy: ", $loglevel);
+ ruleset_addrule($ruleset, $chain, "", "-j PVEFW-Drop");
- ruleset_addrule($ruleset, $chain, "-j DROP");
+ ruleset_addrule($ruleset, $chain, "", "-j DROP", $loglevel, "policy $policy: ", $vmid);
} elsif ($policy eq 'REJECT') {
- ruleset_addrule($ruleset, $chain, "-j PVEFW-Reject");
+ ruleset_addrule($ruleset, $chain, "", "-j PVEFW-Reject");
- ruleset_addlog($ruleset, $chain, $vmid, "policy $policy: ", $loglevel);
-
- ruleset_addrule($ruleset, $chain, "-g PVEFW-reject");
+ ruleset_addrule($ruleset, $chain, "", "-g PVEFW-reject", $loglevel, "policy $policy:", $vmid);
} else {
# should not happen
die "internal error: unknown policy '$policy'";
my ($ruleset, $chain, $ipversion, $options, $direction, $accept) = @_;
return if $ipversion != 6 || (defined($options->{ndp}) && !$options->{ndp});
- ruleset_addrule($ruleset, $chain, "-p icmpv6 --icmpv6-type router-solicitation $accept");
+ ruleset_addrule($ruleset, $chain, "-p icmpv6 --icmpv6-type router-solicitation", $accept);
if ($direction ne 'OUT' || $options->{radv}) {
- ruleset_addrule($ruleset, $chain, "-p icmpv6 --icmpv6-type router-advertisement $accept");
+ ruleset_addrule($ruleset, $chain, "-p icmpv6 --icmpv6-type router-advertisement", $accept);
}
- ruleset_addrule($ruleset, $chain, "-p icmpv6 --icmpv6-type neighbor-solicitation $accept");
- ruleset_addrule($ruleset, $chain, "-p icmpv6 --icmpv6-type neighbor-advertisement $accept");
+ ruleset_addrule($ruleset, $chain, "-p icmpv6 --icmpv6-type neighbor-solicitation", $accept);
+ ruleset_addrule($ruleset, $chain, "-p icmpv6 --icmpv6-type neighbor-advertisement", $accept);
}
sub ruleset_chain_add_conn_filters {
my ($ruleset, $chain, $accept) = @_;
- ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate INVALID -j DROP");
- ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate RELATED,ESTABLISHED -j $accept");
+ ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate INVALID", "-j DROP");
+ ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate RELATED,ESTABLISHED", "-j $accept");
}
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_addlog($ruleset, "PVEFW-blacklist", 0, "DROP: ", $loglevel) if $loglevel;
- ruleset_addrule($ruleset, "PVEFW-blacklist", "-j DROP");
+ ruleset_addrule($ruleset, "PVEFW-blacklist", "", "-j DROP", $loglevel, "DROP: ");
}
my $ipset_chain = compute_ipset_chain_name(0, 'blacklist', $ipversion);
- ruleset_addrule($ruleset, $chain, "-m set --match-set ${ipset_chain} src -j PVEFW-blacklist");
+ ruleset_addrule($ruleset, $chain, "-m set --match-set ${ipset_chain} src", "-j PVEFW-blacklist");
}
if (!(defined($options->{nosmurfs}) && $options->{nosmurfs} == 0)) {
if ($ipversion == 4) {
- ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate INVALID,NEW -j PVEFW-smurfs");
+ ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate INVALID,NEW", "-j PVEFW-smurfs");
}
}
if ($options->{tcpflags}) {
- ruleset_addrule($ruleset, $chain, "-p tcp -j PVEFW-tcpflags");
+ ruleset_addrule($ruleset, $chain, "-p tcp", "-j PVEFW-tcpflags");
}
}
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, "-m mac ! --mac-source $macaddr", "-j DROP");
}
if ($ipversion == 6 && !$options->{radv}) {
- ruleset_addrule($ruleset, $chain, '-p icmpv6 --icmpv6-type router-advertisement -j DROP');
+ ruleset_addrule($ruleset, $chain, "-p icmpv6 --icmpv6-type router-advertisement", "-j DROP");
}
if ($ipfilter_ipset) {
- ruleset_addrule($ruleset, $chain, "-m set ! --match-set $ipfilter_ipset src -j DROP");
+ ruleset_addrule($ruleset, $chain, "-m set ! --match-set $ipfilter_ipset src", "-j DROP");
}
- ruleset_addrule($ruleset, $chain, "-j MARK --set-mark $FWACCEPTMARK_OFF"); # clear mark
+ ruleset_addrule($ruleset, $chain, "", "-j MARK --set-mark $FWACCEPTMARK_OFF"); # clear mark
}
my $accept_action = $direction eq 'OUT' ? '-g PVEFW-SET-ACCEPT-MARK' : "-j $accept";
}
if ($direction eq 'OUT' && $rule->{iface_out}) {
- ruleset_addrule($ruleset, $chain, "-o $rule->{iface_out} -j $group_chain");
+ ruleset_addrule($ruleset, $chain, "-o $rule->{iface_out}", "-j $group_chain");
} elsif ($direction eq 'IN' && $rule->{iface_in}) {
- ruleset_addrule($ruleset, $chain, "-i $rule->{iface_in} -j $group_chain");
+ ruleset_addrule($ruleset, $chain, "-i $rule->{iface_in}", "-j $group_chain");
} else {
- ruleset_addrule($ruleset, $chain, "-j $group_chain");
+ ruleset_addrule($ruleset, $chain, "", "-j $group_chain");
}
- ruleset_addrule($ruleset, $chain, "-m mark --mark $FWACCEPTMARK_ON -j $action");
+ ruleset_addrule($ruleset, $chain, "-m mark --mark $FWACCEPTMARK_ON", "-j $action");
}
sub ruleset_generate_vm_rules {
next if $rule->{type} ne $lc_direction;
eval {
if ($direction eq 'OUT') {
- ruleset_generate_rule($ruleset, $chain, $ipversion, $rule,
- { ACCEPT => "PVEFW-SET-ACCEPT-MARK", REJECT => "PVEFW-reject" },
- undef, $cluster_conf, $vmfw_conf);
+ rule_substitude_action($rule, { ACCEPT => "PVEFW-SET-ACCEPT-MARK", REJECT => "PVEFW-reject" });
+ ruleset_generate_rule($ruleset, $chain, $ipversion, $rule, $cluster_conf, $vmfw_conf);
} else {
- ruleset_generate_rule($ruleset, $chain, $ipversion, $rule,
- { ACCEPT => $in_accept , REJECT => "PVEFW-reject" },
- undef, $cluster_conf, $vmfw_conf);
+ rule_substitude_action($rule, { ACCEPT => $in_accept , REJECT => "PVEFW-reject" });
+ ruleset_generate_rule($ruleset, $chain, $ipversion, $rule, $cluster_conf, $vmfw_conf);
}
};
warn $@ if $@;
ruleset_create_chain($ruleset, "PVEFW-IPS");
}
- ruleset_addrule($ruleset, "PVEFW-IPS", "-m physdev --physdev-out $iface --physdev-is-bridged -j $nfqueue");
+ ruleset_addrule($ruleset, "PVEFW-IPS", "-m physdev --physdev-out $iface --physdev-is-bridged", "-j $nfqueue");
}
}
# 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");
} 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");
}
}
my $loglevel = get_option_log_level($options, "log_level_in");
- ruleset_addrule($ruleset, $chain, "-i lo -j ACCEPT");
+ ruleset_addrule($ruleset, $chain, "-i lo", "-j ACCEPT");
ruleset_chain_add_conn_filters($ruleset, $chain, 'ACCEPT');
ruleset_chain_add_ndp($ruleset, $chain, $ipversion, $options, 'IN', '-j RETURN');
# we use RETURN because we need to check also tap rules
my $accept_action = 'RETURN';
- ruleset_addrule($ruleset, $chain, "-p igmp -j $accept_action"); # important for multicast
+ ruleset_addrule($ruleset, $chain, "-p igmp", "-j $accept_action"); # important for multicast
# add host rules first, so that cluster wide rules can be overwritten
foreach my $rule (@$rules, @$cluster_rules) {
if ($rule->{type} eq 'group') {
ruleset_add_group_rule($ruleset, $cluster_conf, $chain, $rule, 'IN', $accept_action, $ipversion);
} elsif ($rule->{type} eq 'in') {
- ruleset_generate_rule($ruleset, $chain, $ipversion, $rule,
- { ACCEPT => $accept_action, REJECT => "PVEFW-reject" },
- undef, $cluster_conf, $hostfw_conf);
+ rule_substitude_action($rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" });
+ ruleset_generate_rule($ruleset, $chain, $ipversion, $rule, $cluster_conf, $hostfw_conf);
}
};
warn $@ if $@;
# allow standard traffic for management ipset (includes cluster network)
my $mngmnt_ipset_chain = compute_ipset_chain_name(0, "management", $ipversion);
my $mngmntsrc = "-m set --match-set ${mngmnt_ipset_chain} src";
- ruleset_addrule($ruleset, $chain, "$mngmntsrc -p tcp --dport 8006 -j $accept_action"); # PVE API
- ruleset_addrule($ruleset, $chain, "$mngmntsrc -p tcp --dport 5900:5999 -j $accept_action"); # PVE VNC Console
- ruleset_addrule($ruleset, $chain, "$mngmntsrc -p tcp --dport 3128 -j $accept_action"); # SPICE Proxy
- ruleset_addrule($ruleset, $chain, "$mngmntsrc -p tcp --dport 22 -j $accept_action"); # SSH
+ ruleset_addrule($ruleset, $chain, "$mngmntsrc -p tcp --dport 8006", "-j $accept_action"); # PVE API
+ ruleset_addrule($ruleset, $chain, "$mngmntsrc -p tcp --dport 5900:5999", "-j $accept_action"); # PVE VNC Console
+ ruleset_addrule($ruleset, $chain, "$mngmntsrc -p tcp --dport 3128", "-j $accept_action"); # SPICE Proxy
+ ruleset_addrule($ruleset, $chain, "$mngmntsrc -p tcp --dport 22", "-j $accept_action"); # SSH
my $localnet = $cluster_conf->{aliases}->{local_network}->{cidr};
my $localnet_ver = $cluster_conf->{aliases}->{local_network}->{ipversion};
# corosync
if ($localnet && ($ipversion == $localnet_ver)) {
- my $corosync_rule = "-p udp --dport 5404:5405 -j $accept_action";
- ruleset_addrule($ruleset, $chain, "-s $localnet -d $localnet $corosync_rule");
- ruleset_addrule($ruleset, $chain, "-s $localnet -m addrtype --dst-type MULTICAST $corosync_rule");
+ my $corosync_rule = "-p udp --dport 5404:5405";
+ ruleset_addrule($ruleset, $chain, "-s $localnet -d $localnet $corosync_rule", "-j $accept_action");
+ ruleset_addrule($ruleset, $chain, "-s $localnet -m addrtype --dst-type MULTICAST $corosync_rule", "-j $accept_action");
}
# implement input policy
$loglevel = get_option_log_level($options, "log_level_out");
- ruleset_addrule($ruleset, $chain, "-o lo -j ACCEPT");
+ ruleset_addrule($ruleset, $chain, "-o lo", "-j ACCEPT");
ruleset_chain_add_conn_filters($ruleset, $chain, 'ACCEPT');
$accept_action = 'RETURN';
ruleset_chain_add_ndp($ruleset, $chain, $ipversion, $options, 'OUT', "-j $accept_action");
- ruleset_addrule($ruleset, $chain, "-p igmp -j $accept_action"); # important for multicast
+ ruleset_addrule($ruleset, $chain, "-p igmp", "-j $accept_action"); # important for multicast
# add host rules first, so that cluster wide rules can be overwritten
foreach my $rule (@$rules, @$cluster_rules) {
if ($rule->{type} eq 'group') {
ruleset_add_group_rule($ruleset, $cluster_conf, $chain, $rule, 'OUT', $accept_action, $ipversion);
} elsif ($rule->{type} eq 'out') {
- ruleset_generate_rule($ruleset, $chain, $ipversion,
- $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" },
- undef, $cluster_conf, $hostfw_conf);
+ rule_substitude_action($rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" });
+ ruleset_generate_rule($ruleset, $chain, $ipversion, $rule, $cluster_conf, $hostfw_conf);
}
};
warn $@ if $@;
# allow standard traffic on cluster network
if ($localnet && ($ipversion == $localnet_ver)) {
- ruleset_addrule($ruleset, $chain, "-d $localnet -p tcp --dport 8006 -j $accept_action"); # PVE API
- ruleset_addrule($ruleset, $chain, "-d $localnet -p tcp --dport 22 -j $accept_action"); # SSH
- ruleset_addrule($ruleset, $chain, "-d $localnet -p tcp --dport 5900:5999 -j $accept_action"); # PVE VNC Console
- ruleset_addrule($ruleset, $chain, "-d $localnet -p tcp --dport 3128 -j $accept_action"); # SPICE Proxy
-
- my $corosync_rule = "-p udp --dport 5404:5405 -j $accept_action";
- ruleset_addrule($ruleset, $chain, "-d $localnet $corosync_rule");
- ruleset_addrule($ruleset, $chain, "-m addrtype --dst-type MULTICAST $corosync_rule");
+ ruleset_addrule($ruleset, $chain, "-d $localnet -p tcp --dport 8006", "-j $accept_action"); # PVE API
+ ruleset_addrule($ruleset, $chain, "-d $localnet -p tcp --dport 22", "-j $accept_action"); # SSH
+ ruleset_addrule($ruleset, $chain, "-d $localnet -p tcp --dport 5900:5999", "-j $accept_action"); # PVE VNC Console
+ ruleset_addrule($ruleset, $chain, "-d $localnet -p tcp --dport 3128", "-j $accept_action"); # SPICE Proxy
+
+ my $corosync_rule = "-p udp --dport 5404:5405";
+ ruleset_addrule($ruleset, $chain, "-d $localnet $corosync_rule", "-j $accept_action");
+ ruleset_addrule($ruleset, $chain, "-m addrtype --dst-type MULTICAST $corosync_rule", "-j $accept_action");
}
# implement output policy
$policy = $cluster_options->{policy_out} || 'ACCEPT'; # allow everything by default
ruleset_add_chain_policy($ruleset, $chain, $ipversion, 0, $policy, $loglevel, $accept_action);
- ruleset_addrule($ruleset, "PVEFW-OUTPUT", "-j PVEFW-HOST-OUT");
- ruleset_addrule($ruleset, "PVEFW-INPUT", "-j PVEFW-HOST-IN");
+ ruleset_addrule($ruleset, "PVEFW-OUTPUT", "", "-j PVEFW-HOST-OUT");
+ ruleset_addrule($ruleset, "PVEFW-INPUT", "", "-j PVEFW-HOST-IN");
}
sub generate_group_rules {
my $chain = "GROUP-${group}-IN";
ruleset_create_chain($ruleset, $chain);
- ruleset_addrule($ruleset, $chain, "-j MARK --set-mark $FWACCEPTMARK_OFF"); # clear mark
+ ruleset_addrule($ruleset, $chain, "", "-j MARK --set-mark $FWACCEPTMARK_OFF"); # clear mark
foreach my $rule (@$rules) {
next if $rule->{type} ne 'in';
+ next if !$rule->{enable} || $rule->{errors};
next if $rule->{ipversion} && $rule->{ipversion} ne $ipversion;
- ruleset_generate_rule($ruleset, $chain, $ipversion, $rule,
- { ACCEPT => "PVEFW-SET-ACCEPT-MARK", REJECT => "PVEFW-reject" },
- undef, $cluster_conf);
+ rule_substitude_action($rule, { ACCEPT => "PVEFW-SET-ACCEPT-MARK", REJECT => "PVEFW-reject" });
+ ruleset_generate_rule($ruleset, $chain, $ipversion, $rule, $cluster_conf);
}
$chain = "GROUP-${group}-OUT";
ruleset_create_chain($ruleset, $chain);
- ruleset_addrule($ruleset, $chain, "-j MARK --set-mark $FWACCEPTMARK_OFF"); # clear mark
+ ruleset_addrule($ruleset, $chain, "", "-j MARK --set-mark $FWACCEPTMARK_OFF"); # clear mark
foreach my $rule (@$rules) {
next if $rule->{type} ne 'out';
+ next if !$rule->{enable} || $rule->{errors};
next if $rule->{ipversion} && $rule->{ipversion} ne $ipversion;
# we use PVEFW-SET-ACCEPT-MARK (Instead of ACCEPT) because we need to
# check also other tap rules later
- ruleset_generate_rule($ruleset, $chain, $ipversion, $rule,
- { ACCEPT => 'PVEFW-SET-ACCEPT-MARK', REJECT => "PVEFW-reject" },
- undef, $cluster_conf);
+ rule_substitude_action($rule, { ACCEPT => 'PVEFW-SET-ACCEPT-MARK', REJECT => "PVEFW-reject" });
+ ruleset_generate_rule($ruleset, $chain, $ipversion, $rule, $cluster_conf);
}
}
die "unable to parse rule parameters: $line\n" if length($line);
$rule = verify_rule($rule, $cluster_conf, $fw_conf, $rule_env, 1);
- if ($verbose && $rule->{errors}) {
- warn "$prefix - errors in rule parameters: $orig_line\n";
+ if ($rule->{errors}) {
+ # The verbose flag really means we're running from the CLI and want
+ # output on the console - in the other case we really want such errors
+ # to go into the syslog instead.
+ my $log = $verbose ? sub { warn @_ } : sub { syslog(err => @_) };
+ $log->("$prefix - errors in rule parameters: $orig_line\n");
foreach my $p (keys %{$rule->{errors}}) {
- warn " $p: $rule->{errors}->{$p}\n";
+ $log->(" $p: $rule->{errors}->{$p}\n");
}
}
return $rule;
}
+sub verify_ethertype {
+ my ($value) = @_;
+ my $types = get_etc_ethertypes();
+ die "unknown ethernet protocol type: $value\n"
+ if !defined($types->{byname}->{$value}) &&
+ !defined($types->{byid}->{$value});
+}
+
sub parse_vmfw_option {
my ($line) = @_;
} elsif ($line =~ m/^(ips_queues):\s*((\d+)(:(\d+))?)\s*$/i) {
$opt = lc($1);
$value = $2;
+ } elsif ($line =~ m/^(layer2_protocols):\s*(((\S+)[,]?)+)\s*$/i) {
+ $opt = lc($1);
+ $value = $2;
+ verify_ethertype($_) foreach split(/\s*,\s*/, $value);
} else {
die "can't parse option '$line'\n"
}
if (($value > 1) && ((time() - $value) > 60)) {
$value = 0
}
+ } elsif ($line =~ m/^(ebtables_enable):\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);
$errors->{cidr} = $err;
}
+ if ($cidr =~ m!/0+$!) {
+ $errors->{cidr} = "a zero prefix is not allowed in ipset entries\n";
+ }
+
my $entry = { cidr => $cidr };
$entry->{nomatch} = 1 if $nomatch;
$entry->{comment} = $comment if $comment;
my $std_chains = $pve_std_chains->{$ipversion} || die "internal error";
my $loglevel = get_option_log_level($options, 'smurf_log_level');
-
- my $chain;
-
- if ($ipversion == 4) {
- # same as shorewall smurflog.
- $chain = 'PVEFW-smurflog';
- $std_chains->{$chain} = [];
-
- push @{$std_chains->{$chain}}, get_log_rule_base($chain, 0, "DROP: ", $loglevel) if $loglevel;
- push @{$std_chains->{$chain}}, "-j DROP";
+ my $chain = 'PVEFW-smurflog';
+ if ( $std_chains->{$chain} ) {
+ foreach my $r (@{$std_chains->{$chain}}) {
+ $r->{log} = $loglevel;
+ }
}
# same as shorewall logflags action.
$loglevel = get_option_log_level($options, 'tcp_flags_log_level');
$chain = 'PVEFW-logflags';
- $std_chains->{$chain} = [];
-
- # fixme: is this correctly logged by pvewf-logger? (ther is no --log-ip-options for NFLOG)
- push @{$std_chains->{$chain}}, get_log_rule_base($chain, 0, "DROP: ", $loglevel) if $loglevel;
- push @{$std_chains->{$chain}}, "-j DROP";
+ if ( $std_chains->{$chain} ) {
+ foreach my $r (@{$std_chains->{$chain}}) {
+ $r->{log} = $loglevel;
+ }
+ }
foreach my $chain (keys %$std_chains) {
ruleset_create_chain($ruleset, $chain);
if (ref($rule)) {
ruleset_generate_rule($ruleset, $chain, $ipversion, $rule);
} else {
- ruleset_addrule($ruleset, $chain, $rule);
+ die "rule $rule as string - should not happen";
}
}
}
my $vmfw_configs;
+ # fixme: once we read standard chains from config this needs to be put in test/standard cases below
+ $pve_std_chains = dclone($pve_std_chains_conf);
+
if ($vmdata) { # test mode
my $testdir = $vmdata->{testdir} || die "no test directory specified";
my $filename = "$testdir/cluster.fw";
$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}) {
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 };
}
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 $ipset_ruleset = compile_ipsets($cluster_conf, $vmfw_configs, $vmdata);
- return ($ruleset, $ipset_ruleset, $rulesetv6);
+ return ($ruleset, $ipset_ruleset, $rulesetv6, $ebtables_ruleset);
}
sub compile_iptables_filter {
ruleset_create_chain($ruleset, "PVEFW-FWBR-IN");
ruleset_chain_add_input_filters($ruleset, "PVEFW-FWBR-IN", $ipversion, $hostfw_options, $cluster_conf, $loglevel);
- ruleset_addrule($ruleset, "PVEFW-FORWARD", "-m physdev --physdev-is-bridged --physdev-in fwln+ -j PVEFW-FWBR-IN");
+ ruleset_addrule($ruleset, "PVEFW-FORWARD", "-m physdev --physdev-is-bridged --physdev-in fwln+", "-j PVEFW-FWBR-IN");
ruleset_create_chain($ruleset, "PVEFW-FWBR-OUT");
- ruleset_addrule($ruleset, "PVEFW-FORWARD", "-m physdev --physdev-is-bridged --physdev-out fwln+ -j PVEFW-FWBR-OUT");
+ ruleset_addrule($ruleset, "PVEFW-FORWARD", "-m physdev --physdev-is-bridged --physdev-out fwln+", "-j PVEFW-FWBR-OUT");
generate_std_chains($ruleset, $hostfw_options, $ipversion);
}
if(ruleset_chain_exist($ruleset, "PVEFW-IPS")){
- ruleset_insertrule($ruleset, "PVEFW-FORWARD", "-m conntrack --ctstate RELATED,ESTABLISHED -j PVEFW-IPS");
+ ruleset_insertrule($ruleset, "PVEFW-FORWARD", "-m conntrack --ctstate RELATED,ESTABLISHED", "-j PVEFW-IPS");
}
return $ruleset;
return $ipset_ruleset;
}
+sub compile_ebtables_filter {
+ my ($cluster_conf, $hostfw_conf, $vmfw_configs, $vmdata, $verbose) = @_;
+
+ if (!($cluster_conf->{options}->{ebtables_enable} // 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');
+ ruleset_addrule($ruleset, 'PVEFW-FORWARD', '-p IPv6', '-j ACCEPT');
+ ruleset_addrule($ruleset, 'PVEFW-FORWARD', '-o fwln+', '-j PVEFW-FWBR-OUT');
+
+ # generate firewall rules for QEMU VMs
+ foreach my $vmid (keys %{$vmdata->{qemu}}) {
+ eval {
+ my $conf = $vmdata->{qemu}->{$vmid};
+ my $vmfw_conf = $vmfw_configs->{$vmid};
+ return if !$vmfw_conf;
+
+ foreach my $netid (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);
+
+ }
+ };
+ warn $@ if $@; # just to be sure - should not happen
+ }
+
+ # generate firewall rules for LXC containers
+ foreach my $vmid (keys %{$vmdata->{lxc}}) {
+ eval {
+ my $conf = $vmdata->{lxc}->{$vmid};
+
+ my $vmfw_conf = $vmfw_configs->{$vmid};
+ return if !$vmfw_conf || !$vmfw_conf->{options}->{enable};
+
+ foreach my $netid (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);
+ }
+ };
+ warn $@ if $@; # just to be sure - should not happen
+ }
+
+ return $ruleset;
+}
+
+sub generate_tap_layer2filter {
+ my ($ruleset, $iface, $macaddr, $vmfw_conf, $vmid) = @_;
+ my $options = $vmfw_conf->{options};
+
+ my $tapchain = $iface."-OUT";
+
+ # ebtables remove zeros from mac pairs
+ $macaddr =~ s/0([0-9a-f])/$1/ig;
+ $macaddr = lc($macaddr);
+
+ ruleset_create_chain($ruleset, $tapchain);
+
+ if (defined($macaddr) && !(defined($options->{macfilter}) && $options->{macfilter} == 0)) {
+ ruleset_addrule($ruleset, $tapchain, "-s ! $macaddr", '-j DROP');
+ }
+
+ if (defined($options->{layer2_protocols})){
+ foreach my $proto (split(/,/, $options->{layer2_protocols})) {
+ ruleset_addrule($ruleset, $tapchain, "-p $proto", '-j ACCEPT');
+ }
+ ruleset_addrule($ruleset, $tapchain, '', "-j DROP");
+ } else {
+ 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 {
$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';
+ if (defined($change_only_regex)) {
+ $action = 'ignore' if ($chain !~ m/$change_only_regex/);
+ $statushash->{$chain}->{rules} = $active_chains->{$chain}->{rules};
}
+ my $sig = $active_chains->{$chain}->{sig};
+ $statushash->{$chain}->{action} = $action;
+ $statushash->{$chain}->{sig} = $sig;
+ print "$action $chain ($sig)\n" if $verbose;
}
return $statushash;
return wantarray ? ($cmdlist, $changes) : $cmdlist;
}
+my $pve_ebtables_chainname_regex = qr/PVEFW-\S+|(?:tab|veth)\d+i\d+-(?:IN|OUT)/;
+
+sub get_ebtables_cmdlist {
+ my ($ruleset, $verbose) = @_;
+
+ 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,
+ $pve_ebtables_chainname_regex);
+
+ # 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');
+ }
+
+ foreach my $chain (sort keys %$statushash) {
+ my $stat = $statushash->{$chain};
+ next if ($stat->{action} eq 'delete');
+ $changes = 1 if ($stat->{action} !~ 'ignore|exists');
+
+ foreach my $cmd (@{$statushash->{$chain}->{'rules'}}) {
+ if ($chain eq 'FORWARD' && $cmd eq $append_pve_to_forward) {
+ next if ! $pve_include;
+ $pve_include = 0;
+ }
+ $cmdlist .= "$cmd\n";
+ }
+ }
+ $cmdlist .= "$append_pve_to_forward\n" if $pve_include;
+
+ return wantarray ? ($cmdlist, $changes) : $cmdlist;
+}
+
sub get_ipset_cmdlist {
my ($ruleset, $verbose) = @_;
}
sub apply_ruleset {
- my ($ruleset, $hostfw_conf, $ipset_ruleset, $rulesetv6, $verbose) = @_;
+ my ($ruleset, $hostfw_conf, $ipset_ruleset, $rulesetv6, $ebtables_ruleset, $verbose) = @_;
enable_bridge_firewall();
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);
if ($verbose) {
if ($ipset_changes) {
print "ip6tables changes:\n";
print $cmdlistv6;
}
+
+ if ($ebtables_changes) {
+ print "ebtables changes:\n";
+ print $ebtables_cmdlist;
+ }
}
my $tmpfile = "$pve_fw_status_dir/ipsetcmdlist1";
ipset_restore_cmdlist($ipset_delete_cmdlist) if $ipset_delete_cmdlist;
+ ebtables_restore_cmdlist($ebtables_cmdlist);
+
+ $tmpfile = "$pve_fw_status_dir/ebtablescmdlist";
+ PVE::Tools::file_set_contents($tmpfile, $ebtables_cmdlist || '');
+
# 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 $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);
+
+ foreach my $chain (sort keys %$ebtables_ruleset) {
+ my $stat = $ebtables_statushash->{$chain};
+ if ($stat->{action} ne 'exists') {
+ warn "ebtables : unable to update chain '$chain'\n";
+ $errors = 1;
+ }
+ }
+
die "unable to apply firewall changes\n" if $errors;
update_nf_conntrack_max($hostfw_conf);
my $hostfw_conf = load_hostfw_conf($cluster_conf);
- my ($ruleset, $ipset_ruleset, $rulesetv6) = compile($cluster_conf, $hostfw_conf);
+ my ($ruleset, $ipset_ruleset, $rulesetv6, $ebtables_ruleset) = compile($cluster_conf, $hostfw_conf);
- apply_ruleset($ruleset, $hostfw_conf, $ipset_ruleset, $rulesetv6);
+ apply_ruleset($ruleset, $hostfw_conf, $ipset_ruleset, $rulesetv6, $ebtables_ruleset);
};
run_locked($code);
projects / pve-firewall.git / blobdiff