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";
emerg => 0,
};
+# %rule
+#
+# name => optional
+# action =>
+# proto =>
+# sport =>
+# dport =>
+# log => optional, loglevel
+# logmsg => optional, logmsg - overwrites default
+# iface_in
+# iface_out
+# match => optional, overwrites generation of match
+# target => optional, overwrites action
+
# we need to overwrite some macros for ipv6
my $pve_ipv6fw_macros = {
'Ping' => [
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: ' },
],
};
return $res;
}
-sub ruleset_generate_cmdstr {
+sub ruleset_generate_match {
my ($ruleset, $chain, $ipversion, $rule, $actions, $goto, $cluster_conf, $fw_conf) = @_;
return if defined($rule->{enable}) && !$rule->{enable};
return if $rule->{errors};
+ return $rule->{match} if defined $rule->{match};
+
die "unable to emit macro - internal error" if $rule->{macro}; # should not happen
my $nbdport = defined($rule->{dport}) ? parse_port_name_number_or_range($rule->{dport}, 1) : 0;
push @cmd, "-m addrtype --dst-type $rule->{dsttype}" if $rule->{dsttype};
+ return scalar(@cmd) ? join(' ', @cmd) : undef;
+}
+
+sub ruleset_generate_action {
+ my ($ruleset, $chain, $ipversion, $rule, $actions, $goto, $cluster_conf, $fw_conf) = @_;
+
+ return $rule->{target} if defined $rule->{target};
+
+ my @cmd = ();
+
if (my $action = $rule->{action}) {
$action = $actions->{$action} if defined($actions->{$action});
$goto = 1 if !defined($goto) && $action eq 'PVEFW-SET-ACCEPT-MARK';
return scalar(@cmd) ? join(' ', @cmd) : undef;
}
+sub ruleset_generate_cmdstr {
+ my ($ruleset, $chain, $ipversion, $rule, $actions, $goto, $cluster_conf, $fw_conf) = @_;
+ my $match = ruleset_generate_match($ruleset, $chain, $ipversion, $rule, $actions, $goto, $cluster_conf, $fw_conf);
+ my $action = ruleset_generate_action($ruleset, $chain, $ipversion, $rule, $actions, $goto, $cluster_conf, $fw_conf);
+
+ return undef if !(defined($match) or defined($action));
+ my $ret = defined($match) ? $match : "";
+ $ret = "$ret $action" if defined($action);
+ return $ret;
+}
+
sub ruleset_generate_rule {
my ($ruleset, $chain, $ipversion, $rule, $actions, $goto, $cluster_conf, $fw_conf) = @_;
# update all or nothing
- my @cmds = ();
+ # fixme: lots of temporary ugliness
+ my @mstrs = ();
+ my @astrs = ();
+ my @logging = ();
+ my @logmsg = ();
foreach my $tmp (@$rules) {
- if (my $cmdstr = ruleset_generate_cmdstr($ruleset, $chain, $ipversion, $tmp, $actions, $goto, $cluster_conf, $fw_conf)) {
- push @cmds, $cmdstr;
+ my $m = ruleset_generate_match($ruleset, $chain, $ipversion, $tmp, $actions, $goto, $cluster_conf, $fw_conf);
+ my $a = ruleset_generate_action($ruleset, $chain, $ipversion, $tmp, $actions, $goto, $cluster_conf, $fw_conf);
+ if (defined $m or defined $a) {
+ push @mstrs, defined($m) ? $m : "";
+ push @astrs, defined($a) ? $a : "";
+ push @logging, $tmp->{log};
+ push @logmsg, $tmp->{logmsg};
}
}
- foreach my $cmdstr (@cmds) {
- ruleset_addrule($ruleset, $chain, $cmdstr);
+ for my $i (0 .. $#mstrs) {
+ ruleset_addrule($ruleset, $chain, $mstrs[$i], $astrs[$i], $logging[$i], $logmsg[$i]);
}
}
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);
+ my $match = ruleset_generate_match($ruleset, $chain, $ipversion, $rule, $actions, $goto);
+ my $action = ruleset_generate_action($ruleset, $chain, $ipversion, $rule, $actions, $goto);
+ if (defined $match && defined $action) {
+ ruleset_insertrule($ruleset, $chain, $match, $action);
}
}
}
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";
+ }
+ 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) = @_;
} 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 {
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) {
# 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) {
# 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
+ 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");
+ 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';
$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';
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";
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;
projects / pve-firewall.git / blobdiff