X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=blobdiff_plain;f=src%2FPVE%2FFirewall.pm;h=dae867d8fd23fb9d4f6177b20e4bd5eb53ec2df4;hp=dfa70bc0390459884931084e262a1b23d8055656;hb=d2c3266d5a9e1bd516ca51f84955d59c64a3afbf;hpb=3f95d14a47f8a4ea06edb2551169629cb6719591 diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm index dfa70bc..dae867d 100644 --- a/src/PVE/Firewall.pm +++ b/src/PVE/Firewall.pm @@ -2,21 +2,26 @@ package PVE::Firewall; use warnings; use strict; +use POSIX; use Data::Dumper; use Digest::SHA; use PVE::INotify; -use PVE::JSONSchema qw(get_standard_option); +use PVE::Exception qw(raise raise_param_exc); +use PVE::JSONSchema qw(register_standard_option get_standard_option); use PVE::Cluster; use PVE::ProcFSTools; -use PVE::Tools; +use PVE::Tools qw($IPV4RE); use File::Basename; use File::Path; use IO::File; use Net::IP; -use PVE::Tools qw(run_command lock_file); +use PVE::Tools qw(run_command lock_file dir_glob_foreach); use Encode; -# dynamically include PVE::QemuServer and PVE::OpenVZ +my $hostfw_conf_filename = "/etc/pve/local/host.fw"; +my $clusterfw_conf_filename = "/etc/pve/firewall/cluster.fw"; + +# dynamically include PVE::QemuServer and PVE::OpenVZ # to avoid dependency problems my $have_qemu_server; eval { @@ -30,12 +35,69 @@ eval { $have_pve_manager = 1; }; +PVE::JSONSchema::register_format('IPv4orCIDR', \&pve_verify_ipv4_or_cidr); +sub pve_verify_ipv4_or_cidr { + my ($cidr, $noerr) = @_; + + if ($cidr =~ m!^(?:$IPV4RE)(/(\d+))?$!) { + return $cidr if Net::IP->new($cidr); + return undef if $noerr; + die Net::IP::Error() . "\n"; + } + return undef if $noerr; + die "value does not look like a valid IP address or CIDR network\n"; +} + +PVE::JSONSchema::register_standard_option('ipset-name', { + description => "IP set name.", + type => 'string', + pattern => '[A-Za-z][A-Za-z0-9\-\_]+', + minLength => 2, + maxLength => 20, +}); + +PVE::JSONSchema::register_standard_option('pve-fw-alias', { + description => "Alias name.", + type => 'string', + pattern => '[A-Za-z][A-Za-z0-9\-\_]+', + minLength => 2, + maxLength => 20, +}); + +PVE::JSONSchema::register_standard_option('pve-fw-loglevel' => { + description => "Log level.", + type => 'string', + enum => ['emerg', 'alert', 'crit', 'err', 'warning', 'notice', 'info', 'debug', 'nolog'], + optional => 1, +}); + +my $security_group_name_pattern = '[A-Za-z][A-Za-z0-9\-\_]+'; +my $ip_alias_pattern = '[A-Za-z][A-Za-z0-9\-\_]+'; + +PVE::JSONSchema::register_standard_option('pve-security-group-name', { + description => "Security Group name.", + type => 'string', + pattern => $security_group_name_pattern, + minLength => 2, + maxLength => 20, +}); + +my $feature_ipset_nomatch = 0; +eval { + my (undef, undef, $release) = POSIX::uname(); + if ($release =~ m/^(\d+)\.(\d+)\.\d+-/) { + my ($major, $minor) = ($1, $2); + $feature_ipset_nomatch = 1 if ($major > 3) || + ($major == 3 && $minor >= 7); + } + +}; + use Data::Dumper; my $nodename = PVE::INotify::nodename(); my $pve_fw_lock_filename = "/var/lock/pvefw.lck"; -my $pve_fw_status_filename = "/var/lib/pve-firewall/pvefw.status"; my $default_log_level = 'info'; @@ -53,334 +115,357 @@ my $log_level_hash = { # imported/converted from: /usr/share/shorewall/macro.* my $pve_fw_macros = { 'Amanda' => [ + "Amanda Backup", { action => 'PARAM', proto => 'udp', dport => '10080' }, { action => 'PARAM', proto => 'tcp', dport => '10080' }, ], 'Auth' => [ + "Auth (identd) traffic", { action => 'PARAM', proto => 'tcp', dport => '113' }, ], 'BGP' => [ + "Border Gateway Protocol traffic", { action => 'PARAM', proto => 'tcp', dport => '179' }, ], 'BitTorrent' => [ + "BitTorrent traffic for BitTorrent 3.1 and earlier", { action => 'PARAM', proto => 'tcp', dport => '6881:6889' }, { action => 'PARAM', proto => 'udp', dport => '6881' }, ], 'BitTorrent32' => [ + "BitTorrent traffic for BitTorrent 3.2 and later", { action => 'PARAM', proto => 'tcp', dport => '6881:6999' }, { action => 'PARAM', proto => 'udp', dport => '6881' }, ], 'CVS' => [ + "Concurrent Versions System pserver traffic", { action => 'PARAM', proto => 'tcp', dport => '2401' }, ], 'Citrix' => [ + "Citrix/ICA traffic (ICA, ICA Browser, CGP)", { action => 'PARAM', proto => 'tcp', dport => '1494' }, { action => 'PARAM', proto => 'udp', dport => '1604' }, { action => 'PARAM', proto => 'tcp', dport => '2598' }, ], 'DAAP' => [ + "Digital Audio Access Protocol traffic (iTunes, Rythmbox daemons)", { action => 'PARAM', proto => 'tcp', dport => '3689' }, { action => 'PARAM', proto => 'udp', dport => '3689' }, ], 'DCC' => [ + "Distributed Checksum Clearinghouse spam filtering mechanism", { action => 'PARAM', proto => 'tcp', dport => '6277' }, ], 'DHCPfwd' => [ + "Forwarded DHCP traffic", { action => 'PARAM', proto => 'udp', dport => '67:68', sport => '67:68' }, - { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '67:68', sport => '67:68' }, ], 'DNS' => [ + "Domain Name System traffic (upd and tcp)", { action => 'PARAM', proto => 'udp', dport => '53' }, { action => 'PARAM', proto => 'tcp', dport => '53' }, ], 'Distcc' => [ + "Distributed Compiler service", { action => 'PARAM', proto => 'tcp', dport => '3632' }, ], - 'Edonkey' => [ - { action => 'PARAM', proto => 'tcp', dport => '4662' }, - { action => 'PARAM', proto => 'udp', dport => '4665' }, - ], 'FTP' => [ + "File Transfer Protocol", { action => 'PARAM', proto => 'tcp', dport => '21' }, ], 'Finger' => [ + "Finger protocol (RFC 742)", { action => 'PARAM', proto => 'tcp', dport => '79' }, ], 'GNUnet' => [ + "GNUnet secure peer-to-peer networking traffic", { action => 'PARAM', proto => 'tcp', dport => '2086' }, { action => 'PARAM', proto => 'udp', dport => '2086' }, { action => 'PARAM', proto => 'tcp', dport => '1080' }, { action => 'PARAM', proto => 'udp', dport => '1080' }, ], 'GRE' => [ + "Generic Routing Encapsulation tunneling protocol", { action => 'PARAM', proto => '47' }, - { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => '47' }, ], 'Git' => [ + "Git distributed revision control traffic", { action => 'PARAM', proto => 'tcp', dport => '9418' }, ], - 'Gnutella' => [ - { action => 'PARAM', proto => 'tcp', dport => '6346' }, - { action => 'PARAM', proto => 'udp', dport => '6346' }, - ], 'HKP' => [ + "OpenPGP HTTP keyserver protocol traffic", { action => 'PARAM', proto => 'tcp', dport => '11371' }, ], 'HTTP' => [ + "Hypertext Transfer Protocol (WWW)", { action => 'PARAM', proto => 'tcp', dport => '80' }, ], 'HTTPS' => [ + "Hypertext Transfer Protocol (WWW) over SSL", { action => 'PARAM', proto => 'tcp', dport => '443' }, ], 'ICPV2' => [ + "Internet Cache Protocol V2 (Squid) traffic", { action => 'PARAM', proto => 'udp', dport => '3130' }, ], 'ICQ' => [ + "AOL Instant Messenger traffic", { action => 'PARAM', proto => 'tcp', dport => '5190' }, ], 'IMAP' => [ + "Internet Message Access Protocol", { action => 'PARAM', proto => 'tcp', dport => '143' }, ], 'IMAPS' => [ + "Internet Message Access Protocol over SSL", { action => 'PARAM', proto => 'tcp', dport => '993' }, ], 'IPIP' => [ + "IPIP capsulation traffic", { action => 'PARAM', proto => '94' }, - { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => '94' }, - ], - 'IPP' => [ - { action => 'PARAM', proto => 'tcp', dport => '631' }, - ], - 'IPPbrd' => [ - { action => 'PARAM', proto => 'udp', dport => '631' }, - ], - 'IPPserver' => [ - { action => 'PARAM', source => 'SOURCE', dest => 'DEST', proto => 'tcp', dport => '631' }, - { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '631' }, ], 'IPsec' => [ + "IPsec traffic", { action => 'PARAM', proto => 'udp', dport => '500', sport => '500' }, { action => 'PARAM', proto => '50' }, - { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '500', sport => '500' }, - { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => '50' }, ], 'IPsecah' => [ + "IPsec authentication (AH) traffic", { action => 'PARAM', proto => 'udp', dport => '500', sport => '500' }, { action => 'PARAM', proto => '51' }, - { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '500', sport => '500' }, - { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => '51' }, ], 'IPsecnat' => [ + "IPsec traffic and Nat-Traversal", { action => 'PARAM', proto => 'udp', dport => '500' }, { action => 'PARAM', proto => 'udp', dport => '4500' }, { action => 'PARAM', proto => '50' }, - { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '500' }, - { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '4500' }, - { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => '50' }, ], 'IRC' => [ + "Internet Relay Chat traffic", { action => 'PARAM', proto => 'tcp', dport => '6667' }, ], - 'JabberPlain' => [ - { action => 'PARAM', proto => 'tcp', dport => '5222' }, - ], - 'JabberSecure' => [ - { action => 'PARAM', proto => 'tcp', dport => '5223' }, - ], - 'Jabberd' => [ - { action => 'PARAM', proto => 'tcp', dport => '5269' }, - ], 'Jetdirect' => [ + "HP Jetdirect printing", { action => 'PARAM', proto => 'tcp', dport => '9100' }, ], 'L2TP' => [ + "Layer 2 Tunneling Protocol traffic", { action => 'PARAM', proto => 'udp', dport => '1701' }, - { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '1701' }, ], 'LDAP' => [ + "Lightweight Directory Access Protocol traffic", { action => 'PARAM', proto => 'tcp', dport => '389' }, ], 'LDAPS' => [ + "Secure Lightweight Directory Access Protocol traffic", { action => 'PARAM', proto => 'tcp', dport => '636' }, ], 'MSNP' => [ + "Microsoft Notification Protocol", { action => 'PARAM', proto => 'tcp', dport => '1863' }, ], 'MSSQL' => [ + "Microsoft SQL Server", { action => 'PARAM', proto => 'tcp', dport => '1433' }, ], 'Mail' => [ + "Mail traffic (SMTP, SMTPS, Submission)", { action => 'PARAM', proto => 'tcp', dport => '25' }, { action => 'PARAM', proto => 'tcp', dport => '465' }, { action => 'PARAM', proto => 'tcp', dport => '587' }, ], 'Munin' => [ + "Munin networked resource monitoring traffic", { action => 'PARAM', proto => 'tcp', dport => '4949' }, ], 'MySQL' => [ + "MySQL server", { action => 'PARAM', proto => 'tcp', dport => '3306' }, ], 'NNTP' => [ + "NNTP traffic (Usenet).", { action => 'PARAM', proto => 'tcp', dport => '119' }, ], 'NNTPS' => [ + "Encrypted NNTP traffic (Usenet)", { action => 'PARAM', proto => 'tcp', dport => '563' }, ], 'NTP' => [ + "Network Time Protocol (ntpd)", { action => 'PARAM', proto => 'udp', dport => '123' }, ], - 'NTPbi' => [ - { action => 'PARAM', proto => 'udp', dport => '123' }, - { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '123' }, - ], - 'NTPbrd' => [ - { action => 'PARAM', proto => 'udp', dport => '123' }, - { action => 'PARAM', proto => 'udp', dport => '1024:65535', sport => '123' }, - ], 'OSPF' => [ + "OSPF multicast traffic", { action => 'PARAM', proto => '89' }, ], 'OpenVPN' => [ + "OpenVPN traffic", { action => 'PARAM', proto => 'udp', dport => '1194' }, ], 'PCA' => [ + "Symantec PCAnywere (tm)", { action => 'PARAM', proto => 'udp', dport => '5632' }, { action => 'PARAM', proto => 'tcp', dport => '5631' }, ], 'POP3' => [ + "POP3 traffic", { action => 'PARAM', proto => 'tcp', dport => '110' }, ], 'POP3S' => [ + "Encrypted POP3 traffic", { action => 'PARAM', proto => 'tcp', dport => '995' }, ], 'PPtP' => [ + "Point-to-Point Tunneling Protocol", { action => 'PARAM', proto => '47' }, - { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => '47' }, { action => 'PARAM', proto => 'tcp', dport => '1723' }, ], 'Ping' => [ + "ICMP echo request", { action => 'PARAM', proto => 'icmp', dport => 'echo-request' }, ], 'PostgreSQL' => [ + "PostgreSQL server", { action => 'PARAM', proto => 'tcp', dport => '5432' }, ], 'Printer' => [ + "Line Printer protocol printing", { action => 'PARAM', proto => 'tcp', dport => '515' }, ], 'RDP' => [ + "Microsoft Remote Desktop Protocol traffic", { action => 'PARAM', proto => 'tcp', dport => '3389' }, ], - 'RIPbi' => [ + 'RIP' => [ + "Routing Information Protocol (bidirectional)", { action => 'PARAM', proto => 'udp', dport => '520' }, - { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '520' }, ], 'RNDC' => [ + "BIND remote management protocol", { action => 'PARAM', proto => 'tcp', dport => '953' }, ], 'Razor' => [ + "Razor Antispam System", { action => 'ACCEPT', proto => 'tcp', dport => '2703' }, ], 'Rdate' => [ + "Remote time retrieval (rdate)", { action => 'PARAM', proto => 'tcp', dport => '37' }, ], 'Rsync' => [ + "Rsync server", { action => 'PARAM', proto => 'tcp', dport => '873' }, ], 'SANE' => [ + "SANE network scanning", { action => 'PARAM', proto => 'tcp', dport => '6566' }, ], 'SMB' => [ + "Microsoft SMB traffic", { action => 'PARAM', proto => 'udp', dport => '135,445' }, { action => 'PARAM', proto => 'udp', dport => '137:139' }, { action => 'PARAM', proto => 'udp', dport => '1024:65535', sport => '137' }, { action => 'PARAM', proto => 'tcp', dport => '135,139,445' }, ], - 'SMBBI' => [ - { action => 'PARAM', proto => 'udp', dport => '135,445' }, - { action => 'PARAM', proto => 'udp', dport => '137:139' }, - { action => 'PARAM', proto => 'udp', dport => '1024:65535', sport => '137' }, - { action => 'PARAM', proto => 'tcp', dport => '135,139,445' }, - { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '135,445' }, - { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '137:139' }, - { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '1024:65535', sport => '137' }, - { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'tcp', dport => '135,139,445' }, - ], 'SMBswat' => [ + "Samba Web Administration Tool", { action => 'PARAM', proto => 'tcp', dport => '901' }, ], 'SMTP' => [ + "Simple Mail Transfer Protocol", { action => 'PARAM', proto => 'tcp', dport => '25' }, ], 'SMTPS' => [ + "Encrypted Simple Mail Transfer Protocol", { action => 'PARAM', proto => 'tcp', dport => '465' }, ], 'SNMP' => [ + "Simple Network Management Protocol", { action => 'PARAM', proto => 'udp', dport => '161:162' }, { action => 'PARAM', proto => 'tcp', dport => '161' }, ], 'SPAMD' => [ + "Spam Assassin SPAMD traffic", { action => 'PARAM', proto => 'tcp', dport => '783' }, ], 'SSH' => [ + "Secure shell traffic", { action => 'PARAM', proto => 'tcp', dport => '22' }, ], 'SVN' => [ + "Subversion server (svnserve)", { action => 'PARAM', proto => 'tcp', dport => '3690' }, ], 'SixXS' => [ + "SixXS IPv6 Deployment and Tunnel Broker", { action => 'PARAM', proto => 'tcp', dport => '3874' }, { action => 'PARAM', proto => 'udp', dport => '3740' }, { action => 'PARAM', proto => '41' }, { action => 'PARAM', proto => 'udp', dport => '5072,8374' }, ], 'Squid' => [ + "Squid web proxy traffic", { action => 'PARAM', proto => 'tcp', dport => '3128' }, ], 'Submission' => [ + "Mail message submission traffic", { action => 'PARAM', proto => 'tcp', dport => '587' }, ], 'Syslog' => [ + "Syslog protocol (RFC 5424) traffic", { action => 'PARAM', proto => 'udp', dport => '514' }, { action => 'PARAM', proto => 'tcp', dport => '514' }, ], 'TFTP' => [ + "Trivial File Transfer Protocol traffic", { action => 'PARAM', proto => 'udp', dport => '69' }, ], 'Telnet' => [ + "Telnet traffic", { action => 'PARAM', proto => 'tcp', dport => '23' }, ], 'Telnets' => [ + "Telnet over SSL", { action => 'PARAM', proto => 'tcp', dport => '992' }, ], 'Time' => [ + "RFC 868 Time protocol", { action => 'PARAM', proto => 'tcp', dport => '37' }, ], 'Trcrt' => [ + "Traceroute (for up to 30 hops) traffic", { action => 'PARAM', proto => 'udp', dport => '33434:33524' }, { action => 'PARAM', proto => 'icmp', dport => 'echo-request' }, ], 'VNC' => [ + "VNC traffic for VNC display's 0 - 9", { action => 'PARAM', proto => 'tcp', dport => '5900:5909' }, ], 'VNCL' => [ + "VNC traffic from Vncservers to Vncviewers in listen mode", { action => 'PARAM', proto => 'tcp', dport => '5500' }, ], 'Web' => [ + "WWW traffic (HTTP and HTTPS)", { action => 'PARAM', proto => 'tcp', dport => '80' }, { action => 'PARAM', proto => 'tcp', dport => '443' }, ], 'Webcache' => [ + "Web Cache/Proxy traffic (port 8080)", { action => 'PARAM', proto => 'tcp', dport => '8080' }, ], 'Webmin' => [ + "Webmin traffic", { action => 'PARAM', proto => 'tcp', dport => '10000' }, ], 'Whois' => [ + "Whois (nicname, RFC 3912) traffic", { action => 'PARAM', proto => 'tcp', dport => '43' }, ], }; my $pve_fw_parsed_macros; +my $pve_fw_macro_descr; my $pve_fw_preferred_macro_names = {}; my $pve_std_chains = { @@ -394,12 +479,12 @@ my $pve_std_chains = { { action => 'DROP', dsttype => 'BROADCAST' }, { action => 'DROP', dsttype => 'MULTICAST' }, { action => 'DROP', dsttype => 'ANYCAST' }, - { action => 'DROP', dest => '224.0.0.0/4' }, + { action => 'DROP', dest => '224.0.0.0/4' }, ], 'PVEFW-reject' => [ # same as shorewall 'reject' { action => 'DROP', dsttype => 'BROADCAST' }, - { action => 'DROP', source => '224.0.0.0/4' }, + { action => 'DROP', source => '224.0.0.0/4' }, { action => 'DROP', proto => 'icmp' }, "-p tcp -j REJECT --reject-with tcp-reset", "-p udp -j REJECT --reject-with icmp-port-unreachable", @@ -407,7 +492,7 @@ my $pve_std_chains = { "-j REJECT --reject-with icmp-host-prohibited", ], 'PVEFW-Drop' => [ - # same as shorewall 'Drop', which is equal to DROP, + # same as shorewall 'Drop', which is equal to DROP, # but REJECT/DROP some packages to reduce logging, # and ACCEPT critical ICMP types { action => 'PVEFW-reject', proto => 'tcp', dport => '43' }, # REJECT 'auth' @@ -430,7 +515,7 @@ my $pve_std_chains = { { action => 'DROP', proto => 'udp', sport => 53 }, ], 'PVEFW-Reject' => [ - # same as shorewall 'Reject', which is equal to Reject, + # same as shorewall 'Reject', which is equal to Reject, # but REJECT/DROP some packages to reduce logging, # and ACCEPT critical ICMP types { action => 'PVEFW-reject', proto => 'tcp', dport => '43' }, # REJECT 'auth' @@ -518,6 +603,9 @@ sub init_firewall_macros { foreach my $k (keys %$pve_fw_macros) { my $lc_name = lc($k); my $macro = $pve_fw_macros->{$k}; + if (!ref($macro->[0])) { + $pve_fw_macro_descr->{$k} = shift @$macro; + } $pve_fw_preferred_macro_names->{$lc_name} = $k; $pve_fw_parsed_macros->{$k} = $macro; } @@ -525,6 +613,10 @@ sub init_firewall_macros { init_firewall_macros(); +sub get_macros { + return wantarray ? ($pve_fw_parsed_macros, $pve_fw_macro_descr): $pve_fw_parsed_macros; +} + my $etc_services; sub get_etc_services { @@ -598,47 +690,58 @@ sub get_etc_protocols { sub parse_address_list { my ($str) = @_; - my $nbaor = 0; - foreach my $aor (split(/,/, $str)) { - if (!Net::IP->new($aor)) { + return if $str =~ m/^(\+)(\S+)$/; # ipset ref + return if $str =~ m/^${ip_alias_pattern}$/; + + my $count = 0; + my $iprange = 0; + foreach my $elem (split(/,/, $str)) { + $count++; + if (!Net::IP->new($elem)) { my $err = Net::IP::Error(); die "invalid IP address: $err\n"; - }else{ - $nbaor++; } + $iprange = 1 if $elem =~ m/-/; } - return $nbaor; + + die "you can use a range in a list\n" if $iprange && $count > 1; } sub parse_port_name_number_or_range { my ($str) = @_; my $services = PVE::Firewall::get_etc_services(); - my $nbports = 0; + my $count = 0; + my $icmp_port = 0; + foreach my $item (split(/,/, $str)) { - my $portlist = ""; - my $oldpon = undef; - $nbports++; - foreach my $pon (split(':', $item, 2)) { - $pon = $services->{byname}->{$pon}->{port} if $services->{byname}->{$pon}->{port}; - if ($pon =~ m/^\d+$/){ - die "invalid port '$pon'\n" if $pon < 0 && $pon > 65535; - die "port '$pon' must be bigger than port '$oldpon' \n" if $oldpon && ($pon < $oldpon); - $oldpon = $pon; - }else{ - die "invalid port $services->{byname}->{$pon}\n" if !$services->{byname}->{$pon}; + $count++; + if ($item =~ m/^(\d+):(\d+)$/) { + 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+)$/) { + my $port = $1; + die "invalid port '$port'\n" if $port > 65535; + } else { + if ($icmp_type_names->{$item}) { + $icmp_port = 1; + } else { + die "invalid port '$item'\n" if !$services->{byname}->{$item}; } } } - return ($nbports); + die "ICPM ports not allowed in port range\n" if $icmp_port && $count > 1; + + return $count; } PVE::JSONSchema::register_format('pve-fw-port-spec', \&pve_fw_verify_port_spec); sub pve_fw_verify_port_spec { my ($portstr) = @_; - parse_port_name_number_or_range($portstr); + parse_port_name_number_or_range($portstr); return $portstr; } @@ -668,6 +771,52 @@ sub pve_fw_verify_protocol_spec { # helper function for API +sub copy_opject_with_digest { + my ($object) = @_; + + my $sha = Digest::SHA->new('sha1'); + + my $res = {}; + foreach my $k (sort keys %$object) { + my $v = $object->{$k}; + next if !defined($v); + $res->{$k} = $v; + $sha->add($k, ':', $v, "\n"); + } + + my $digest = $sha->hexdigest; + + $res->{digest} = $digest; + + return wantarray ? ($res, $digest) : $res; +} + +sub copy_list_with_digest { + my ($list) = @_; + + my $sha = Digest::SHA->new('sha1'); + + my $res = []; + foreach my $entry (@$list) { + my $data = {}; + foreach my $k (sort keys %$entry) { + my $v = $entry->{$k}; + next if !defined($v); + $data->{$k} = $v; + $sha->add($k, ':', $v, "\n"); + } + push @$res, $data; + } + + my $digest = $sha->hexdigest; + + foreach my $entry (@$res) { + $entry->{digest} = $digest; + } + + return wantarray ? ($res, $digest) : $res; +} + my $rule_properties = { pos => { description => "Update rule at position .", @@ -675,21 +824,19 @@ my $rule_properties = { minimum => 0, optional => 1, }, - digest => { - type => 'string', - optional => 1, - maxLength => 27, - minLength => 27, - }, + digest => get_standard_option('pve-config-digest'), type => { type => 'string', optional => 1, enum => ['in', 'out', 'group'], }, action => { + description => "Rule action ('ACCEPT', 'DROP', 'REJECT') or security group name.", type => 'string', optional => 1, - enum => ['ACCEPT', 'DROP', 'REJECT'], + pattern => $security_group_name_pattern, + maxLength => 20, + minLength => 2, }, macro => { type => 'string', @@ -727,31 +874,139 @@ my $rule_properties = { }, }; -sub cleanup_fw_rule { - my ($rule, $digest, $pos) = @_; +sub add_rule_properties { + my ($properties) = @_; + + foreach my $k (keys %$rule_properties) { + my $h = $rule_properties->{$k}; + # copy data, so that we can modify later without side effects + foreach my $opt (keys %$h) { $properties->{$k}->{$opt} = $h->{$opt}; } + } + + return $properties; +} - my $r = {}; +sub delete_rule_properties { + my ($rule, $delete_str) = @_; - foreach my $k (keys %$rule) { - next if !$rule_properties->{$k}; - my $v = $rule->{$k}; - next if !defined($v); - $r->{$k} = $v; - $r->{digest} = $digest; - $r->{pos} = $pos; + foreach my $opt (PVE::Tools::split_list($delete_str)) { + raise_param_exc({ 'delete' => "no such property ('$opt')"}) + if !defined($rule_properties->{$opt}); + raise_param_exc({ 'delete' => "unable to delete required property '$opt'"}) + if $opt eq 'type' || $opt eq 'action'; + delete $rule->{$opt}; } - return $r; + return $rule; } -sub add_rule_properties { - my ($properties) = @_; +my $apply_macro = sub { + my ($macro_name, $param, $verify) = @_; - foreach my $k (keys %$rule_properties) { - $properties->{$k} = $rule_properties->{$k}; + my $macro_rules = $pve_fw_parsed_macros->{$macro_name}; + die "unknown macro '$macro_name'\n" if !$macro_rules; # should not happen + + my $rules = []; + + foreach my $templ (@$macro_rules) { + my $rule = {}; + my $param_used = {}; + foreach my $k (keys %$templ) { + my $v = $templ->{$k}; + if ($v eq 'PARAM') { + $v = $param->{$k}; + $param_used->{$k} = 1; + } elsif ($v eq 'DEST') { + $v = $param->{dest}; + $param_used->{dest} = 1; + } elsif ($v eq 'SOURCE') { + $v = $param->{source}; + $param_used->{source} = 1; + } + + if (!defined($v)) { + my $msg = "missing parameter '$k' in macro '$macro_name'"; + raise_param_exc({ macro => $msg }) if $verify; + die "$msg\n"; + } + $rule->{$k} = $v; + } + foreach my $k (keys %$param) { + next if $k eq 'macro'; + next if !defined($param->{$k}); + next if $param_used->{$k}; + if (defined($rule->{$k})) { + if ($rule->{$k} ne $param->{$k}) { + my $msg = "parameter '$k' already define in macro (value = '$rule->{$k}')"; + raise_param_exc({ $k => $msg }) if $verify; + die "$msg\n"; + } + } else { + $rule->{$k} = $param->{$k}; + } + } + push @$rules, $rule; } - - return $properties; + + return $rules; +}; + +sub verify_rule { + my ($rule, $allow_groups) = @_; + + my $type = $rule->{type}; + + raise_param_exc({ type => "missing property"}) if !$type; + raise_param_exc({ action => "missing property"}) if !$rule->{action}; + + if ($type eq 'in' || $type eq 'out') { + raise_param_exc({ action => "unknown action '$rule->{action}'"}) + if $rule->{action} !~ m/^(ACCEPT|DROP|REJECT)$/; + } elsif ($type eq 'group') { + raise_param_exc({ type => "security groups not allowed"}) + if !$allow_groups; + raise_param_exc({ action => "invalid characters in security group name"}) + if $rule->{action} !~ m/^${security_group_name_pattern}$/; + } else { + raise_param_exc({ type => "unknown rule type '$type'"}); + } + + if ($rule->{iface}) { + eval { PVE::JSONSchema::pve_verify_iface($rule->{iface}); }; + raise_param_exc({ iface => $@ }) if $@; + } + + if ($rule->{macro}) { + my $preferred_name = $pve_fw_preferred_macro_names->{lc($rule->{macro})}; + raise_param_exc({ macro => "unknown macro '$rule->{macro}'"}) if !$preferred_name; + $rule->{macro} = $preferred_name; + } + + if ($rule->{dport}) { + eval { parse_port_name_number_or_range($rule->{dport}); }; + raise_param_exc({ dport => $@ }) if $@; + } + + if ($rule->{sport}) { + eval { parse_port_name_number_or_range($rule->{sport}); }; + raise_param_exc({ sport => $@ }) if $@; + } + + if ($rule->{source}) { + eval { parse_address_list($rule->{source}); }; + raise_param_exc({ source => $@ }) if $@; + } + + if ($rule->{dest}) { + eval { parse_address_list($rule->{dest}); }; + raise_param_exc({ dest => $@ }) if $@; + } + + if ($rule->{macro}) { + &$apply_macro($rule->{macro}, $rule, 1); + } + + return $rule; } sub copy_rule_data { @@ -768,6 +1023,9 @@ sub copy_rule_data { delete $rule->{$k}; } } + + # verify rule now + return $rule; } @@ -789,12 +1047,6 @@ sub enable_bridge_firewall { my $rule_format = "%-15s %-30s %-30s %-15s %-15s %-15s\n"; -sub iptables { - my ($cmd) = @_; - - run_command("/sbin/iptables $cmd", outfunc => sub {}, errfunc => sub {}); -} - sub iptables_restore_cmdlist { my ($cmdlist) = @_; @@ -804,7 +1056,7 @@ sub iptables_restore_cmdlist { sub ipset_restore_cmdlist { my ($cmdlist) = @_; - run_command(" /usr/sbin/ipset restore", input => $cmdlist); + run_command("/usr/sbin/ipset restore", input => $cmdlist); } sub iptables_get_chains { @@ -823,7 +1075,7 @@ sub iptables_get_chains { return 1 if $name =~ m/^venet0-\d+-(:?IN|OUT)$/; - return 1 if $name =~ m/^vmbr\d+-(:?FW|IN|OUT|IPS)$/; + return 1 if $name =~ m/^fwbr\d+(v\d+)?-(:?FW|IN|OUT|IPS)$/; return 1 if $name =~ m/^GROUP-(:?[^\s\-]+)-(:?IN|OUT)$/; return undef; @@ -831,6 +1083,8 @@ sub iptables_get_chains { my $table = ''; + my $hooks = {}; + my $parser = sub { my $line = shift; @@ -852,6 +1106,8 @@ sub iptables_get_chains { my ($chain, $sig) = ($1, $2); return if !&$is_pvefw_chain($chain); $res->{$chain} = $sig; + } elsif ($line =~ m/^-A\s+(INPUT|OUTPUT|FORWARD)\s+-j\s+PVEFW-\1$/) { + $hooks->{$1} = 1; } else { # simply ignore the rest return; @@ -860,11 +1116,21 @@ sub iptables_get_chains { run_command("/sbin/iptables-save", outfunc => $parser); - return $res; + return wantarray ? ($res, $hooks) : $res; +} + +sub iptables_chain_digest { + my ($rules) = @_; + my $digest = Digest::SHA->new('sha1'); + foreach my $rule (@$rules) { # order is important + $digest->add($rule); + } + return $digest->b64digest; } sub ipset_chain_digest { my ($rules) = @_; + my $digest = Digest::SHA->new('sha1'); foreach my $rule (sort @$rules) { # note: sorted $digest->add($rule); @@ -882,8 +1148,10 @@ sub ipset_get_chains { return if $line =~ m/^#/; return if $line =~ m/^\s*$/; - if ($line =~ m/^(\S+)\s(\S+)\s(\S+)/) { - push @{$chains->{$2}}, $line; + if ($line =~ m/^(?:\S+)\s(PVEFW-\S+)\s(?:\S+).*/) { + my $chain = $1; + $line =~ s/\s+$//; # delete trailing white space + push @{$chains->{$chain}}, $line; } else { # simply ignore the rest return; @@ -900,30 +1168,8 @@ sub ipset_get_chains { return $res; } -sub iptables_chain_exist { - my ($chain) = @_; - - eval{ - iptables("-n --list $chain"); - }; - return undef if $@; - - return 1; -} - -sub iptables_rule_exist { - my ($rule) = @_; - - eval{ - iptables("-C $rule"); - }; - return undef if $@; - - return 1; -} - sub ruleset_generate_cmdstr { - my ($ruleset, $chain, $rule, $actions, $goto) = @_; + my ($ruleset, $chain, $rule, $actions, $goto, $cluster_conf) = @_; return if defined($rule->{enable}) && !$rule->{enable}; @@ -931,18 +1177,56 @@ sub ruleset_generate_cmdstr { my $nbdport = defined($rule->{dport}) ? parse_port_name_number_or_range($rule->{dport}) : 0; my $nbsport = defined($rule->{sport}) ? parse_port_name_number_or_range($rule->{sport}) : 0; - my $nbsource = $rule->{source} ? parse_address_list( $rule->{source}) : 0; - my $nbdest = $rule->{dest} ? parse_address_list($rule->{dest}) : 0; my @cmd = (); push @cmd, "-i $rule->{iface_in}" if $rule->{iface_in}; push @cmd, "-o $rule->{iface_out}" if $rule->{iface_out}; - push @cmd, "-m iprange --src-range" if $nbsource > 1; - push @cmd, "-s $rule->{source}" if $rule->{source}; - push @cmd, "-m iprange --dst-range" if $nbdest > 1; - push @cmd, "-d $rule->{dest}" if $rule->{dest}; + my $source = $rule->{source}; + my $dest = $rule->{dest}; + + if ($source) { + if ($source =~ m/^\+/) { + if ($source =~ m/^\+(${security_group_name_pattern})$/) { + die "no such ipset '$1'\n" if !$cluster_conf->{ipset}->{$1}; + push @cmd, "-m set --match-set PVEFW-$1 src"; + } else { + die "invalid security group name '$source'\n"; + } + } elsif ($source =~ m/^${ip_alias_pattern}$/){ + my $alias = lc($source); + my $e = $cluster_conf->{aliases}->{$alias}; + die "no such alias $source\n" if !$e; + push @cmd, "-s $e->{cidr}"; + } elsif ($source =~ m/\-/){ + push @cmd, "-m iprange --src-range $source"; + + } else { + push @cmd, "-s $source"; + } + } + + if ($dest) { + if ($dest =~ m/^\+/) { + if ($dest =~ m/^\+(${security_group_name_pattern})$/) { + die "no such ipset '$1'\n" if !$cluster_conf->{ipset}->{$1}; + push @cmd, "-m set --match-set PVEFW-$1 dst"; + } else { + die "invalid security group name '$dest'\n"; + } + } elsif ($dest =~ m/^${ip_alias_pattern}$/){ + my $alias = lc($dest); + my $e = $cluster_conf->{aliases}->{$alias}; + die "no such alias $dest" 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}"; @@ -953,7 +1237,7 @@ sub ruleset_generate_cmdstr { push @cmd, "--match multiport" if $multiport; - die "multiport: option '--sports' cannot be used together with '--dports'\n" + die "multiport: option '--sports' cannot be used together with '--dports'\n" if ($multiport == 2) && ($rule->{dport} ne $rule->{sport}); if ($rule->{dport}) { @@ -989,7 +1273,7 @@ sub ruleset_generate_cmdstr { push @cmd, "-m addrtype --dst-type $rule->{dsttype}" if $rule->{dsttype}; if (my $action = $rule->{action}) { - $action = $actions->{$action} if defined($actions->{$action}); + $action = $actions->{$action} if defined($actions->{$action}); $goto = 1 if !defined($goto) && $action eq 'PVEFW-SET-ACCEPT-MARK'; push @cmd, $goto ? "-g $action" : "-j $action"; } @@ -997,52 +1281,8 @@ sub ruleset_generate_cmdstr { return scalar(@cmd) ? join(' ', @cmd) : undef; } -my $apply_macro = sub { - my ($macro_name, $param) = @_; - - my $macro_rules = $pve_fw_parsed_macros->{$macro_name}; - die "unknown macro '$macro_name'\n" if !$macro_rules; # should not happen - - my $rules = []; - - foreach my $templ (@$macro_rules) { - my $rule = {}; - my $param_used = {}; - foreach my $k (keys %$templ) { - my $v = $templ->{$k}; - if ($v eq 'PARAM') { - $v = $param->{$k}; - $param_used->{$k} = 1; - } elsif ($v eq 'DEST') { - $v = $param->{dest}; - $param_used->{dest} = 1; - } elsif ($v eq 'SOURCE') { - $v = $param->{source}; - $param_used->{source} = 1; - } - - die "missing parameter '$k' in macro '$macro_name'\n" if !defined($v); - $rule->{$k} = $v; - } - foreach my $k (keys %$param) { - next if $k eq 'macro'; - next if !defined($param->{$k}); - next if $param_used->{$k}; - if (defined($rule->{$k})) { - die "parameter '$k' already define in macro (value = '$rule->{$k}')\n" - if $rule->{$k} ne $param->{$k}; - } else { - $rule->{$k} = $param->{$k}; - } - } - push @$rules, $rule; - } - - return $rules; -}; - sub ruleset_generate_rule { - my ($ruleset, $chain, $rule, $actions, $goto) = @_; + my ($ruleset, $chain, $rule, $actions, $goto, $cluster_conf) = @_; my $rules; @@ -1052,11 +1292,18 @@ sub ruleset_generate_rule { $rules = [ $rule ]; } - foreach my $tmp (@$rules) { - if (my $cmdstr = ruleset_generate_cmdstr($ruleset, $chain, $tmp, $actions, $goto)) { - ruleset_addrule($ruleset, $chain, $cmdstr); + # update all or nothing + + my @cmds = (); + foreach my $tmp (@$rules) { + if (my $cmdstr = ruleset_generate_cmdstr($ruleset, $chain, $tmp, $actions, $goto, $cluster_conf)) { + push @cmds, $cmdstr; } } + + foreach my $cmdstr (@cmds) { + ruleset_addrule($ruleset, $chain, $cmdstr); + } } sub ruleset_generate_rule_insert { @@ -1104,12 +1351,12 @@ sub ruleset_insertrule { sub get_log_rule_base { my ($chain, $vmid, $msg, $loglevel) = @_; - + die "internal error - no log level" if !defined($loglevel); $vmid = 0 if !defined($vmid); - # Note: we use special format for prefix to pass further + # Note: we use special format for prefix to pass further # info to log daemon (VMID, LOGVELEL and CHAIN) return "-j NFLOG --nflog-prefix \":$vmid:$loglevel:$chain: $msg\""; @@ -1124,36 +1371,7 @@ sub ruleset_addlog { $logrule = "$rule $logrule" if defined($rule); - ruleset_addrule($ruleset, $chain, $logrule) -} - -sub generate_bridge_chains { - my ($ruleset, $hostfw_conf, $bridge, $routing_table) = @_; - - my $options = $hostfw_conf->{options} || {}; - - die "error: detected direct route to bridge '$bridge'\n" - if !$options->{allow_bridge_route} && $routing_table->{$bridge}; - - if (!ruleset_chain_exist($ruleset, "$bridge-FW")) { - ruleset_create_chain($ruleset, "$bridge-FW"); - ruleset_addrule($ruleset, "PVEFW-FORWARD", "-o $bridge -m physdev --physdev-is-out -j $bridge-FW"); - ruleset_addrule($ruleset, "PVEFW-FORWARD", "-i $bridge -m physdev --physdev-is-in -j $bridge-FW"); - } - - if (!ruleset_chain_exist($ruleset, "$bridge-OUT")) { - ruleset_create_chain($ruleset, "$bridge-OUT"); - ruleset_addrule($ruleset, "$bridge-FW", "-m physdev --physdev-is-in -j $bridge-OUT"); - ruleset_insertrule($ruleset, "PVEFW-INPUT", "-i $bridge -m physdev --physdev-is-in -j $bridge-OUT"); - } - - if (!ruleset_chain_exist($ruleset, "$bridge-IN")) { - ruleset_create_chain($ruleset, "$bridge-IN"); - ruleset_addrule($ruleset, "$bridge-FW", "-m physdev --physdev-is-out -j $bridge-IN"); - ruleset_addrule($ruleset, "$bridge-FW", "-m mark --mark 1 -j ACCEPT"); - # accept traffic to unmanaged bridge ports - ruleset_addrule($ruleset, "$bridge-FW", "-m physdev --physdev-is-out -j ACCEPT "); - } + ruleset_addrule($ruleset, $chain, $logrule); } sub ruleset_add_chain_policy { @@ -1183,77 +1401,101 @@ sub ruleset_add_chain_policy { } } -sub ruleset_create_vm_chain { - my ($ruleset, $chain, $options, $macaddr, $direction) = @_; +sub ruleset_chain_add_conn_filters { + my ($ruleset, $chain, $accept) = @_; - ruleset_create_chain($ruleset, $chain); - my $accept = generate_nfqueue($options); + 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 { + my ($ruleset, $chain, $options, $cluster_conf, $loglevel) = @_; + + if ($cluster_conf->{ipset}->{blacklist}){ + ruleset_addlog($ruleset, $chain, 0, "DROP: ", $loglevel, "-m set --match-set PVEFW-blacklist src"); + ruleset_addrule($ruleset, $chain, "-m set --match-set PVEFW-blacklist src -j DROP"); + } if (!(defined($options->{nosmurfs}) && $options->{nosmurfs} == 0)) { ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate INVALID,NEW -j PVEFW-smurfs"); } + if ($options->{tcpflags}) { + ruleset_addrule($ruleset, $chain, "-p tcp -j PVEFW-tcpflags"); + } +} + +sub ruleset_create_vm_chain { + my ($ruleset, $chain, $options, $host_options, $macaddr, $direction) = @_; + + ruleset_create_chain($ruleset, $chain); + my $accept = generate_nfqueue($options); + if (!(defined($options->{dhcp}) && $options->{dhcp} == 0)) { if ($direction eq 'OUT') { - ruleset_generate_rule($ruleset, $chain, { action => 'PVEFW-SET-ACCEPT-MARK', + ruleset_generate_rule($ruleset, $chain, { action => 'PVEFW-SET-ACCEPT-MARK', proto => 'udp', sport => 68, dport => 67 }); } else { - ruleset_generate_rule($ruleset, $chain, { action => 'ACCEPT', + ruleset_generate_rule($ruleset, $chain, { action => 'ACCEPT', proto => 'udp', sport => 67, dport => 68 }); } } - if ($options->{tcpflags}) { - ruleset_addrule($ruleset, $chain, "-p tcp -j PVEFW-tcpflags"); - } - - ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate INVALID -j DROP"); - if($direction eq 'OUT'){ - ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate RELATED,ESTABLISHED -g PVEFW-SET-ACCEPT-MARK"); - - }else{ - ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate RELATED,ESTABLISHED -j $accept"); - } if ($direction eq 'OUT') { if (defined($macaddr) && !(defined($options->{macfilter}) && $options->{macfilter} == 0)) { ruleset_addrule($ruleset, $chain, "-m mac ! --mac-source $macaddr -j DROP"); } ruleset_addrule($ruleset, $chain, "-j MARK --set-mark 0"); # clear mark } +} + +sub ruleset_add_group_rule { + my ($ruleset, $cluster_conf, $chain, $rule, $direction, $action) = @_; + my $group = $rule->{action}; + my $group_chain = "GROUP-$group-$direction"; + if(!ruleset_chain_exist($ruleset, $group_chain)){ + generate_group_rules($ruleset, $cluster_conf, $group); + } + + if ($direction eq 'OUT' && $rule->{iface_out}) { + 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"); + } else { + ruleset_addrule($ruleset, $chain, "-j $group_chain"); + } + ruleset_addrule($ruleset, $chain, "-m mark --mark 1 -j $action"); } sub ruleset_generate_vm_rules { - my ($ruleset, $rules, $groups_conf, $chain, $netid, $direction, $options) = @_; + my ($ruleset, $rules, $cluster_conf, $chain, $netid, $direction, $options) = @_; my $lc_direction = lc($direction); + my $in_accept = generate_nfqueue($options); + foreach my $rule (@$rules) { next if $rule->{iface} && $rule->{iface} ne $netid; next if !$rule->{enable}; if ($rule->{type} eq 'group') { - my $group_chain = "GROUP-$rule->{action}-$direction"; - if(!ruleset_chain_exist($ruleset, $group_chain)){ - generate_group_rules($ruleset, $groups_conf, $rule->{action}); - } - ruleset_addrule($ruleset, $chain, "-j $group_chain"); - if ($direction eq 'OUT'){ - ruleset_addrule($ruleset, $chain, "-m mark --mark 1 -j RETURN"); - }else{ - my $accept = generate_nfqueue($options); - ruleset_addrule($ruleset, $chain, "-m mark --mark 1 -j $accept"); - } - + ruleset_add_group_rule($ruleset, $cluster_conf, $chain, $rule, $direction, + $direction eq 'OUT' ? 'RETURN' : $in_accept); } else { next if $rule->{type} ne $lc_direction; - if ($direction eq 'OUT') { - ruleset_generate_rule($ruleset, $chain, $rule, - { ACCEPT => "PVEFW-SET-ACCEPT-MARK", REJECT => "PVEFW-reject" }); - } else { - my $accept = generate_nfqueue($options); - ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept , REJECT => "PVEFW-reject" }); - } + eval { + if ($direction eq 'OUT') { + ruleset_generate_rule($ruleset, $chain, $rule, + { ACCEPT => "PVEFW-SET-ACCEPT-MARK", REJECT => "PVEFW-reject" }, + undef, $cluster_conf); + } else { + ruleset_generate_rule($ruleset, $chain, $rule, + { ACCEPT => $in_accept , REJECT => "PVEFW-reject" }, + undef, $cluster_conf); + } + }; + warn $@ if $@; } } } @@ -1261,60 +1503,52 @@ sub ruleset_generate_vm_rules { sub generate_nfqueue { my ($options) = @_; - my $action = ""; - if($options->{ips}){ - $action = "NFQUEUE"; - if($options->{ips_queues} && $options->{ips_queues} =~ m/^(\d+)(:(\d+))?$/) { - if(defined($3) && defined($1)) { + if ($options->{ips}) { + my $action = "NFQUEUE"; + if ($options->{ips_queues} && $options->{ips_queues} =~ m/^(\d+)(:(\d+))?$/) { + if (defined($3) && defined($1)) { $action .= " --queue-balance $1:$3"; - }elsif (defined($1)) { + } elsif (defined($1)) { $action .= " --queue-num $1"; } } - $action .= " --queue-bypass"; - }else{ - $action = "ACCEPT"; + $action .= " --queue-bypass" if $feature_ipset_nomatch; #need kernel 3.10 + return $action; + } else { + return "ACCEPT"; } - - return $action; } sub ruleset_generate_vm_ipsrules { - my ($ruleset, $options, $direction, $iface, $bridge) = @_; + my ($ruleset, $options, $direction, $iface) = @_; if ($options->{ips} && $direction eq 'IN') { my $nfqueue = generate_nfqueue($options); - if (!ruleset_chain_exist($ruleset, "$bridge-IPS")) { + if (!ruleset_chain_exist($ruleset, "PVEFW-IPS")) { ruleset_create_chain($ruleset, "PVEFW-IPS"); } - if (!ruleset_chain_exist($ruleset, "$bridge-IPS")) { - ruleset_create_chain($ruleset, "$bridge-IPS"); - ruleset_insertrule($ruleset, "PVEFW-IPS", "-o $bridge -m physdev --physdev-is-out -j $bridge-IPS"); - } - - ruleset_addrule($ruleset, "$bridge-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"); } } sub generate_venet_rules_direction { - my ($ruleset, $groups_conf, $vmfw_conf, $vmid, $ip, $direction) = @_; - - parse_address_list($ip); # make sure we have a valid $ip list + my ($ruleset, $cluster_conf, $hostfw_conf, $vmfw_conf, $vmid, $ip, $direction) = @_; my $lc_direction = lc($direction); my $rules = $vmfw_conf->{rules}; my $options = $vmfw_conf->{options}; + my $hostfw_options = $vmfw_conf->{options}; my $loglevel = get_option_log_level($options, "log_level_${lc_direction}"); my $chain = "venet0-$vmid-$direction"; - ruleset_create_vm_chain($ruleset, $chain, $options, undef, $direction); + ruleset_create_vm_chain($ruleset, $chain, $options, $hostfw_options, undef, $direction); - ruleset_generate_vm_rules($ruleset, $rules, $groups_conf, $chain, 'venet', $direction); + ruleset_generate_vm_rules($ruleset, $rules, $cluster_conf, $chain, 'venet', $direction); # implement policy my $policy; @@ -1329,24 +1563,13 @@ sub generate_venet_rules_direction { my $accept_action = $direction eq 'OUT' ? "PVEFW-SET-ACCEPT-MARK" : $accept; ruleset_add_chain_policy($ruleset, $chain, $vmid, $policy, $loglevel, $accept_action); - # plug into FORWARD, INPUT and OUTPUT chain if ($direction eq 'OUT') { - ruleset_generate_rule_insert($ruleset, "PVEFW-FORWARD", { - action => $chain, - source => $ip, - iface_in => 'venet0'}); - - ruleset_generate_rule_insert($ruleset, "PVEFW-INPUT", { + ruleset_generate_rule_insert($ruleset, "PVEFW-VENET-OUT", { action => $chain, source => $ip, iface_in => 'venet0'}); } else { - ruleset_generate_rule($ruleset, "PVEFW-FORWARD", { - action => $chain, - dest => $ip, - iface_out => 'venet0'}); - - ruleset_generate_rule($ruleset, "PVEFW-OUTPUT", { + ruleset_generate_rule($ruleset, "PVEFW-VENET-IN", { action => $chain, dest => $ip, iface_out => 'venet0'}); @@ -1354,22 +1577,23 @@ sub generate_venet_rules_direction { } sub generate_tap_rules_direction { - my ($ruleset, $groups_conf, $iface, $netid, $macaddr, $vmfw_conf, $vmid, $bridge, $direction) = @_; + my ($ruleset, $cluster_conf, $hostfw_conf, $iface, $netid, $macaddr, $vmfw_conf, $vmid, $direction) = @_; my $lc_direction = lc($direction); my $rules = $vmfw_conf->{rules}; my $options = $vmfw_conf->{options}; + my $hostfw_options = $hostfw_conf->{options}; my $loglevel = get_option_log_level($options, "log_level_${lc_direction}"); my $tapchain = "$iface-$direction"; - ruleset_create_vm_chain($ruleset, $tapchain, $options, $macaddr, $direction); + ruleset_create_vm_chain($ruleset, $tapchain, $options, $hostfw_options, $macaddr, $direction); - ruleset_generate_vm_rules($ruleset, $rules, $groups_conf, $tapchain, $netid, $direction, $options); + ruleset_generate_vm_rules($ruleset, $rules, $cluster_conf, $tapchain, $netid, $direction, $options); - ruleset_generate_vm_ipsrules($ruleset, $options, $direction, $iface, $bridge); + ruleset_generate_vm_ipsrules($ruleset, $options, $direction, $iface); # implement policy my $policy; @@ -1386,21 +1610,21 @@ sub generate_tap_rules_direction { # plug the tap chain to bridge chain if ($direction eq 'IN') { - ruleset_insertrule($ruleset, "$bridge-IN", - "-m physdev --physdev-is-bridged --physdev-out $iface -j $tapchain"); + ruleset_addrule($ruleset, "PVEFW-FWBR-IN", + "-m physdev --physdev-is-bridged --physdev-out $iface -j $tapchain"); } else { - ruleset_insertrule($ruleset, "$bridge-OUT", - "-m physdev --physdev-in $iface -j $tapchain"); + ruleset_addrule($ruleset, "PVEFW-FWBR-OUT", + "-m physdev --physdev-is-bridged --physdev-in $iface -j $tapchain"); } } sub enable_host_firewall { - my ($ruleset, $hostfw_conf, $groups_conf) = @_; - - # fixme: allow security groups + my ($ruleset, $hostfw_conf, $cluster_conf) = @_; my $options = $hostfw_conf->{options}; + my $cluster_options = $cluster_conf->{options}; my $rules = $hostfw_conf->{rules}; + my $cluster_rules = $cluster_conf->{rules}; # host inbound firewall my $chain = "PVEFW-HOST-IN"; @@ -1408,17 +1632,11 @@ sub enable_host_firewall { my $loglevel = get_option_log_level($options, "log_level_in"); - if (!(defined($options->{nosmurfs}) && $options->{nosmurfs} == 0)) { - ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate INVALID,NEW -j PVEFW-smurfs"); - } + ruleset_addrule($ruleset, $chain, "-i lo -j ACCEPT"); - if ($options->{tcpflags}) { - ruleset_addrule($ruleset, $chain, "-p tcp -j PVEFW-tcpflags"); - } + ruleset_chain_add_conn_filters($ruleset, $chain, 'ACCEPT'); + ruleset_chain_add_input_filters($ruleset, $chain, $options, $cluster_conf, $loglevel); - 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, "-i lo -j ACCEPT"); ruleset_addrule($ruleset, $chain, "-m addrtype --dst-type MULTICAST -j ACCEPT"); ruleset_addrule($ruleset, $chain, "-p udp -m conntrack --ctstate NEW --dport 5404:5405 -j ACCEPT"); ruleset_addrule($ruleset, $chain, "-p udp -m udp --dport 9000 -j ACCEPT"); #corosync @@ -1426,13 +1644,20 @@ sub enable_host_firewall { # we use RETURN because we need to check also tap rules my $accept_action = 'RETURN'; - foreach my $rule (@$rules) { - next if $rule->{type} ne 'in'; - ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" }); + # add host rules first, so that cluster wide rules can be overwritten + foreach my $rule (@$rules, @$cluster_rules) { + $rule->{iface_in} = $rule->{iface} if $rule->{iface}; + if ($rule->{type} eq 'group') { + ruleset_add_group_rule($ruleset, $cluster_conf, $chain, $rule, 'IN', $accept_action); + } elsif ($rule->{type} eq 'in') { + ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" }, + undef, $cluster_conf); + } + delete $rule->{iface_in}; } # implement input policy - my $policy = $options->{policy_in} || 'DROP'; # allow nothing by default + my $policy = $cluster_options->{policy_in} || 'DROP'; # allow nothing by default ruleset_add_chain_policy($ruleset, $chain, 0, $policy, $loglevel, $accept_action); # host outbound firewall @@ -1441,9 +1666,10 @@ sub enable_host_firewall { $loglevel = get_option_log_level($options, "log_level_out"); - 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, "-o lo -j ACCEPT"); + + ruleset_chain_add_conn_filters($ruleset, $chain, 'ACCEPT'); + ruleset_addrule($ruleset, $chain, "-m addrtype --dst-type MULTICAST -j ACCEPT"); ruleset_addrule($ruleset, $chain, "-p udp -m conntrack --ctstate NEW --dport 5404:5405 -j ACCEPT"); ruleset_addrule($ruleset, $chain, "-p udp -m udp --dport 9000 -j ACCEPT"); #corosync @@ -1451,13 +1677,20 @@ sub enable_host_firewall { # we use RETURN because we may want to check other thigs later $accept_action = 'RETURN'; - foreach my $rule (@$rules) { - next if $rule->{type} ne 'out'; - ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" }); + # add host rules first, so that cluster wide rules can be overwritten + foreach my $rule (@$rules, @$cluster_rules) { + $rule->{iface_out} = $rule->{iface} if $rule->{iface}; + if ($rule->{type} eq 'group') { + ruleset_add_group_rule($ruleset, $cluster_conf, $chain, $rule, 'OUT', $accept_action); + } elsif ($rule->{type} eq 'out') { + ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" }, + undef, $cluster_conf); + } + delete $rule->{iface_out}; } # implement output policy - $policy = $options->{policy_out} || 'ACCEPT'; # allow everything by default + $policy = $cluster_options->{policy_out} || 'ACCEPT'; # allow everything by default ruleset_add_chain_policy($ruleset, $chain, 0, $policy, $loglevel, $accept_action); ruleset_addrule($ruleset, "PVEFW-OUTPUT", "-j PVEFW-HOST-OUT"); @@ -1465,10 +1698,14 @@ sub enable_host_firewall { } sub generate_group_rules { - my ($ruleset, $groups_conf, $group) = @_; - die "no such security group '$group'\n" if !$groups_conf->{rules}->{$group}; + my ($ruleset, $cluster_conf, $group) = @_; + + my $rules = $cluster_conf->{groups}->{$group}; - my $rules = $groups_conf->{rules}->{$group}; + if (!$rules) { + warn "no such security group '$group'\n"; + $rules = []; # create empty chain + } my $chain = "GROUP-${group}-IN"; @@ -1477,7 +1714,7 @@ sub generate_group_rules { foreach my $rule (@$rules) { next if $rule->{type} ne 'in'; - ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => "PVEFW-SET-ACCEPT-MARK", REJECT => "PVEFW-reject" }); + ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => "PVEFW-SET-ACCEPT-MARK", REJECT => "PVEFW-reject" }, undef, $cluster_conf); } $chain = "GROUP-${group}-OUT"; @@ -1489,8 +1726,8 @@ sub generate_group_rules { next if $rule->{type} ne 'out'; # we use PVEFW-SET-ACCEPT-MARK (Instead of ACCEPT) because we need to # check also other tap rules later - ruleset_generate_rule($ruleset, $chain, $rule, - { ACCEPT => 'PVEFW-SET-ACCEPT-MARK', REJECT => "PVEFW-reject" }); + ruleset_generate_rule($ruleset, $chain, $rule, + { ACCEPT => 'PVEFW-SET-ACCEPT-MARK', REJECT => "PVEFW-reject" }, undef, $cluster_conf); } } @@ -1501,9 +1738,11 @@ for (my $i = 0; $i < $MAX_NETS; $i++) { } sub parse_fw_rule { - my ($line, $need_iface, $allow_groups) = @_; + my ($line, $allow_iface, $allow_groups) = @_; + + my ($type, $action, $macro, $iface, $source, $dest, $proto, $dport, $sport); - my ($type, $action, $iface, $source, $dest, $proto, $dport, $sport); + chomp $line; # we can add single line comments to the end of the rule my $comment = decode('utf8', $1) if $line =~ s/#\s*(.*?)\s*$//; @@ -1513,22 +1752,11 @@ sub parse_fw_rule { $enable = 0 if $line =~ s/^\|//; - my @data = split(/\s+/, $line); - my $expected_elements = $need_iface ? 8 : 7; - - die "wrong number of rule elements\n" if scalar(@data) > $expected_elements; - - if ($need_iface) { - ($type, $action, $iface, $source, $dest, $proto, $dport, $sport) = @data - } else { - ($type, $action, $source, $dest, $proto, $dport, $sport) = @data; - } - - die "incomplete rule\n" if ! ($type && $action); - - my $macro; - - $type = lc($type); + $line =~ s/^(\S+)\s+(\S+)\s*// || + die "unable to parse rule: $line\n"; + + $type = lc($1); + $action = $2; if ($type eq 'in' || $type eq 'out') { if ($action =~ m/^(ACCEPT|DROP|REJECT)$/) { @@ -1542,32 +1770,52 @@ sub parse_fw_rule { die "unknown action '$action'\n"; } } elsif ($type eq 'group') { - die "wrong number of rule elements\n" if scalar(@data) != 3; die "groups disabled\n" if !$allow_groups; - - die "invalid characters in group name\n" if $action !~ m/^[A-Za-z0-9_\-]+$/; + die "invalid characters in group name\n" if $action !~ m/^${security_group_name_pattern}$/; } else { die "unknown rule type '$type'\n"; } - if ($need_iface) { - $iface = undef if $iface && $iface eq '-'; - } + while (length($line)) { + if ($line =~ s/^-i (\S+)\s*//) { + die "parameter -i not allowed\n" if !$allow_iface; + $iface = $1; + PVE::JSONSchema::pve_verify_iface($iface); + next; + } - $proto = undef if $proto && $proto eq '-'; - pve_fw_verify_protocol_spec($proto) if $proto; + last if $type eq 'group'; - $source = undef if $source && $source eq '-'; - $dest = undef if $dest && $dest eq '-'; + if ($line =~ s/^-p (\S+)\s*//) { + $proto = $1; + pve_fw_verify_protocol_spec($proto); + next; + } + if ($line =~ s/^-dport (\S+)\s*//) { + $dport = $1; + parse_port_name_number_or_range($dport); + next; + } + if ($line =~ s/^-sport (\S+)\s*//) { + $sport = $1; + parse_port_name_number_or_range($sport); + next; + } + if ($line =~ s/^-source (\S+)\s*//) { + $source = $1; + parse_address_list($source); + next; + } + if ($line =~ s/^-dest (\S+)\s*//) { + $dest = $1; + parse_address_list($dest); + next; + } - $dport = undef if $dport && $dport eq '-'; - $sport = undef if $sport && $sport eq '-'; + last; + } - parse_port_name_number_or_range($dport) if defined($dport); - parse_port_name_number_or_range($sport) if defined($sport); - - parse_address_list($source) if $source; - parse_address_list($dest) if $dest; + die "unable to parse rule parameters: $line\n" if length($line); return { type => $type, @@ -1591,7 +1839,7 @@ sub parse_vmfw_option { my $loglevels = "emerg|alert|crit|err|warning|notice|info|debug|nolog"; - if ($line =~ m/^(enable|dhcp|macfilter|nosmurfs|tcpflags|ips):\s*(0|1)\s*$/i) { + if ($line =~ m/^(enable|dhcp|macfilter|ips):\s*(0|1)\s*$/i) { $opt = lc($1); $value = int($2); } elsif ($line =~ m/^(log_level_in|log_level_out):\s*(($loglevels)\s*)?$/i) { @@ -1618,18 +1866,34 @@ sub parse_hostfw_option { my $loglevels = "emerg|alert|crit|err|warning|notice|info|debug|nolog"; - if ($line =~ m/^(enable|dhcp|nosmurfs|tcpflags|allow_bridge_route|optimize):\s*(0|1)\s*$/i) { + if ($line =~ m/^(enable|nosmurfs|tcpflags):\s*(0|1)\s*$/i) { $opt = lc($1); $value = int($2); } elsif ($line =~ m/^(log_level_in|log_level_out|tcp_flags_log_level|smurf_log_level):\s*(($loglevels)\s*)?$/i) { $opt = lc($1); $value = $2 ? lc($3) : ''; - } elsif ($line =~ m/^(policy_(in|out)):\s*(ACCEPT|DROP|REJECT)\s*$/i) { + } elsif ($line =~ m/^(nf_conntrack_max|nf_conntrack_tcp_timeout_established):\s*(\d+)\s*$/i) { $opt = lc($1); - $value = uc($3); - } elsif ($line =~ m/^(nf_conntrack_max):\s*(\d+)\s*$/i) { + $value = int($2); + } else { + chomp $line; + die "can't parse option '$line'\n" + } + + return ($opt, $value); +} + +sub parse_clusterfw_option { + my ($line) = @_; + + my ($opt, $value); + + if ($line =~ m/^(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); } else { chomp $line; die "can't parse option '$line'\n" @@ -1638,6 +1902,27 @@ sub parse_hostfw_option { return ($opt, $value); } +sub parse_clusterfw_alias { + my ($line) = @_; + + # we can add single line comments to the end of the line + my $comment = decode('utf8', $1) if $line =~ s/\s*#\s*(.*?)\s*$//; + + if ($line =~ m/^(\S+)\s(\S+)$/) { + my ($name, $cidr) = ($1, $2); + $cidr =~ s|/32$||; + pve_verify_ipv4_or_cidr($cidr); + my $data = { + name => $name, + cidr => $cidr, + }; + $data->{comment} = $comment if $comment; + return $data; + } + + return undef; +} + sub parse_vm_fw_rules { my ($filename, $fh) = @_; @@ -1645,11 +1930,7 @@ sub parse_vm_fw_rules { my $section; - my $digest = Digest::SHA->new('sha1'); - while (defined(my $line = <$fh>)) { - $digest->add($line); - next if $line =~ m/^#/; next if $line =~ m/^\s*$/; @@ -1687,8 +1968,6 @@ sub parse_vm_fw_rules { push @{$res->{$section}}, $rule; } - $res->{digest} = $digest->b64digest; - return $res; } @@ -1699,11 +1978,7 @@ sub parse_host_fw_rules { my $section; - my $digest = Digest::SHA->new('sha1'); - while (defined(my $line = <$fh>)) { - $digest->add($line); - next if $line =~ m/^#/; next if $line =~ m/^\s*$/; @@ -1737,61 +2012,97 @@ sub parse_host_fw_rules { warn "$prefix: $err"; next; } - + push @{$res->{$section}}, $rule; } - $res->{digest} = $digest->b64digest; - return $res; } -sub parse_group_fw_rules { +sub parse_cluster_fw_rules { my ($filename, $fh) = @_; my $section; my $group; - my $res = { rules => {}, ipset => {} }; - - my $digest = Digest::SHA->new('sha1'); + my $res = { + rules => [], + options => {}, + aliases => {}, + groups => {}, + group_comments => {}, + ipset => {} , + ipset_comments => {}, + }; while (defined(my $line = <$fh>)) { - $digest->add($line); - next if $line =~ m/^#/; next if $line =~ m/^\s*$/; my $linenr = $fh->input_line_number(); my $prefix = "$filename (line $linenr)"; - if ($line =~ m/^\[group\s+(\S+)\]\s*$/i) { - $section = 'rules'; - $group = lc($1); + if ($line =~ m/^\[options\]$/i) { + $section = 'options'; next; } - if ($line =~ m/^\[ipgroup\s+(\S+)\]\s*$/i) { - $section = 'ipset'; + if ($line =~ m/^\[aliases\]$/i) { + $section = 'aliases'; + next; + } + + if ($line =~ m/^\[group\s+(\S+)\]\s*(?:#\s*(.*?)\s*)?$/i) { + $section = 'groups'; $group = lc($1); - $res->{$section}->{$group}->{type} = 'hash:ip family inet hashsize 1024 maxelem 65536 '; + my $comment = $2; + $res->{$section}->{$group} = []; + $res->{group_comments}->{$group} = decode('utf8', $comment) + if $comment; + next; + } + if ($line =~ m/^\[rules\]$/i) { + $section = 'rules'; next; } - if ($line =~ m/^\[netgroup\s+(\S+)\]\s*$/i) { + + if ($line =~ m/^\[ipset\s+(\S+)\]\s*(?:#\s*(.*?)\s*)?$/i) { $section = 'ipset'; $group = lc($1); - $res->{$section}->{$group}->{type} = 'hash:net family inet hashsize 1024 maxelem 65536 '; - + my $comment = $2; + $res->{$section}->{$group} = []; + $res->{ipset_comments}->{$group} = decode('utf8', $comment) + if $comment; next; } - if (!$section || !$group) { - warn "$prefix: skip line - no section"; + if (!$section) { + warn "$prefix: skip line - no section\n"; next; } - if ($section eq 'rules') { + if ($section eq 'options') { + eval { + my ($opt, $value) = parse_clusterfw_option($line); + $res->{options}->{$opt} = $value; + }; + warn "$prefix: $@" if $@; + } elsif ($section eq 'aliases') { + eval { + my $data = parse_clusterfw_alias($line); + $res->{aliases}->{lc($data->{name})} = $data; + }; + warn "$prefix: $@" if $@; + } elsif ($section eq 'rules') { + my $rule; + eval { $rule = parse_fw_rule($line, 1, 1); }; + if (my $err = $@) { + warn "$prefix: $err"; + next; + } + push @{$res->{$section}}, $rule; + } elsif ($section eq 'groups') { my $rule; eval { $rule = parse_fw_rule($line, 0, 0); }; if (my $err = $@) { @@ -1799,21 +2110,31 @@ sub parse_group_fw_rules { next; } push @{$res->{$section}->{$group}}, $rule; - } elsif ($section eq 'ipset') { - chomp $line; - my $ip; - if (!Net::IP->new($line)) { - warn "$prefix: $line is not an valid ip address"; - next; + # we can add single line comments to the end of the rule + my $comment = decode('utf8', $1) if $line =~ s/#\s*(.*?)\s*$//; + + $line =~ m/^(\!)?\s*(\S+)\s*$/; + my $nomatch = $1; + my $cidr = $2; + + if($cidr !~ m/^${ip_alias_pattern}$/) { + $cidr =~ s|/32$||; + + eval { pve_verify_ipv4_or_cidr($cidr); }; + if (my $err = $@) { + warn "$prefix: $cidr - $err"; + next; + } } - push @{$res->{$section}->{$group}->{ip}}, $line; - } - - } + my $entry = { cidr => $cidr }; + $entry->{nomatch} = 1 if $nomatch; + $entry->{comment} = $comment if $comment; - $res->{digest} = $digest->b64digest; + push @{$res->{$section}->{$group}}, $entry; + } + } return $res; } @@ -1867,11 +2188,13 @@ sub read_local_vm_config { }; sub load_vmfw_conf { - my ($vmid) = @_; + my ($vmid, $dir) = @_; my $vmfw_conf = {}; - my $filename = "/etc/pve/firewall/$vmid.fw"; + $dir = "/etc/pve/firewall" if !defined($dir); + + my $filename = "$dir/$vmid.fw"; if (my $fh = IO::File->new($filename, O_RDONLY)) { $vmfw_conf = parse_vm_fw_rules($filename, $fh); } @@ -1879,12 +2202,123 @@ sub load_vmfw_conf { return $vmfw_conf; } +my $format_rules = sub { + my ($rules, $allow_iface) = @_; + + my $raw = ''; + + foreach my $rule (@$rules) { + if ($rule->{type} eq 'in' || $rule->{type} eq 'out' || $rule->{type} eq 'group') { + $raw .= '|' if defined($rule->{enable}) && !$rule->{enable}; + $raw .= uc($rule->{type}); + if ($rule->{macro}) { + $raw .= " $rule->{macro}($rule->{action})"; + } else { + $raw .= " " . $rule->{action}; + } + if ($allow_iface && $rule->{iface}) { + $raw .= " -i $rule->{iface}"; + } + + if ($rule->{type} ne 'group') { + $raw .= " -source $rule->{source}" if $rule->{source}; + $raw .= " -dest $rule->{dest}" if $rule->{dest}; + $raw .= " -p $rule->{proto}" if $rule->{proto}; + $raw .= " -dport $rule->{dport}" if $rule->{dport}; + $raw .= " -sport $rule->{sport}" if $rule->{sport}; + } + + $raw .= " # " . encode('utf8', $rule->{comment}) + if $rule->{comment} && $rule->{comment} !~ m/^\s*$/; + $raw .= "\n"; + } else { + die "unknown rule type '$rule->{type}'"; + } + } + + return $raw; +}; + +my $format_options = sub { + my ($options) = @_; + + my $raw = ''; + + $raw .= "[OPTIONS]\n\n"; + foreach my $opt (keys %$options) { + $raw .= "$opt: $options->{$opt}\n"; + } + $raw .= "\n"; + + return $raw; +}; + +my $format_aliases = sub { + my ($aliases) = @_; + + my $raw = ''; + + $raw .= "[ALIASES]\n\n"; + foreach my $k (keys %$aliases) { + my $e = $aliases->{$k}; + $raw .= "$e->{name} $e->{cidr}"; + $raw .= " # " . encode('utf8', $e->{comment}) + if $e->{comment} && $e->{comment} !~ m/^\s*$/; + $raw .= "\n"; + } + $raw .= "\n"; + + return $raw; +}; + +my $format_ipset = sub { + my ($options) = @_; + + my $raw = ''; + + my $nethash = {}; + foreach my $entry (@$options) { + $nethash->{$entry->{cidr}} = $entry; + } + + foreach my $cidr (sort keys %$nethash) { + my $entry = $nethash->{$cidr}; + my $line = $entry->{nomatch} ? '!' : ''; + $line .= $entry->{cidr}; + $line .= " # " . encode('utf8', $entry->{comment}) + if $entry->{comment} && $entry->{comment} !~ m/^\s*$/; + $raw .= "$line\n"; + } + + return $raw; +}; + +sub save_vmfw_conf { + my ($vmid, $vmfw_conf) = @_; + + my $raw = ''; + + my $options = $vmfw_conf->{options}; + $raw .= &$format_options($options) if scalar(keys %$options); + + my $rules = $vmfw_conf->{rules} || []; + if (scalar(@$rules)) { + $raw .= "[RULES]\n\n"; + $raw .= &$format_rules($rules, 1); + $raw .= "\n"; + } + + my $filename = "/etc/pve/firewall/$vmid.fw"; + PVE::Tools::file_set_contents($filename, $raw); +} + sub read_vm_firewall_configs { - my ($vmdata) = @_; + my ($vmdata, $dir) = @_; + my $vmfw_configs = {}; foreach my $vmid (keys %{$vmdata->{qemu}}, keys %{$vmdata->{openvz}}) { - my $vmfw_conf = load_vmfw_conf($vmid); + my $vmfw_conf = load_vmfw_conf($vmid, $dir); next if !$vmfw_conf->{options}; # skip if file does not exists $vmfw_configs->{$vmid} = $vmfw_conf; } @@ -1911,11 +2345,12 @@ sub get_option_log_level { sub generate_std_chains { my ($ruleset, $options) = @_; - + my $loglevel = get_option_log_level($options, 'smurf_log_level'); # same as shorewall smurflog. my $chain = 'PVEFW-smurflog'; + $pve_std_chains->{$chain} = []; push @{$pve_std_chains->{$chain}}, get_log_rule_base($chain, 0, "DROP: ", $loglevel) if $loglevel; push @{$pve_std_chains->{$chain}}, "-j DROP"; @@ -1923,6 +2358,8 @@ sub generate_std_chains { # same as shorewall logflags action. $loglevel = get_option_log_level($options, 'tcp_flags_log_level'); $chain = 'PVEFW-logflags'; + $pve_std_chains->{$chain} = []; + # fixme: is this correctly logged by pvewf-logger? (ther is no --log-ip-options for NFLOG) push @{$pve_std_chains->{$chain}}, get_log_rule_base($chain, 0, "DROP: ", $loglevel) if $loglevel; push @{$pve_std_chains->{$chain}}, "-j DROP"; @@ -1940,140 +2377,182 @@ sub generate_std_chains { } sub generate_ipset_chains { - my ($ipset_ruleset, $options) = @_; + my ($ipset_ruleset, $fw_conf) = @_; - foreach my $ipset (keys %{$options->{ipset}}) { - generate_ipset($ipset_ruleset, $ipset, $options->{ipset}->{$ipset}); + foreach my $ipset (keys %{$fw_conf->{ipset}}) { + generate_ipset($ipset_ruleset, "PVEFW-$ipset", $fw_conf->{ipset}->{$ipset}, $fw_conf->{aliases}); } } sub generate_ipset { - my ($ipset_ruleset, $name, $options) = @_; - - push @{$ipset_ruleset->{$name}}, "create $name $options->{type}"; + my ($ipset_ruleset, $name, $options, $aliases) = @_; - foreach my $ip (@{$options->{ip}}) { - push @{$ipset_ruleset->{$name}}, "add $name $ip"; + my $hashsize = scalar(@$options); + if ($hashsize <= 64) { + $hashsize = 64; + } else { + $hashsize = round_powerof2($hashsize); } -} - -sub save_pvefw_status { - my ($status) = @_; - die "unknown status '$status' - internal error" - if $status !~ m/^(stopped|active)$/; + push @{$ipset_ruleset->{$name}}, "create $name hash:net family inet hashsize $hashsize maxelem $hashsize"; - mkdir dirname($pve_fw_status_filename); - PVE::Tools::file_set_contents($pve_fw_status_filename, $status); -} - -sub read_pvefw_status { - - my $status = 'unknown'; - - return 'stopped' if ! -f $pve_fw_status_filename; + # remove duplicates + my $nethash = {}; + foreach my $entry (@$options) { + my $cidr = $entry->{cidr}; + if ($cidr =~ m/^${ip_alias_pattern}$/) { + my $alias = lc($cidr); + if ($aliases->{$alias}) { + $entry->{cidr} = $aliases->{$alias}->{cidr}; + $nethash->{$entry->{cidr}} = $entry; + } else { + warn "no such alias '$cidr'\n" if !$aliases->{$alias}; + } + } else { + $nethash->{$entry->{cidr}} = $entry; + } + } - eval { - $status = PVE::Tools::file_get_contents($pve_fw_status_filename); - }; - warn $@ if $@; + foreach my $cidr (sort keys %$nethash) { + my $entry = $nethash->{$cidr}; - return $status; + my $cmd = "add $name $cidr"; + if ($entry->{nomatch}) { + if ($feature_ipset_nomatch) { + push @{$ipset_ruleset->{$name}}, "$cmd nomatch"; + } else { + warn "ignore !$cidr - nomatch not supported by kernel\n"; + } + } else { + push @{$ipset_ruleset->{$name}}, $cmd; + } + } } -# fixme: move to pve-common PVE::ProcFSTools -sub read_proc_net_route { - my $filename = "/proc/net/route"; +sub round_powerof2 { + my ($int) = @_; - my $res = {}; + $int--; + $int |= $int >> $_ foreach (1,2,4,8,16); + return ++$int; +} - my $fh = IO::File->new ($filename, "r"); - return $res if !$fh; +sub load_clusterfw_conf { + my ($filename) = @_; - my $int_to_quad = sub { - return join '.' => map { ($_[0] >> 8*(3-$_)) % 256 } (3, 2, 1, 0); - }; + $filename = $clusterfw_conf_filename if !defined($filename); - while (defined(my $line = <$fh>)) { - next if $line =~/^Iface\s+Destination/; # skip head - my ($iface, $dest, $gateway, $metric, $mask, $mtu) = (split(/\s+/, $line))[0,1,2,6,7,8]; - push @{$res->{$iface}}, { - dest => &$int_to_quad(hex($dest)), - gateway => &$int_to_quad(hex($gateway)), - mask => &$int_to_quad(hex($mask)), - metric => $metric, - mtu => $mtu, - }; + my $cluster_conf = {}; + if (my $fh = IO::File->new($filename, O_RDONLY)) { + $cluster_conf = parse_cluster_fw_rules($filename, $fh); } - return $res; + return $cluster_conf; } -sub load_security_groups { +sub save_clusterfw_conf { + my ($cluster_conf) = @_; - my $groups_conf = {}; - my $filename = "/etc/pve/firewall/groups.fw"; - if (my $fh = IO::File->new($filename, O_RDONLY)) { - $groups_conf = parse_group_fw_rules($filename, $fh); - } + my $raw = ''; - return ($groups_conf); -} + my $options = $cluster_conf->{options}; + $raw .= &$format_options($options) if scalar(keys %$options); -sub save_security_groups { - my ($groups_conf) = @_; + my $aliases = $cluster_conf->{aliases}; + $raw .= &$format_aliases($aliases) if scalar(keys %$aliases); - my $raw = ''; - my $filename = "/etc/pve/firewall/groups.fw"; + foreach my $ipset (sort keys %{$cluster_conf->{ipset}}) { + if (my $comment = $cluster_conf->{ipset_comments}->{$ipset}) { + my $utf8comment = encode('utf8', $comment); + $raw .= "[IPSET $ipset] # $utf8comment\n\n"; + } else { + $raw .= "[IPSET $ipset]\n\n"; + } + my $options = $cluster_conf->{ipset}->{$ipset}; + $raw .= &$format_ipset($options); + $raw .= "\n"; + } - foreach my $group (sort keys %{$groups_conf->{rules}}) { - my $rules = $groups_conf->{rules}->{$group}; - $raw .= "[group $group]\n\n"; + my $rules = $cluster_conf->{rules}; + if (scalar(@$rules)) { + $raw .= "[RULES]\n\n"; + $raw .= &$format_rules($rules, 1); + $raw .= "\n"; + } - foreach my $rule (@$rules) { - if ($rule->{type} eq 'in' || $rule->{type} eq 'out') { - $raw .= '|' if defined($rule->{enable}) && !$rule->{enable}; - $raw .= uc($rule->{type}); - $raw .= " " . $rule->{action}; - $raw .= " " . ($rule->{source} || '-'); - $raw .= " " . ($rule->{dest} || '-'); - $raw .= " " . ($rule->{proto} || '-'); - $raw .= " " . ($rule->{dport} || '-'); - $raw .= " " . ($rule->{sport} || '-'); - $raw .= " # " . encode('utf8', $rule->{comment}) - if $rule->{comment} && $rule->{comment} !~ m/^\s*$/; - $raw .= "\n"; - } else { - die "implement me '$rule->{type}'"; - } + foreach my $group (sort keys %{$cluster_conf->{groups}}) { + my $rules = $cluster_conf->{groups}->{$group}; + if (my $comment = $cluster_conf->{group_comments}->{$group}) { + my $utf8comment = encode('utf8', $comment); + $raw .= "[group $group] # $utf8comment\n\n"; + } else { + $raw .= "[group $group]\n\n"; } + $raw .= &$format_rules($rules, 0); $raw .= "\n"; } - PVE::Tools::file_set_contents($filename, $raw); + PVE::Tools::file_set_contents($clusterfw_conf_filename, $raw); } sub load_hostfw_conf { + my ($filename) = @_; + + $filename = $hostfw_conf_filename if !defined($filename); my $hostfw_conf = {}; - my $filename = "/etc/pve/local/host.fw"; if (my $fh = IO::File->new($filename, O_RDONLY)) { $hostfw_conf = parse_host_fw_rules($filename, $fh); } return $hostfw_conf; } +sub save_hostfw_conf { + my ($hostfw_conf) = @_; + + my $raw = ''; + + my $options = $hostfw_conf->{options}; + $raw .= &$format_options($options) if scalar(keys %$options); + + my $rules = $hostfw_conf->{rules}; + if (scalar(@$rules)) { + $raw .= "[RULES]\n\n"; + $raw .= &$format_rules($rules, 1); + $raw .= "\n"; + } + + PVE::Tools::file_set_contents($hostfw_conf_filename, $raw); +} + sub compile { - my $vmdata = read_local_vm_config(); - my $vmfw_configs = read_vm_firewall_configs($vmdata); + my ($cluster_conf, $hostfw_conf, $vmdata) = @_; - my $routing_table = read_proc_net_route(); + my $vmfw_configs; - my $groups_conf = load_security_groups(); + if ($vmdata) { # test mode + my $testdir = $vmdata->{testdir} || die "no test directory specified"; + my $filename = "$testdir/cluster.fw"; + die "missing test file '$filename'\n" if ! -f $filename; + $cluster_conf = load_clusterfw_conf($filename); + + $filename = "$testdir/host.fw"; + die "missing test file '$filename'\n" if ! -f $filename; + $hostfw_conf = load_hostfw_conf($filename); + + $vmfw_configs = read_vm_firewall_configs($vmdata, $testdir); + } else { # normal operation + $cluster_conf = load_clusterfw_conf() if !$cluster_conf; + + $hostfw_conf = load_hostfw_conf() if !$hostfw_conf; + + $vmdata = read_local_vm_config(); + $vmfw_configs = read_vm_firewall_configs($vmdata); + } - my $ipset_ruleset = {}; - generate_ipset_chains($ipset_ruleset, $groups_conf); + + $cluster_conf->{ipset}->{venet0} = []; my $ruleset = {}; @@ -2082,14 +2561,37 @@ sub compile { ruleset_create_chain($ruleset, "PVEFW-FORWARD"); - my $hostfw_conf = load_hostfw_conf(); my $hostfw_options = $hostfw_conf->{options} || {}; + # fixme: what log level should we use here? + my $loglevel = get_option_log_level($hostfw_options, "log_level_out"); + + ruleset_chain_add_conn_filters($ruleset, "PVEFW-FORWARD", "ACCEPT"); + + ruleset_create_chain($ruleset, "PVEFW-VENET-OUT"); + ruleset_addrule($ruleset, "PVEFW-FORWARD", "-i venet0 -m set --match-set PVEFW-venet0 src -j PVEFW-VENET-OUT"); + ruleset_addrule($ruleset, "PVEFW-INPUT", "-i venet0 -m set --match-set PVEFW-venet0 src -j PVEFW-VENET-OUT"); + + ruleset_create_chain($ruleset, "PVEFW-FWBR-IN"); + ruleset_chain_add_input_filters($ruleset, "PVEFW-FWBR-IN", $hostfw_options, $cluster_conf, $loglevel); + + 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_create_chain($ruleset, "PVEFW-VENET-IN"); + ruleset_chain_add_input_filters($ruleset, "PVEFW-VENET-IN", $hostfw_options, $cluster_conf, $loglevel); + + ruleset_addrule($ruleset, "PVEFW-FORWARD", "-o venet0 -m set --match-set PVEFW-venet0 dst -j PVEFW-VENET-IN"); + generate_std_chains($ruleset, $hostfw_options); my $hostfw_enable = !(defined($hostfw_options->{enable}) && ($hostfw_options->{enable} == 0)); - enable_host_firewall($ruleset, $hostfw_conf, $groups_conf) if $hostfw_enable; + enable_host_firewall($ruleset, $hostfw_conf, $cluster_conf) if $hostfw_enable; + + ruleset_addrule($ruleset, "PVEFW-OUTPUT", "-o venet0 -m set --match-set PVEFW-venet0 dst -j PVEFW-VENET-IN"); # generate firewall rules for QEMU VMs foreach my $vmid (keys %{$vmdata->{qemu}}) { @@ -2101,21 +2603,14 @@ sub compile { foreach my $netid (keys %$conf) { next if $netid !~ m/^net(\d+)$/; my $net = PVE::QemuServer::parse_net($conf->{$netid}); - next if !$net; + next if !$net->{firewall}; my $iface = "tap${vmid}i$1"; - my $bridge = $net->{bridge}; - next if !$bridge; # fixme: ? - - $bridge .= "v$net->{tag}" if $net->{tag}; - - generate_bridge_chains($ruleset, $hostfw_conf, $bridge, $routing_table); - my $macaddr = $net->{macaddr}; - generate_tap_rules_direction($ruleset, $groups_conf, $iface, $netid, $macaddr, - $vmfw_conf, $vmid, $bridge, 'IN'); - generate_tap_rules_direction($ruleset, $groups_conf, $iface, $netid, $macaddr, - $vmfw_conf, $vmid, $bridge, 'OUT'); + generate_tap_rules_direction($ruleset, $cluster_conf, $hostfw_conf, $iface, $netid, $macaddr, + $vmfw_conf, $vmid, 'IN'); + generate_tap_rules_direction($ruleset, $cluster_conf, $hostfw_conf, $iface, $netid, $macaddr, + $vmfw_conf, $vmid, 'OUT'); } } @@ -2129,72 +2624,54 @@ sub compile { if ($conf->{ip_address} && $conf->{ip_address}->{value}) { my $ip = $conf->{ip_address}->{value}; - generate_venet_rules_direction($ruleset, $groups_conf, $vmfw_conf, $vmid, $ip, 'IN'); - generate_venet_rules_direction($ruleset, $groups_conf, $vmfw_conf, $vmid, $ip, 'OUT'); + $ip =~ s/\s+/,/g; + parse_address_list($ip); # make sure we have a valid $ip list + + my @ips = split(',', $ip); + + foreach my $singleip (@ips) { + my $venet0ipset = {}; + $venet0ipset->{cidr} = $singleip; + push @{$cluster_conf->{ipset}->{venet0}}, $venet0ipset; + } + + generate_venet_rules_direction($ruleset, $cluster_conf, $hostfw_conf, $vmfw_conf, $vmid, $ip, 'IN'); + generate_venet_rules_direction($ruleset, $cluster_conf, $hostfw_conf, $vmfw_conf, $vmid, $ip, 'OUT'); } if ($conf->{netif} && $conf->{netif}->{value}) { my $netif = PVE::OpenVZ::parse_netif($conf->{netif}->{value}); foreach my $netid (keys %$netif) { my $d = $netif->{$netid}; - my $bridge = $d->{bridge}; - if (!$bridge) { - warn "no bridge device for CT $vmid iface '$netid'\n"; - next; # fixme? - } - - generate_bridge_chains($ruleset, $hostfw_conf, $bridge, $routing_table); my $macaddr = $d->{mac}; my $iface = $d->{host_ifname}; - generate_tap_rules_direction($ruleset, $groups_conf, $iface, $netid, $macaddr, - $vmfw_conf, $vmid, $bridge, 'IN'); - generate_tap_rules_direction($ruleset, $groups_conf, $iface, $netid, $macaddr, - $vmfw_conf, $vmid, $bridge, 'OUT'); + generate_tap_rules_direction($ruleset, $cluster_conf, $hostfw_conf, $iface, $netid, $macaddr, + $vmfw_conf, $vmid, 'IN'); + generate_tap_rules_direction($ruleset, $cluster_conf, $hostfw_conf, $iface, $netid, $macaddr, + $vmfw_conf, $vmid, 'OUT'); } } } - if($hostfw_options->{optimize}){ - - my $accept = ruleset_chain_exist($ruleset, "PVEFW-IPS") ? "PVEFW-IPS" : "ACCEPT"; - ruleset_insertrule($ruleset, "PVEFW-FORWARD", "-m conntrack --ctstate RELATED,ESTABLISHED -j $accept"); - ruleset_insertrule($ruleset, "PVEFW-FORWARD", "-m conntrack --ctstate INVALID -j DROP"); + if(ruleset_chain_exist($ruleset, "PVEFW-IPS")){ + ruleset_insertrule($ruleset, "PVEFW-FORWARD", "-m conntrack --ctstate RELATED,ESTABLISHED -j PVEFW-IPS"); } - # fixme: what log level should we use here? - my $loglevel = get_option_log_level($hostfw_options, "log_level_out"); - - # fixme: should we really block inter-bridge traffic? - - # always allow traffic from containers? - ruleset_addrule($ruleset, "PVEFW-FORWARD", "-i venet0 -j RETURN"); - - # disable interbridge routing - ruleset_addrule($ruleset, "PVEFW-FORWARD", "-o vmbr+ -j PVEFW-Drop"); - ruleset_addrule($ruleset, "PVEFW-FORWARD", "-i vmbr+ -j PVEFW-Drop"); - ruleset_addlog($ruleset, "PVEFW-FORWARD", 0, "DROP: ", $loglevel, "-o vmbr+"); - ruleset_addlog($ruleset, "PVEFW-FORWARD", 0, "DROP: ", $loglevel, "-i vmbr+"); - ruleset_addrule($ruleset, "PVEFW-FORWARD", "-o vmbr+ -j DROP"); - ruleset_addrule($ruleset, "PVEFW-FORWARD", "-i vmbr+ -j DROP"); + my $ipset_ruleset = {}; + generate_ipset_chains($ipset_ruleset, $cluster_conf); - return wantarray ? ($ruleset, $hostfw_conf, $ipset_ruleset) : $ruleset; + return ($ruleset, $ipset_ruleset); } sub get_ruleset_status { - my ($ruleset, $verbose, $ipset) = @_; - - my $active_chains = undef; - if($ipset){ - $active_chains = ipset_get_chains(); - }else{ - $active_chains = iptables_get_chains(); - } + my ($ruleset, $active_chains, $digest_fn, $verbose) = @_; my $statushash = {}; foreach my $chain (sort keys %$ruleset) { - my $sig = ipset_chain_digest($ruleset->{$chain}); + my $sig = &$digest_fn($ruleset->{$chain}); + $statushash->{$chain}->{sig} = $sig; my $oldsig = $active_chains->{$chain}; @@ -2221,7 +2698,7 @@ sub get_ruleset_status { print "delete $chain ($sig)\n" if $verbose; } } - + return $statushash; } @@ -2232,12 +2709,13 @@ sub print_sig_rule { return "-A $chain -m comment --comment \"PVESIG:$sig\"\n"; } -sub get_rulset_cmdlist { +sub get_ruleset_cmdlist { my ($ruleset, $verbose) = @_; my $cmdlist = "*filter\n"; # we pass this to iptables-restore; - my $statushash = get_ruleset_status($ruleset, $verbose); + my ($active_chains, $hooks) = iptables_get_chains(); + my $statushash = get_ruleset_status($ruleset, $active_chains, \&iptables_chain_digest, $verbose); # create missing chains first foreach my $chain (sort keys %$ruleset) { @@ -2248,18 +2726,10 @@ sub get_rulset_cmdlist { $cmdlist .= ":$chain - [0:0]\n"; } - my $rule = "INPUT -j PVEFW-INPUT"; - if (!PVE::Firewall::iptables_rule_exist($rule)) { - $cmdlist .= "-A $rule\n"; - } - $rule = "OUTPUT -j PVEFW-OUTPUT"; - if (!PVE::Firewall::iptables_rule_exist($rule)) { - $cmdlist .= "-A $rule\n"; - } - - $rule = "FORWARD -j PVEFW-FORWARD"; - if (!PVE::Firewall::iptables_rule_exist($rule)) { - $cmdlist .= "-A $rule\n"; + foreach my $h (qw(INPUT OUTPUT FORWARD)) { + if (!$hooks->{$h}) { + $cmdlist .= "-A $h -j PVEFW-$h\n"; + } } foreach my $chain (sort keys %$ruleset) { @@ -2294,7 +2764,7 @@ sub get_rulset_cmdlist { } my $changes = $cmdlist ne "*filter\n" ? 1 : 0; - + $cmdlist .= "COMMIT\n"; return wantarray ? ($cmdlist, $changes) : $cmdlist; @@ -2305,7 +2775,17 @@ sub get_ipset_cmdlist { my $cmdlist = ""; - my $statushash = get_ruleset_status($ruleset, $verbose, 1); + my $delete_cmdlist = ""; + + my $active_chains = ipset_get_chains(); + my $statushash = get_ruleset_status($ruleset, $active_chains, \&ipset_chain_digest, $verbose); + + # remove stale _swap chains + foreach my $chain (keys %$active_chains) { + if ($chain =~ m/^PVEFW-\S+_swap$/) { + $cmdlist .= "destroy $chain\n"; + } + } foreach my $chain (sort keys %$ruleset) { my $stat = $statushash->{$chain}; @@ -2315,7 +2795,7 @@ sub get_ipset_cmdlist { foreach my $cmd (@{$ruleset->{$chain}}) { $cmdlist .= "$cmd\n"; } - } + } if ($stat->{action} eq 'update') { my $chain_swap = $chain."_swap"; @@ -2323,25 +2803,24 @@ sub get_ipset_cmdlist { foreach my $cmd (@{$ruleset->{$chain}}) { $cmd =~ s/$chain/$chain_swap/; $cmdlist .= "$cmd\n"; - } $cmdlist .= "swap $chain_swap $chain\n"; $cmdlist .= "flush $chain_swap\n"; $cmdlist .= "destroy $chain_swap\n"; - } + } } foreach my $chain (keys %$statushash) { next if $statushash->{$chain}->{action} ne 'delete'; - $cmdlist .= "flush $chain\n"; - $cmdlist .= "destroy $chain\n"; + $delete_cmdlist .= "flush $chain\n"; + $delete_cmdlist .= "destroy $chain\n"; } - my $changes = $cmdlist ? 1 : 0; + my $changes = ($cmdlist || $delete_cmdlist) ? 1 : 0; - return wantarray ? ($cmdlist, $changes) : $cmdlist; + return ($cmdlist, $delete_cmdlist, $changes); } sub apply_ruleset { @@ -2349,22 +2828,33 @@ sub apply_ruleset { enable_bridge_firewall(); - update_nf_conntrack_max($hostfw_conf); - - my $ipsetcmdlist = get_ipset_cmdlist($ipset_ruleset, $verbose); + my ($ipset_create_cmdlist, $ipset_delete_cmdlist, $ipset_changes) = + get_ipset_cmdlist($ipset_ruleset, undef, $verbose); - my $cmdlist = get_rulset_cmdlist($ruleset, $verbose); + my ($cmdlist, $changes) = get_ruleset_cmdlist($ruleset, $verbose); - print $ipsetcmdlist if $verbose; + if ($verbose) { + if ($ipset_changes) { + print "ipset changes:\n"; + print $ipset_create_cmdlist if $ipset_create_cmdlist; + print $ipset_delete_cmdlist if $ipset_delete_cmdlist; + } - print $cmdlist if $verbose; + if ($changes) { + print "iptables changes:\n"; + print $cmdlist; + } + } - ipset_restore_cmdlist($ipsetcmdlist); + ipset_restore_cmdlist($ipset_create_cmdlist); iptables_restore_cmdlist($cmdlist); + ipset_restore_cmdlist($ipset_delete_cmdlist) if $ipset_delete_cmdlist; + # test: re-read status and check if everything is up to date - my $statushash = get_ruleset_status($ruleset); + my $active_chains = iptables_get_chains(); + my $statushash = get_ruleset_status($ruleset, $active_chains, \&iptables_chain_digest, 0); my $errors; foreach my $chain (sort keys %$ruleset) { @@ -2376,6 +2866,11 @@ sub apply_ruleset { } die "unable to apply firewall changes\n" if $errors; + + update_nf_conntrack_max($hostfw_conf); + + update_nf_conntrack_tcp_timeout_established($hostfw_conf); + } sub update_nf_conntrack_max { @@ -2402,22 +2897,62 @@ sub update_nf_conntrack_max { } } +sub update_nf_conntrack_tcp_timeout_established { + my ($hostfw_conf) = @_; + + my $options = $hostfw_conf->{options} || {}; + + my $value = defined($options->{nf_conntrack_tcp_timeout_established}) ? $options->{nf_conntrack_tcp_timeout_established} : 432000; + + PVE::ProcFSTools::write_proc_entry("/proc/sys/net/netfilter/nf_conntrack_tcp_timeout_established", $value); +} + +sub remove_pvefw_chains { + + my ($chash, $hooks) = iptables_get_chains(); + my $cmdlist = "*filter\n"; + + foreach my $h (qw(INPUT OUTPUT FORWARD)) { + if ($hooks->{$h}) { + $cmdlist .= "-D $h -j PVEFW-$h\n"; + } + } + + foreach my $chain (keys %$chash) { + $cmdlist .= "-F $chain\n"; + } + + foreach my $chain (keys %$chash) { + $cmdlist .= "-X $chain\n"; + } + $cmdlist .= "COMMIT\n"; + + iptables_restore_cmdlist($cmdlist); +} + sub update { - my ($start, $verbose) = @_; + my ($verbose) = @_; my $code = sub { - my $status = read_pvefw_status(); - my ($ruleset, $hostfw_conf, $ipset_ruleset) = compile(); + my $cluster_conf = load_clusterfw_conf(); + my $cluster_options = $cluster_conf->{options}; - if ($start || $status eq 'active') { + my $enable = $cluster_options->{enable}; - save_pvefw_status('active') if ($status ne 'active'); + die "Firewall is disabled - cannot start\n" if !$enable; - apply_ruleset($ruleset, $hostfw_conf, $ipset_ruleset, $verbose); - } else { - print "Firewall not active (status = $status)\n" if $verbose; + if (!$enable) { + PVE::Firewall::remove_pvefw_chains(); + print "Firewall disabled\n" if $verbose; + return; } + + my $hostfw_conf = load_hostfw_conf(); + + my ($ruleset, $ipset_ruleset) = compile($cluster_conf, $hostfw_conf); + + apply_ruleset($ruleset, $hostfw_conf, $ipset_ruleset, $verbose); }; run_locked($code);