X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=blobdiff_plain;f=src%2FPVE%2FFirewall.pm;h=76684f9676ddc5a49bfcd3ab61b4725d72e8bf75;hp=7ef38fa514be9b0c35cf2ba3425845ef95472649;hb=d31689ee39ce7365231f02301ec8770dfc633eb8;hpb=92e1209bfb984c18735dbc73ac929fb0a9832b52 diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm index 7ef38fa..76684f9 100644 --- a/src/PVE/Firewall.pm +++ b/src/PVE/Firewall.pm @@ -15,11 +15,12 @@ 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; my $hostfw_conf_filename = "/etc/pve/local/host.fw"; -my $clusterfw_conf_filename = "/etc/pve/firewall/cluster.fw"; +my $pvefw_conf_dir = "/etc/pve/firewall"; +my $clusterfw_conf_filename = "$pvefw_conf_dir/cluster.fw"; # dynamically include PVE::QemuServer and PVE::OpenVZ # to avoid dependency problems @@ -35,12 +36,35 @@ eval { $have_pve_manager = 1; }; +my $security_group_name_pattern = '[A-Za-z][A-Za-z0-9\-\_]+'; +my $ipset_name_pattern = '[A-Za-z][A-Za-z0-9\-\_]+'; +my $ip_alias_pattern = '[A-Za-z][A-Za-z0-9\-\_]+'; + +my $max_alias_name_length = 64; +my $max_ipset_name_length = 64; +my $max_group_name_length = 20; + 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 $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_format('IPv4orCIDRorAlias', \&pve_verify_ipv4_or_cidr_or_alias); +sub pve_verify_ipv4_or_cidr_or_alias { + my ($cidr, $noerr) = @_; + + return if $cidr =~ m/^(?:$ip_alias_pattern)$/; + + if ($cidr =~ m!^(?:$IPV4RE)(/(\d+))?$!) { + return $cidr if Net::IP->new($cidr); return undef if $noerr; die Net::IP::Error() . "\n"; } @@ -51,26 +75,32 @@ sub pve_verify_ipv4_or_cidr { PVE::JSONSchema::register_standard_option('ipset-name', { description => "IP set name.", type => 'string', - pattern => '[A-Za-z][A-Za-z0-9\-\_]+', + pattern => $ipset_name_pattern, + minLength => 2, + maxLength => $max_ipset_name_length, +}); + +PVE::JSONSchema::register_standard_option('pve-fw-alias', { + description => "Alias name.", + type => 'string', + pattern => $ip_alias_pattern, minLength => 2, - maxLength => 20, + maxLength => $max_alias_name_length, }); PVE::JSONSchema::register_standard_option('pve-fw-loglevel' => { description => "Log level.", - type => 'string', + type => 'string', enum => ['emerg', 'alert', 'crit', 'err', 'warning', 'notice', 'info', 'debug', 'nolog'], optional => 1, }); -my $security_group_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_pattern, + pattern => $security_group_name_pattern, minLength => 2, - maxLength => 20, + maxLength => $max_group_name_length, }); my $feature_ipset_nomatch = 0; @@ -89,9 +119,8 @@ 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'; +my $default_log_level = 'nolog'; # avoid logs by default my $log_level_hash = { debug => 7, @@ -149,9 +178,8 @@ my $pve_fw_macros = { { action => 'PARAM', proto => 'tcp', dport => '6277' }, ], 'DHCPfwd' => [ - "Forwarded DHCP traffic (bidirectional)", + "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)", @@ -178,9 +206,8 @@ my $pve_fw_macros = { { action => 'PARAM', proto => 'udp', dport => '1080' }, ], 'GRE' => [ - "Generic Routing Encapsulation tunneling protocol (bidirectional)", + "Generic Routing Encapsulation tunneling protocol", { action => 'PARAM', proto => '47' }, - { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => '47' }, ], 'Git' => [ "Git distributed revision control traffic", @@ -215,32 +242,24 @@ my $pve_fw_macros = { { action => 'PARAM', proto => 'tcp', dport => '993' }, ], 'IPIP' => [ - "IPIP capsulation traffic (bidirectional)", + "IPIP capsulation traffic", { action => 'PARAM', proto => '94' }, - { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => '94' }, ], 'IPsec' => [ - "IPsec traffic (bidirectional)", + "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 (bidirectional)", + "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 (bidirectional)", + "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", @@ -253,7 +272,6 @@ my $pve_fw_macros = { '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", @@ -297,11 +315,6 @@ my $pve_fw_macros = { "Network Time Protocol (ntpd)", { action => 'PARAM', proto => 'udp', dport => '123' }, ], - 'NTPbi' => [ - "Bi-directional NTP (for NTP peers)", - { action => 'PARAM', proto => 'udp', dport => '123' }, - { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '123' }, - ], 'OSPF' => [ "OSPF multicast traffic", { action => 'PARAM', proto => '89' }, @@ -326,7 +339,6 @@ my $pve_fw_macros = { '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' => [ @@ -345,10 +357,9 @@ my $pve_fw_macros = { "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", @@ -377,17 +388,6 @@ my $pve_fw_macros = { { action => 'PARAM', proto => 'udp', dport => '1024:65535', sport => '137' }, { action => 'PARAM', proto => 'tcp', dport => '135,139,445' }, ], - 'SMBBI' => [ - "Microsoft SMB traffic (bidirectional)", - { 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' }, @@ -459,8 +459,8 @@ my $pve_fw_macros = { { action => 'PARAM', proto => 'icmp', dport => 'echo-request' }, ], 'VNC' => [ - "VNC traffic for VNC display's 0 - 9", - { action => 'PARAM', proto => 'tcp', dport => '5900:5909' }, + "VNC traffic for VNC display's 0 - 99", + { action => 'PARAM', proto => 'tcp', dport => '5900:5999' }, ], 'VNCL' => [ "VNC traffic from Vncservers to Vncviewers in listen mode", @@ -489,7 +489,8 @@ my $pve_fw_parsed_macros; my $pve_fw_macro_descr; my $pve_fw_preferred_macro_names = {}; -my $pve_std_chains = { +my $pve_std_chains = {}; +$pve_std_chains->{4} = { 'PVEFW-SET-ACCEPT-MARK' => [ "-j MARK --set-mark 1", ], @@ -708,14 +709,101 @@ sub get_etc_protocols { return $etc_protocols; } +my $ipv4_mask_hash_localnet = { + '255.255.0.0' => 16, + '255.255.128.0' => 17, + '255.255.192.0' => 18, + '255.255.224.0' => 19, + '255.255.240.0' => 20, + '255.255.248.0' => 21, + '255.255.252.0' => 22, + '255.255.254.0' => 23, + '255.255.255.0' => 24, + '255.255.255.128' => 25, + '255.255.255.192' => 26, + '255.255.255.224' => 27, + '255.255.255.240' => 28, + '255.255.255.248' => 29, + '255.255.255.252' => 30, +}; + +my $__local_network; + +sub local_network { + my ($new_value) = @_; + + $__local_network = $new_value if defined($new_value); + + return $__local_network if defined($__local_network); + + eval { + my $nodename = PVE::INotify::nodename(); + + my $ip = PVE::Cluster::remote_node_ip($nodename); + + my $testip = Net::IP->new($ip); + + my $routes = PVE::ProcFSTools::read_proc_net_route(); + foreach my $entry (@$routes) { + my $mask = $ipv4_mask_hash_localnet->{$entry->{mask}}; + next if !defined($mask); + return if $mask eq '0.0.0.0'; + my $cidr = "$entry->{dest}/$mask"; + my $testnet = Net::IP->new($cidr); + if ($testnet->overlaps($testip)) { + $__local_network = $cidr; + return; + } + } + }; + warn $@ if $@; + + return $__local_network; +} + +# ipset names are limited to 31 characters, and we use '_swap' +# suffix for atomic update, for example PVEFW-${VMID}-${ipset_name}_swap + +my $max_iptables_ipset_name_length = 31 - length("_swap"); + +sub compute_ipset_chain_name { + my ($vmid, $ipset_name) = @_; + + $vmid = 0 if !defined($vmid); + + my $id = "$vmid-${ipset_name}"; + + + if ((length($id) + 6) > $max_iptables_ipset_name_length) { + $id = PVE::Tools::fnv31a_hex($id); + } + + return "PVEFW-$id"; +} + +sub compute_ipfilter_ipset_name { + my ($iface) = @_; + + return "ipfilter-$iface"; +} + sub parse_address_list { my ($str) = @_; - return if $str =~ m/^(\+)(\S+)$/; # ipset ref - return if $str =~ m/^${security_group_pattern}$/; # aliases + if ($str =~ m/^(\+)(\S+)$/) { # ipset ref + die "ipset name too long\n" if length($str) > ($max_ipset_name_length + 1); + return; + } + + if ($str =~ m/^${ip_alias_pattern}$/) { + die "alias name too long\n" if length($str) > $max_alias_name_length; + return; + } my $count = 0; my $iprange = 0; + my $ipversion = undef; + foreach my $elem (split(/,/, $str)) { $count++; if (!Net::IP->new($elem)) { @@ -723,9 +811,11 @@ sub parse_address_list { die "invalid IP address: $err\n"; } $iprange = 1 if $elem =~ m/-/; + $ipversion = Net::IP::ip_get_version($elem); #fixme : don't work with range } - + die "you can use a range in a list\n" if $iprange && $count > 1; + return $ipversion; } sub parse_port_name_number_or_range { @@ -748,7 +838,7 @@ sub parse_port_name_number_or_range { if ($icmp_type_names->{$item}) { $icmp_port = 1; } else { - die "invalid port '$item'\n" if !$services->{byname}->{$item}; + die "invalid port '$item'\n" if !$services->{byname}->{$item}; } } } @@ -767,8 +857,8 @@ sub pve_fw_verify_port_spec { return $portstr; } -PVE::JSONSchema::register_format('pve-fw-v4addr-spec', \&pve_fw_verify_v4addr_spec); -sub pve_fw_verify_v4addr_spec { +PVE::JSONSchema::register_format('pve-fw-addr-spec', \&pve_fw_verify_addr_spec); +sub pve_fw_verify_addr_spec { my ($list) = @_; parse_address_list($list); @@ -805,7 +895,7 @@ sub copy_opject_with_digest { $sha->add($k, ':', $v, "\n"); } - my $digest = $sha->b64digest; + my $digest = $sha->hexdigest; $res->{digest} = $digest; @@ -824,12 +914,13 @@ sub copy_list_with_digest { my $v = $entry->{$k}; next if !defined($v); $data->{$k} = $v; - $sha->add($k, ':', $v, "\n"); + # Note: digest ignores refs ($rule->{errors}) + $sha->add($k, ':', $v, "\n") if !ref($v); ; } push @$res, $data; } - my $digest = $sha->b64digest; + my $digest = $sha->hexdigest; foreach my $entry (@$res) { $entry->{digest} = $digest; @@ -855,7 +946,7 @@ my $rule_properties = { description => "Rule action ('ACCEPT', 'DROP', 'REJECT') or security group name.", type => 'string', optional => 1, - pattern => $security_group_pattern, + pattern => $security_group_name_pattern, maxLength => 20, minLength => 2, }, @@ -866,11 +957,11 @@ my $rule_properties = { }, iface => get_standard_option('pve-iface', { optional => 1 }), source => { - type => 'string', format => 'pve-fw-v4addr-spec', + type => 'string', format => 'pve-fw-addr-spec', optional => 1, }, dest => { - type => 'string', format => 'pve-fw-v4addr-spec', + type => 'string', format => 'pve-fw-addr-spec', optional => 1, }, proto => { @@ -909,7 +1000,7 @@ sub add_rule_properties { sub delete_rule_properties { my ($rule, $delete_str) = @_; - + foreach my $opt (PVE::Tools::split_list($delete_str)) { raise_param_exc({ 'delete' => "no such property ('$opt')"}) if !defined($rule_properties->{$opt}); @@ -947,7 +1038,7 @@ my $apply_macro = sub { if (!defined($v)) { my $msg = "missing parameter '$k' in macro '$macro_name'"; - raise_param_exc({ macro => $msg }) if $verify; + raise_param_exc({ macro => $msg }) if $verify; die "$msg\n"; } $rule->{$k} = $v; @@ -959,7 +1050,7 @@ my $apply_macro = sub { 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; + raise_param_exc({ $k => $msg }) if $verify; die "$msg\n"; } } else { @@ -972,58 +1063,145 @@ my $apply_macro = sub { return $rules; }; +my $rule_env_iface_lookup = { + 'ct' => 1, + 'vm' => 1, + 'group' => 0, + 'cluster' => 1, + 'host' => 1, +}; + sub verify_rule { - my ($rule, $allow_groups) = @_; + my ($rule, $cluster_conf, $fw_conf, $rule_env, $noerr) = @_; + + my $allow_groups = $rule_env eq 'group' ? 0 : 1; + my $ipversion = undef; + + my $allow_iface = $rule_env_iface_lookup->{$rule_env}; + die "unknown rule_env '$rule_env'\n" if !defined($allow_iface); # should not happen + + my $errors = $rule->{errors} || {}; + + my $error_count = 0; + + my $add_error = sub { + my ($param, $msg) = @_; + chomp $msg; + raise_param_exc({ $param => $msg }) if !$noerr; + $error_count++; + $errors->{$param} = $msg if !$errors->{$param}; + }; + + my $check_ipset_or_alias_property = sub { + my ($name) = @_; + + if (my $value = $rule->{$name}) { + if ($value =~ m/^\+/) { + if ($value =~ m/^\+(${ipset_name_pattern})$/) { + &$add_error($name, "no such ipset '$1'") + if !($cluster_conf->{ipset}->{$1} || ($fw_conf && $fw_conf->{ipset}->{$1})); + + } else { + &$add_error($name, "invalid ipset name '$value'"); + } + } elsif ($value =~ m/^${ip_alias_pattern}$/){ + my $alias = lc($value); + &$add_error($name, "no such alias '$value'") + if !($cluster_conf->{aliases}->{$alias} || ($fw_conf && $fw_conf->{aliases}->{$alias})) + } + } + }; my $type = $rule->{type}; + my $action = $rule->{action}; + + &$add_error('type', "missing property") if !$type; + &$add_error('action', "missing property") if !$action; + + if ($type) { + if ($type eq 'in' || $type eq 'out') { + &$add_error('action', "unknown action '$action'") + if $action && ($action !~ m/^(ACCEPT|DROP|REJECT)$/); + } elsif ($type eq 'group') { + &$add_error('type', "security groups not allowed") + if !$allow_groups; + &$add_error('action', "invalid characters in security group name") + if $action && ($action !~ m/^${security_group_name_pattern}$/); + } else { + &$add_error('type', "unknown rule type '$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_pattern}$/; - } else { - raise_param_exc({ type => "unknown rule type '$type'"}); + if ($rule->{iface}) { + &$add_error('type', "parameter -i not allowed for this rule type") + if !$allow_iface; + eval { PVE::JSONSchema::pve_verify_iface($rule->{iface}); }; + &$add_error('iface', $@) if $@; + if ($rule_env eq 'vm') { + &$add_error('iface', "value does not match the regex pattern 'net\\d+'") + if $rule->{iface} !~ m/^net(\d+)$/; + } elsif ($rule_env eq 'ct') { + &$add_error('iface', "value does not match the regex pattern '(venet|eth\\d+)'") + if $rule->{iface} !~ m/^(venet|eth(\d+))$/; + } } - - # fixme: verify $rule->{iface}? 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 (my $preferred_name = $pve_fw_preferred_macro_names->{lc($rule->{macro})}) { + $rule->{macro} = $preferred_name; + } else { + &$add_error('macro', "unknown macro '$rule->{macro}'"); + } + } + + if ($rule->{proto}) { + eval { pve_fw_verify_protocol_spec($rule->{proto}); }; + &$add_error('proto', $@) if $@; } if ($rule->{dport}) { eval { parse_port_name_number_or_range($rule->{dport}); }; - raise_param_exc({ dport => $@ }) if $@; + &$add_error('dport', $@) if $@; + &$add_error('proto', "missing property - 'dport' requires this property") + if !$rule->{proto}; } if ($rule->{sport}) { eval { parse_port_name_number_or_range($rule->{sport}); }; - raise_param_exc({ sport => $@ }) if $@; + &$add_error('sport', $@) if $@; + &$add_error('proto', "missing property - 'sport' requires this property") + if !$rule->{proto}; } if ($rule->{source}) { - eval { parse_address_list($rule->{source}); }; - raise_param_exc({ source => $@ }) if $@; + eval { $ipversion = parse_address_list($rule->{source}); }; + &$add_error('source', $@) if $@; + &$check_ipset_or_alias_property('source'); } if ($rule->{dest}) { - eval { parse_address_list($rule->{dest}); }; - raise_param_exc({ dest => $@ }) if $@; + eval { $ipversion = parse_address_list($rule->{dest}); }; + &$add_error('dest', $@) if $@; + &$check_ipset_or_alias_property('dest'); } - if ($rule->{macro}) { - &$apply_macro($rule->{macro}, $rule, 1); + if ($rule->{macro} && !$error_count) { + eval { &$apply_macro($rule->{macro}, $rule, 1); }; + if (my $err = $@) { + if (ref($err) eq "PVE::Exception" && $err->{errors}) { + my $eh = $err->{errors}; + foreach my $p (keys %$eh) { + &$add_error($p, $eh->{$p}); + } + } else { + &$add_error('macro', "$err"); + } + } } + $rule->{errors} = $errors if $error_count; + $rule->{ipversion} = $ipversion if $ipversion; + return $rule; } @@ -1037,16 +1215,52 @@ sub copy_rule_data { } else { $rule->{$k} = $v; } - } else { - delete $rule->{$k}; } } - # verify rule now - return $rule; } +sub rules_modify_permissions { + my ($rule_env) = @_; + + if ($rule_env eq 'host') { + return { + check => ['perm', '/nodes/{node}', [ 'Sys.Modify' ]], + }; + } elsif ($rule_env eq 'cluster' || $rule_env eq 'group') { + return { + check => ['perm', '/', [ 'Sys.Modify' ]], + }; + } elsif ($rule_env eq 'vm' || $rule_env eq 'ct') { + return { + check => ['perm', '/vms/{vmid}', [ 'VM.Config.Network' ]], + } + } + + return undef; +} + +sub rules_audit_permissions { + my ($rule_env) = @_; + + if ($rule_env eq 'host') { + return { + check => ['perm', '/nodes/{node}', [ 'Sys.Audit' ]], + }; + } elsif ($rule_env eq 'cluster' || $rule_env eq 'group') { + return { + check => ['perm', '/', [ 'Sys.Audit' ]], + }; + } elsif ($rule_env eq 'vm' || $rule_env eq 'ct') { + return { + check => ['perm', '/vms/{vmid}', [ 'VM.Audit' ]], + } + } + + return undef; +} + # core functions my $bridge_firewall_enabled = 0; @@ -1093,7 +1307,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; @@ -1187,9 +1401,10 @@ sub ipset_get_chains { } sub ruleset_generate_cmdstr { - my ($ruleset, $chain, $rule, $actions, $goto, $cluster_conf) = @_; + my ($ruleset, $chain, $rule, $actions, $goto, $cluster_conf, $fw_conf) = @_; return if defined($rule->{enable}) && !$rule->{enable}; + return if $rule->{errors}; die "unable to emit macro - internal error" if $rule->{macro}; # should not happen @@ -1205,34 +1420,58 @@ sub ruleset_generate_cmdstr { my $dest = $rule->{dest}; if ($source) { - if ($source =~ m/^(\+)(\S+)$/) { - die "no such ipset $2" if !$cluster_conf->{ipset}->{$2}; - push @cmd, "-m set --match-set PVEFW-$2 src"; - - } elsif ($source =~ m/^${security_group_pattern}$/){ - die "no such alias $source" if !$cluster_conf->{aliases}->{$source}; - push @cmd, "-s $cluster_conf->{aliases}->{$source}"; - + if ($source =~ m/^\+/) { + if ($source =~ m/^\+(${ipset_name_pattern})$/) { + my $name = $1; + if ($fw_conf && $fw_conf->{ipset}->{$name}) { + my $ipset_chain = compute_ipset_chain_name($fw_conf->{vmid}, $name); + push @cmd, "-m set --match-set ${ipset_chain} src"; + } elsif ($cluster_conf && $cluster_conf->{ipset}->{$name}) { + my $ipset_chain = compute_ipset_chain_name(0, $name); + push @cmd, "-m set --match-set ${ipset_chain} src"; + } else { + die "no such ipset '$name'\n"; + } + } else { + die "invalid security group name '$source'\n"; + } + } elsif ($source =~ m/^${ip_alias_pattern}$/){ + my $alias = lc($source); + my $e = $fw_conf->{aliases}->{$alias} if $fw_conf; + $e = $cluster_conf->{aliases}->{$alias} if !$e && $cluster_conf; + die "no such alias '$source'\n" if !$e; + push @cmd, "-s $e->{cidr}"; } elsif ($source =~ m/\-/){ push @cmd, "-m iprange --src-range $source"; - } else { push @cmd, "-s $source"; } } if ($dest) { - if ($dest =~ m/^(\+)(\S+)$/) { - die "no such ipset $2" if !$cluster_conf->{ipset}->{$2}; - push @cmd, "-m set --match-set PVEFW-$2 dst"; - - } elsif ($dest =~ m/^${security_group_pattern}$/){ - die "no such alias $dest" if !$cluster_conf->{aliases}->{$dest}; - push @cmd, "-d $cluster_conf->{aliases}->{$dest}"; - + if ($dest =~ m/^\+/) { + if ($dest =~ m/^\+(${ipset_name_pattern})$/) { + my $name = $1; + if ($fw_conf && $fw_conf->{ipset}->{$name}) { + my $ipset_chain = compute_ipset_chain_name($fw_conf->{vmid}, $name); + push @cmd, "-m set --match-set ${ipset_chain} dst"; + } elsif ($cluster_conf && $cluster_conf->{ipset}->{$name}) { + my $ipset_chain = compute_ipset_chain_name(0, $name); + push @cmd, "-m set --match-set ${ipset_chain} dst"; + } else { + die "no such ipset '$name'\n"; + } + } else { + die "invalid security group name '$dest'\n"; + } + } elsif ($dest =~ m/^${ip_alias_pattern}$/){ + my $alias = lc($dest); + my $e = $fw_conf->{aliases}->{$alias} if $fw_conf; + $e = $cluster_conf->{aliases}->{$alias} if !$e && $cluster_conf; + die "no such alias '$dest'\n" if !$e; + push @cmd, "-d $e->{cidr}"; } elsif ($dest =~ m/^(\d+)\.(\d+).(\d+).(\d+)\-(\d+)\.(\d+).(\d+).(\d+)$/){ push @cmd, "-m iprange --dst-range $dest"; - } else { push @cmd, "-d $dest"; } @@ -1276,8 +1515,8 @@ sub ruleset_generate_cmdstr { } } } elsif ($rule->{dport} || $rule->{sport}) { - warn "ignoring destination port '$rule->{dport}' - no protocol specified\n" if $rule->{dport}; - warn "ignoring source port '$rule->{sport}' - no protocol specified\n" if $rule->{sport}; + die "destination port '$rule->{dport}', but no protocol specified\n" if $rule->{dport}; + die "source port '$rule->{sport}', but no protocol specified\n" if $rule->{sport}; } push @cmd, "-m addrtype --dst-type $rule->{dsttype}" if $rule->{dsttype}; @@ -1292,7 +1531,7 @@ sub ruleset_generate_cmdstr { } sub ruleset_generate_rule { - my ($ruleset, $chain, $rule, $actions, $goto, $cluster_conf) = @_; + my ($ruleset, $chain, $rule, $actions, $goto, $cluster_conf, $fw_conf) = @_; my $rules; @@ -1302,11 +1541,18 @@ sub ruleset_generate_rule { $rules = [ $rule ]; } + # update all or nothing + + my @cmds = (); foreach my $tmp (@$rules) { - if (my $cmdstr = ruleset_generate_cmdstr($ruleset, $chain, $tmp, $actions, $goto, $cluster_conf)) { - ruleset_addrule($ruleset, $chain, $cmdstr); + if (my $cmdstr = ruleset_generate_cmdstr($ruleset, $chain, $tmp, $actions, $goto, $cluster_conf, $fw_conf)) { + push @cmds, $cmdstr; } } + + foreach my $cmdstr (@cmds) { + ruleset_addrule($ruleset, $chain, $cmdstr); + } } sub ruleset_generate_rule_insert { @@ -1374,36 +1620,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 { @@ -1433,16 +1650,41 @@ sub ruleset_add_chain_policy { } } -sub ruleset_create_vm_chain { - my ($ruleset, $chain, $options, $host_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}){ + 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"); + } + my $ipset_chain = compute_ipset_chain_name(0, 'blacklist'); + ruleset_addrule($ruleset, $chain, "-m set --match-set ${ipset_chain} src -j PVEFW-blacklist"); + } - if (!(defined($host_options->{nosmurfs}) && $host_options->{nosmurfs} == 0)) { + 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, $macaddr, $ipfilter_ipset, $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', @@ -1453,55 +1695,64 @@ sub ruleset_create_vm_chain { } } - if ($host_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"); } + if ($ipfilter_ipset) { + ruleset_addrule($ruleset, $chain, "-m set ! --match-set $ipfilter_ipset src -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, $cluster_conf, $chain, $netid, $direction, $options) = @_; + my ($ruleset, $rules, $cluster_conf, $vmfw_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}; + next if !$rule->{enable} || $rule->{errors}; if ($rule->{type} eq 'group') { - my $group_chain = "GROUP-$rule->{action}-$direction"; - if(!ruleset_chain_exist($ruleset, $group_chain)){ - generate_group_rules($ruleset, $cluster_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" }, undef, $cluster_conf); - } else { - my $accept = generate_nfqueue($options); - ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept , REJECT => "PVEFW-reject" }, undef, $cluster_conf); - } + eval { + if ($direction eq 'OUT') { + ruleset_generate_rule($ruleset, $chain, $rule, + { ACCEPT => "PVEFW-SET-ACCEPT-MARK", REJECT => "PVEFW-reject" }, + undef, $cluster_conf, $vmfw_conf); + } else { + ruleset_generate_rule($ruleset, $chain, $rule, + { ACCEPT => $in_accept , REJECT => "PVEFW-reject" }, + undef, $cluster_conf, $vmfw_conf); + } + }; + warn $@ if $@; } } } @@ -1509,61 +1760,51 @@ 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" if $feature_ipset_nomatch; #need kernel 3.10 - }else{ - $action = "ACCEPT"; + 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, $cluster_conf, $hostfw_conf, $vmfw_conf, $vmid, $ip, $direction) = @_; - - parse_address_list($ip); # make sure we have a valid $ip list + my ($ruleset, $cluster_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, $hostfw_options, undef, $direction); + ruleset_create_vm_chain($ruleset, $chain, $options, undef, undef, $direction); - ruleset_generate_vm_rules($ruleset, $rules, $cluster_conf, $chain, 'venet', $direction); + ruleset_generate_vm_rules($ruleset, $rules, $cluster_conf, $vmfw_conf, $chain, 'venet', $direction); # implement policy my $policy; @@ -1578,24 +1819,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'}); @@ -1603,44 +1833,53 @@ sub generate_venet_rules_direction { } sub generate_tap_rules_direction { - my ($ruleset, $cluster_conf, $hostfw_conf, $iface, $netid, $macaddr, $vmfw_conf, $vmid, $bridge, $direction) = @_; + my ($ruleset, $cluster_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, $hostfw_options, $macaddr, $direction); + my $ipfilter_name = compute_ipfilter_ipset_name($netid); + my $ipfilter_ipset = compute_ipset_chain_name($vmid, $ipfilter_name) + if $vmfw_conf->{ipset}->{$ipfilter_name}; - ruleset_generate_vm_rules($ruleset, $rules, $cluster_conf, $tapchain, $netid, $direction, $options); + # create chain with mac and ip filter + ruleset_create_vm_chain($ruleset, $tapchain, $options, $macaddr, $ipfilter_ipset, $direction); - ruleset_generate_vm_ipsrules($ruleset, $options, $direction, $iface, $bridge); + if ($options->{enable}) { + ruleset_generate_vm_rules($ruleset, $rules, $cluster_conf, $vmfw_conf, $tapchain, $netid, $direction, $options); - # implement policy - my $policy; + ruleset_generate_vm_ipsrules($ruleset, $options, $direction, $iface); - if ($direction eq 'OUT') { - $policy = $options->{policy_out} || 'ACCEPT'; # allow everything by default - } else { + # implement policy + my $policy; + + if ($direction eq 'OUT') { + $policy = $options->{policy_out} || 'ACCEPT'; # allow everything by default + } else { $policy = $options->{policy_in} || 'DROP'; # allow nothing by default - } + } - my $accept = generate_nfqueue($options); - my $accept_action = $direction eq 'OUT' ? "PVEFW-SET-ACCEPT-MARK" : $accept; - ruleset_add_chain_policy($ruleset, $tapchain, $vmid, $policy, $loglevel, $accept_action); + my $accept = generate_nfqueue($options); + my $accept_action = $direction eq 'OUT' ? "PVEFW-SET-ACCEPT-MARK" : $accept; + ruleset_add_chain_policy($ruleset, $tapchain, $vmid, $policy, $loglevel, $accept_action); + } else { + my $accept_action = $direction eq 'OUT' ? "PVEFW-SET-ACCEPT-MARK" : 'ACCEPT'; + ruleset_add_chain_policy($ruleset, $tapchain, $vmid, 'ACCEPT', $loglevel, $accept_action); + } # 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"); } } @@ -1658,28 +1897,49 @@ 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"); - } - - if ($options->{tcpflags}) { - ruleset_addrule($ruleset, $chain, "-p tcp -j PVEFW-tcpflags"); - } - - 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 + + ruleset_chain_add_conn_filters($ruleset, $chain, 'ACCEPT'); + ruleset_chain_add_input_filters($ruleset, $chain, $options, $cluster_conf, $loglevel); # 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 + # add host rules first, so that cluster wide rules can be overwritten foreach my $rule (@$rules, @$cluster_rules) { - next if $rule->{type} ne 'in'; - ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" }, undef, $cluster_conf); + next if !$rule->{enable} || $rule->{errors}; + + $rule->{iface_in} = $rule->{iface} if $rule->{iface}; + + eval { + 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, $hostfw_conf); + } + }; + warn $@ if $@; + delete $rule->{iface_in}; + } + + # allow standard traffic for management ipset (includes cluster network) + my $mngmnt_ipset_chain = compute_ipset_chain_name(0, "management"); + 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 + + my $localnet = local_network(); + + # corosync + if ($localnet) { + 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"); } # implement input policy @@ -1692,20 +1952,42 @@ 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_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 + + ruleset_chain_add_conn_filters($ruleset, $chain, 'ACCEPT'); # we use RETURN because we may want to check other thigs later $accept_action = 'RETURN'; + 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) { - next if $rule->{type} ne 'out'; - ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" }, undef, $cluster_conf); + next if !$rule->{enable} || $rule->{errors}; + + $rule->{iface_out} = $rule->{iface} if $rule->{iface}; + eval { + 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, $hostfw_conf); + } + }; + warn $@ if $@; + delete $rule->{iface_out}; + } + + # allow standard traffic on cluster network + if ($localnet) { + 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"); } # implement output policy @@ -1718,10 +2000,14 @@ sub enable_host_firewall { sub generate_group_rules { my ($ruleset, $cluster_conf, $group) = @_; - die "no such security group '$group'\n" if !$cluster_conf->{groups}->{$group}; my $rules = $cluster_conf->{groups}->{$group}; + if (!$rules) { + warn "no such security group '$group'\n"; + $rules = []; # create empty chain + } + my $chain = "GROUP-${group}-IN"; ruleset_create_chain($ruleset, $chain); @@ -1753,87 +2039,79 @@ for (my $i = 0; $i < $MAX_NETS; $i++) { } sub parse_fw_rule { - my ($line, $need_iface, $allow_groups) = @_; + my ($prefix, $line, $cluster_conf, $fw_conf, $rule_env, $verbose) = @_; - my ($type, $action, $iface, $source, $dest, $proto, $dport, $sport); + my $orig_line = $line; + + my $rule = {}; # we can add single line comments to the end of the rule - my $comment = decode('utf8', $1) if $line =~ s/#\s*(.*?)\s*$//; + if ($line =~ s/#\s*(.*?)\s*$//) { + $rule->{comment} = decode('utf8', $1); + } # we can disable a rule when prefixed with '|' - my $enable = 1; - $enable = 0 if $line =~ s/^\|//; + $rule->{enable} = $line =~ s/^\|// ? 0 : 1; - my @data = split(/\s+/, $line); - my $expected_elements = $need_iface ? 8 : 7; + $line =~ s/^(\S+)\s+(\S+)\s*// || + die "unable to parse rule: $line\n"; - die "wrong number of rule elements\n" if scalar(@data) > $expected_elements; + $rule->{type} = lc($1); + $rule->{action} = $2; - if ($need_iface) { - ($type, $action, $iface, $source, $dest, $proto, $dport, $sport) = @data - } else { - ($type, $action, $source, $dest, $proto, $dport, $sport) = @data; + if ($rule->{type} eq 'in' || $rule->{type} eq 'out') { + if ($rule->{action} =~ m/^(\S+)\((ACCEPT|DROP|REJECT)\)$/) { + $rule->{macro} = $1; + $rule->{action} = $2; + } } - die "incomplete rule\n" if ! ($type && $action); + while (length($line)) { + if ($line =~ s/^-i (\S+)\s*//) { + $rule->{iface} = $1; + next; + } - my $macro; + last if $rule->{type} eq 'group'; - $type = lc($type); + if ($line =~ s/^-p (\S+)\s*//) { + $rule->{proto} = $1; + next; + } - if ($type eq 'in' || $type eq 'out') { - if ($action =~ m/^(ACCEPT|DROP|REJECT)$/) { - # OK - } elsif ($action =~ m/^(\S+)\((ACCEPT|DROP|REJECT)\)$/) { - $action = $2; - my $preferred_name = $pve_fw_preferred_macro_names->{lc($1)}; - die "unknown macro '$1'\n" if !$preferred_name; - $macro = $preferred_name; - } else { - die "unknown action '$action'\n"; + if ($line =~ s/^-dport (\S+)\s*//) { + $rule->{dport} = $1; + next; } - } 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/^${security_group_pattern}$/; - } else { - die "unknown rule type '$type'\n"; - } + if ($line =~ s/^-sport (\S+)\s*//) { + $rule->{sport} = $1; + next; + } + if ($line =~ s/^-source (\S+)\s*//) { + $rule->{source} = $1; + next; + } + if ($line =~ s/^-dest (\S+)\s*//) { + $rule->{dest} = $1; + next; + } - if ($need_iface) { - $iface = undef if $iface && $iface eq '-'; + last; } - $proto = undef if $proto && $proto eq '-'; - pve_fw_verify_protocol_spec($proto) if $proto; - - $source = undef if $source && $source eq '-'; - $dest = undef if $dest && $dest eq '-'; - - $dport = undef if $dport && $dport eq '-'; - $sport = undef if $sport && $sport eq '-'; - - parse_port_name_number_or_range($dport) if defined($dport); - parse_port_name_number_or_range($sport) if defined($sport); + die "unable to parse rule parameters: $line\n" if length($line); - parse_address_list($source) if $source; - parse_address_list($dest) if $dest; + $rule = verify_rule($rule, $cluster_conf, $fw_conf, $rule_env, 1); + if ($verbose && $rule->{errors}) { + warn "$prefix - errors in rule parameters: $orig_line\n"; + foreach my $p (keys %{$rule->{errors}}) { + warn " $p: $rule->{errors}->{$p}\n"; + } + } - return { - type => $type, - enable => $enable, - comment => $comment, - action => $action, - macro => $macro, - iface => $iface, - source => $source, - dest => $dest, - proto => $proto, - dport => $dport, - sport => $sport, - }; + return $rule; } sub parse_vmfw_option { @@ -1856,7 +2134,6 @@ sub parse_vmfw_option { $opt = lc($1); $value = $2; } else { - chomp $line; die "can't parse option '$line'\n" } @@ -1870,7 +2147,7 @@ sub parse_hostfw_option { my $loglevels = "emerg|alert|crit|err|warning|notice|info|debug|nolog"; - if ($line =~ m/^(enable|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) { @@ -1880,7 +2157,6 @@ sub parse_hostfw_option { $opt = lc($1); $value = int($2); } else { - chomp $line; die "can't parse option '$line'\n" } @@ -1899,181 +2175,116 @@ sub parse_clusterfw_option { $opt = lc($1); $value = uc($3); } else { - chomp $line; die "can't parse option '$line'\n" } return ($opt, $value); } -sub parse_clusterfw_alias { - my ($line) = @_; +sub resolve_alias { + my ($clusterfw_conf, $fw_conf, $cidr) = @_; - my ($opt, $value); - if ($line =~ m/^(\S+)\s(\S+)$/) { - $opt = lc($1); - if($2){ - $2 =~ s|/32$||; - pve_verify_ipv4_or_cidr($2) if $2; - $value = $2; - } - } else { - chomp $line; - die "can't parse option '$line'\n"; + if ($cidr !~ m/^\d/) { + my $alias = lc($cidr); + my $e = $fw_conf->{aliases}->{$alias} if $fw_conf; + $e = $clusterfw_conf->{aliases}->{$alias} if !$e && $clusterfw_conf; + return $e->{cidr} if $e; + + die "no such alias '$cidr'\n"; } - return ($opt, $value); + return $cidr; } -sub parse_vm_fw_rules { - my ($filename, $fh) = @_; - - my $res = { rules => [], options => {}}; - - my $section; - - while (defined(my $line = <$fh>)) { - next if $line =~ m/^#/; - next if $line =~ m/^\s*$/; - - my $linenr = $fh->input_line_number(); - my $prefix = "$filename (line $linenr)"; - - if ($line =~ m/^\[(\S+)\]\s*$/i) { - $section = lc($1); - warn "$prefix: ignore unknown section '$section'\n" if !$res->{$section}; - next; - } - if (!$section) { - warn "$prefix: skip line - no section"; - next; - } - - next if !$res->{$section}; # skip undefined section - - if ($section eq 'options') { - eval { - my ($opt, $value) = parse_vmfw_option($line); - $res->{options}->{$opt} = $value; - }; - warn "$prefix: $@" if $@; - next; - } - - my $rule; - eval { $rule = parse_fw_rule($line, 1, 1); }; - if (my $err = $@) { - warn "$prefix: $err"; - next; - } - - push @{$res->{$section}}, $rule; - } - - return $res; -} - -sub parse_host_fw_rules { - my ($filename, $fh) = @_; - - my $res = { rules => [], options => {}}; - - my $section; - - while (defined(my $line = <$fh>)) { - next if $line =~ m/^#/; - next if $line =~ m/^\s*$/; - - my $linenr = $fh->input_line_number(); - my $prefix = "$filename (line $linenr)"; - - if ($line =~ m/^\[(\S+)\]\s*$/i) { - $section = lc($1); - warn "$prefix: ignore unknown section '$section'\n" if !$res->{$section}; - next; - } - if (!$section) { - warn "$prefix: skip line - no section"; - next; - } - - next if !$res->{$section}; # skip undefined section - - if ($section eq 'options') { - eval { - my ($opt, $value) = parse_hostfw_option($line); - $res->{options}->{$opt} = $value; - }; - warn "$prefix: $@" if $@; - next; - } +sub parse_alias { + my ($line) = @_; - my $rule; - eval { $rule = parse_fw_rule($line, 1, 1); }; - if (my $err = $@) { - warn "$prefix: $err"; - next; - } + # we can add single line comments to the end of the line + my $comment = decode('utf8', $1) if $line =~ s/\s*#\s*(.*?)\s*$//; - push @{$res->{$section}}, $rule; + 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 $res; + return undef; } -sub parse_cluster_fw_rules { - my ($filename, $fh) = @_; +sub generic_fw_config_parser { + my ($filename, $fh, $verbose, $cluster_conf, $empty_conf, $rule_env) = @_; my $section; my $group; - my $res = { - rules => [], - options => {}, - groups => {}, - group_comments => {}, - ipset => {} , - ipset_comments => {}, - }; + my $res = $empty_conf; while (defined(my $line = <$fh>)) { next if $line =~ m/^#/; next if $line =~ m/^\s*$/; + chomp $line; + my $linenr = $fh->input_line_number(); my $prefix = "$filename (line $linenr)"; - if ($line =~ m/^\[options\]$/i) { + if ($empty_conf->{options} && ($line =~ m/^\[options\]$/i)) { $section = 'options'; next; } - if ($line =~ m/^\[aliases\]$/i) { + if ($empty_conf->{aliases} && ($line =~ m/^\[aliases\]$/i)) { $section = 'aliases'; next; } - if ($line =~ m/^\[group\s+(\S+)\]\s*(?:#\s*(.*?)\s*)?$/i) { + if ($empty_conf->{groups} && ($line =~ m/^\[group\s+(\S+)\]\s*(?:#\s*(.*?)\s*)?$/i)) { $section = 'groups'; $group = lc($1); my $comment = $2; + eval { + die "security group name too long\n" if length($group) > $max_group_name_length; + die "invalid security group name '$group'\n" if $group !~ m/^${security_group_name_pattern}$/; + }; + if (my $err = $@) { + ($section, $group, $comment) = undef; + warn "$prefix: $err"; + next; + } + $res->{$section}->{$group} = []; $res->{group_comments}->{$group} = decode('utf8', $comment) if $comment; next; } - if ($line =~ m/^\[rules\]$/i) { + if ($empty_conf->{rules} && ($line =~ m/^\[rules\]$/i)) { $section = 'rules'; next; } - if ($line =~ m/^\[ipset\s+(\S+)\]\s*(?:#\s*(.*?)\s*)?$/i) { + if ($empty_conf->{ipset} && ($line =~ m/^\[ipset\s+(\S+)\]\s*(?:#\s*(.*?)\s*)?$/i)) { $section = 'ipset'; $group = lc($1); my $comment = $2; + eval { + die "ipset name too long\n" if length($group) > $max_ipset_name_length; + die "invalid ipset name '$group'\n" if $group !~ m/^${ipset_name_pattern}$/; + }; + if (my $err = $@) { + ($section, $group, $comment) = undef; + warn "$prefix: $err"; + next; + } + $res->{$section}->{$group} = []; - $res->{ipset_comments}->{$group} = decode('utf8', $comment) + $res->{ipset_comments}->{$group} = decode('utf8', $comment) if $comment; next; } @@ -2085,19 +2296,26 @@ sub parse_cluster_fw_rules { if ($section eq 'options') { eval { - my ($opt, $value) = parse_clusterfw_option($line); + my ($opt, $value); + if ($rule_env eq 'cluster') { + ($opt, $value) = parse_clusterfw_option($line); + } elsif ($rule_env eq 'host') { + ($opt, $value) = parse_hostfw_option($line); + } else { + ($opt, $value) = parse_vmfw_option($line); + } $res->{options}->{$opt} = $value; }; warn "$prefix: $@" if $@; } elsif ($section eq 'aliases') { eval { - my ($opt, $value) = parse_clusterfw_alias($line); - $res->{aliases}->{$opt} = $value; + my $data = parse_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); }; + eval { $rule = parse_fw_rule($prefix, $line, $cluster_conf, $res, $rule_env, $verbose); }; if (my $err = $@) { warn "$prefix: $err"; next; @@ -2105,7 +2323,7 @@ sub parse_cluster_fw_rules { push @{$res->{$section}}, $rule; } elsif ($section eq 'groups') { my $rule; - eval { $rule = parse_fw_rule($line, 0, 0); }; + eval { $rule = parse_fw_rule($prefix, $line, $cluster_conf, undef, 'group', $verbose); }; if (my $err = $@) { warn "$prefix: $err"; next; @@ -2118,28 +2336,88 @@ sub parse_cluster_fw_rules { $line =~ m/^(\!)?\s*(\S+)\s*$/; my $nomatch = $1; my $cidr = $2; + my $errors; - if($cidr !~ m/^${security_group_pattern}$/) { - $cidr =~ s|/32$||; - - eval { pve_verify_ipv4_or_cidr($cidr); }; - if (my $err = $@) { - warn "$prefix: $cidr - $err"; - next; + if ($nomatch && !$feature_ipset_nomatch) { + $errors->{nomatch} = "nomatch not supported by kernel"; + } + + eval { + if ($cidr =~ m/^${ip_alias_pattern}$/) { + resolve_alias($cluster_conf, $res, $cidr); # make sure alias exists + } else { + $cidr =~ s|/32$||; + pve_verify_ipv4_or_cidr_or_alias($cidr); } + }; + if (my $err = $@) { + chomp $err; + $errors->{cidr} = $err; } - my $entry = { cidr => $cidr }; + my $entry = { cidr => $cidr }; $entry->{nomatch} = 1 if $nomatch; $entry->{comment} = $comment if $comment; - + $entry->{errors} = $errors if $errors; + + if ($verbose && $errors) { + warn "$prefix - errors in ipset '$group': $line\n"; + foreach my $p (keys %{$errors}) { + warn " $p: $errors->{$p}\n"; + } + } + push @{$res->{$section}->{$group}}, $entry; + } else { + warn "$prefix: skip line - unknown section\n"; + next; } } return $res; } +sub parse_hostfw_config { + my ($filename, $fh, $cluster_conf, $verbose) = @_; + + my $empty_conf = { rules => [], options => {}}; + + return generic_fw_config_parser($filename, $fh, $verbose, $cluster_conf, $empty_conf, 'host'); +} + +sub parse_vmfw_config { + my ($filename, $fh, $cluster_conf, $rule_env, $verbose) = @_; + + my $empty_conf = { + rules => [], + options => {}, + aliases => {}, + ipset => {} , + ipset_comments => {}, + }; + + return generic_fw_config_parser($filename, $fh, $verbose, $cluster_conf, $empty_conf, $rule_env); +} + +sub parse_clusterfw_config { + my ($filename, $fh, $verbose) = @_; + + my $section; + my $group; + + my $empty_conf = { + rules => [], + options => {}, + aliases => {}, + groups => {}, + group_comments => {}, + ipset => {} , + ipset_comments => {}, + }; + + return generic_fw_config_parser($filename, $fh, $verbose, $empty_conf, $empty_conf, 'cluster'); +} + sub run_locked { my ($code, @param) = @_; @@ -2189,20 +2467,23 @@ sub read_local_vm_config { }; sub load_vmfw_conf { - my ($vmid) = @_; + my ($cluster_conf, $rule_env, $vmid, $dir, $verbose) = @_; my $vmfw_conf = {}; - my $filename = "/etc/pve/firewall/$vmid.fw"; + $dir = $pvefw_conf_dir 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); + $vmfw_conf = parse_vmfw_config($filename, $fh, $cluster_conf, $rule_env, $verbose); + $vmfw_conf->{vmid} = $vmid; } return $vmfw_conf; } my $format_rules = sub { - my ($rules, $need_iface) = @_; + my ($rules, $allow_iface) = @_; my $raw = ''; @@ -2215,14 +2496,16 @@ my $format_rules = sub { } else { $raw .= " " . $rule->{action}; } - $raw .= " " . ($rule->{iface} || '-') if $need_iface; + if ($allow_iface && $rule->{iface}) { + $raw .= " -i $rule->{iface}"; + } if ($rule->{type} ne 'group') { - $raw .= " " . ($rule->{source} || '-'); - $raw .= " " . ($rule->{dest} || '-'); - $raw .= " " . ($rule->{proto} || '-'); - $raw .= " " . ($rule->{dport} || '-'); - $raw .= " " . ($rule->{sport} || '-'); + $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}) @@ -2250,25 +2533,55 @@ my $format_options = sub { return $raw; }; -my $format_ipset = sub { - my ($options) = @_; +my $format_aliases = sub { + my ($aliases) = @_; my $raw = ''; - my $nethash = {}; - foreach my $entry (@$options) { - $nethash->{$entry->{cidr}} = $entry; + $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"; - 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; +}; + +my $format_ipsets = sub { + my ($fw_conf) = @_; + + my $raw = ''; + + foreach my $ipset (sort keys %{$fw_conf->{ipset}}) { + if (my $comment = $fw_conf->{ipset_comments}->{$ipset}) { + my $utf8comment = encode('utf8', $comment); + $raw .= "[IPSET $ipset] # $utf8comment\n\n"; + } else { + $raw .= "[IPSET $ipset]\n\n"; + } + my $options = $fw_conf->{ipset}->{$ipset}; + + 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"; + } + + $raw .= "\n"; } - + return $raw; }; @@ -2278,25 +2591,38 @@ sub save_vmfw_conf { my $raw = ''; my $options = $vmfw_conf->{options}; - $raw .= &$format_options($options) if scalar(keys %$options); + $raw .= &$format_options($options) if $options && scalar(keys %$options); - my $rules = $vmfw_conf->{rules}; - if (scalar(@$rules)) { + my $aliases = $vmfw_conf->{aliases}; + $raw .= &$format_aliases($aliases) if $aliases && scalar(keys %$aliases); + + $raw .= &$format_ipsets($vmfw_conf) if $vmfw_conf->{ipset}; + + my $rules = $vmfw_conf->{rules} || []; + if ($rules && scalar(@$rules)) { $raw .= "[RULES]\n\n"; $raw .= &$format_rules($rules, 1); $raw .= "\n"; } - my $filename = "/etc/pve/firewall/$vmid.fw"; + mkdir $pvefw_conf_dir; + + my $filename = "$pvefw_conf_dir/$vmid.fw"; PVE::Tools::file_set_contents($filename, $raw); } sub read_vm_firewall_configs { - my ($vmdata) = @_; + my ($cluster_conf, $vmdata, $dir, $verbose) = @_; + my $vmfw_configs = {}; - foreach my $vmid (keys %{$vmdata->{qemu}}, keys %{$vmdata->{openvz}}) { - my $vmfw_conf = load_vmfw_conf($vmid); + foreach my $vmid (keys %{$vmdata->{qemu}}) { + my $vmfw_conf = load_vmfw_conf($cluster_conf, 'vm', $vmid, $dir, $verbose); + next if !$vmfw_conf->{options}; # skip if file does not exists + $vmfw_configs->{$vmid} = $vmfw_conf; + } + foreach my $vmid (keys %{$vmdata->{openvz}}) { + my $vmfw_conf = load_vmfw_conf($cluster_conf, 'ct', $vmid, $dir, $verbose); next if !$vmfw_conf->{options}; # skip if file does not exists $vmfw_configs->{$vmid} = $vmfw_conf; } @@ -2322,29 +2648,35 @@ sub get_option_log_level { } sub generate_std_chains { - my ($ruleset, $options) = @_; + my ($ruleset, $options, $ipversion) = @_; + + my $std_chains = $pve_std_chains->{$ipversion} || die "internal error"; my $loglevel = get_option_log_level($options, 'smurf_log_level'); - # same as shorewall smurflog. - my $chain = 'PVEFW-smurflog'; - $pve_std_chains->{$chain} = []; + my $chain; - push @{$pve_std_chains->{$chain}}, get_log_rule_base($chain, 0, "DROP: ", $loglevel) if $loglevel; - push @{$pve_std_chains->{$chain}}, "-j DROP"; + 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"; + } # same as shorewall logflags action. $loglevel = get_option_log_level($options, 'tcp_flags_log_level'); $chain = 'PVEFW-logflags'; - $pve_std_chains->{$chain} = []; + $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"; + push @{$std_chains->{$chain}}, get_log_rule_base($chain, 0, "DROP: ", $loglevel) if $loglevel; + push @{$std_chains->{$chain}}, "-j DROP"; - foreach my $chain (keys %$pve_std_chains) { + foreach my $chain (keys %$std_chains) { ruleset_create_chain($ruleset, $chain); - foreach my $rule (@{$pve_std_chains->{$chain}}) { + foreach my $rule (@{$std_chains->{$chain}}) { if (ref($rule)) { ruleset_generate_rule($ruleset, $chain, $rule); } else { @@ -2355,15 +2687,18 @@ sub generate_std_chains { } sub generate_ipset_chains { - my ($ipset_ruleset, $fw_conf) = @_; + my ($ipset_ruleset, $clusterfw_conf, $fw_conf) = @_; foreach my $ipset (keys %{$fw_conf->{ipset}}) { - generate_ipset($ipset_ruleset, "PVEFW-$ipset", $fw_conf->{ipset}->{$ipset}, $fw_conf->{aliases}); + my $ipset_chain = compute_ipset_chain_name($fw_conf->{vmid}, $ipset); + generate_ipset($ipset_ruleset, $ipset_chain, $fw_conf->{ipset}->{$ipset}, $clusterfw_conf, $fw_conf); } } sub generate_ipset { - my ($ipset_ruleset, $name, $options, $aliases) = @_; + my ($ipset_ruleset, $name, $options, $clusterfw_conf, $fw_conf) = @_; + + die "duplicate ipset chain '$name'\n" if defined($ipset_ruleset->{$name}); my $hashsize = scalar(@$options); if ($hashsize <= 64) { @@ -2372,18 +2707,17 @@ sub generate_ipset { $hashsize = round_powerof2($hashsize); } - push @{$ipset_ruleset->{$name}}, "create $name hash:net family inet hashsize $hashsize maxelem $hashsize"; + $ipset_ruleset->{$name} = ["create $name hash:net family inet hashsize $hashsize maxelem $hashsize"]; # remove duplicates my $nethash = {}; foreach my $entry (@$options) { - my $cidr = $entry->{cidr}; - #check aliases - if ($cidr =~ m/^${security_group_pattern}$/){ - die "no such alias $cidr" if !$aliases->{$cidr}; - $entry->{cidr} = $aliases->{$cidr}; - } - $nethash->{$entry->{cidr}} = $entry; + next if $entry->{errors}; # skip entries with errors + eval { + my $cidr = resolve_alias($clusterfw_conf, $fw_conf, $entry->{cidr}); + $nethash->{$cidr} = { cidr => $cidr, nomatch => $entry->{nomatch} }; + }; + warn $@ if $@; } foreach my $cidr (sort keys %$nethash) { @@ -2410,63 +2744,14 @@ sub round_powerof2 { return ++$int; } -sub save_pvefw_status { - my ($status) = @_; - - die "unknown status '$status' - internal error" - if $status !~ m/^(stopped|active)$/; - - 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; - - eval { - $status = PVE::Tools::file_get_contents($pve_fw_status_filename); - }; - warn $@ if $@; - - return $status; -} - -# fixme: move to pve-common PVE::ProcFSTools -sub read_proc_net_route { - my $filename = "/proc/net/route"; - - my $res = {}; - - my $fh = IO::File->new ($filename, "r"); - return $res if !$fh; - - my $int_to_quad = sub { - return join '.' => map { ($_[0] >> 8*(3-$_)) % 256 } (3, 2, 1, 0); - }; - - 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, - }; - } - - return $res; -} - sub load_clusterfw_conf { + my ($filename, $verbose) = @_; + + $filename = $clusterfw_conf_filename if !defined($filename); my $cluster_conf = {}; - if (my $fh = IO::File->new($clusterfw_conf_filename, O_RDONLY)) { - $cluster_conf = parse_cluster_fw_rules($clusterfw_conf_filename, $fh); + if (my $fh = IO::File->new($filename, O_RDONLY)) { + $cluster_conf = parse_clusterfw_config($filename, $fh, $verbose); } return $cluster_conf; @@ -2478,48 +2763,47 @@ sub save_clusterfw_conf { my $raw = ''; my $options = $cluster_conf->{options}; - $raw .= &$format_options($options) if scalar(keys %$options); + $raw .= &$format_options($options) if $options && scalar(keys %$options); - 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"; - } + my $aliases = $cluster_conf->{aliases}; + $raw .= &$format_aliases($aliases) if $aliases && scalar(keys %$aliases); + $raw .= &$format_ipsets($cluster_conf) if $cluster_conf->{ipset}; + my $rules = $cluster_conf->{rules}; - if (scalar(@$rules)) { + if ($rules && scalar(@$rules)) { $raw .= "[RULES]\n\n"; $raw .= &$format_rules($rules, 1); $raw .= "\n"; } - 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"; - } + if ($cluster_conf->{groups}) { + 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"; + $raw .= &$format_rules($rules, 0); + $raw .= "\n"; + } } + mkdir $pvefw_conf_dir; PVE::Tools::file_set_contents($clusterfw_conf_filename, $raw); } sub load_hostfw_conf { + my ($cluster_conf, $filename, $verbose) = @_; + + $filename = $hostfw_conf_filename if !defined($filename); my $hostfw_conf = {}; - if (my $fh = IO::File->new($hostfw_conf_filename, O_RDONLY)) { - $hostfw_conf = parse_host_fw_rules($hostfw_conf_filename, $fh); + if (my $fh = IO::File->new($filename, O_RDONLY)) { + $hostfw_conf = parse_hostfw_config($filename, $fh, $cluster_conf, $verbose); } return $hostfw_conf; } @@ -2530,10 +2814,10 @@ sub save_hostfw_conf { my $raw = ''; my $options = $hostfw_conf->{options}; - $raw .= &$format_options($options) if scalar(keys %$options); + $raw .= &$format_options($options) if $options && scalar(keys %$options); my $rules = $hostfw_conf->{rules}; - if (scalar(@$rules)) { + if ($rules && scalar(@$rules)) { $raw .= "[RULES]\n\n"; $raw .= &$format_rules($rules, 1); $raw .= "\n"; @@ -2543,18 +2827,49 @@ sub save_hostfw_conf { } sub compile { - my ($cluster_conf, $hostfw_conf) = @_; + my ($cluster_conf, $hostfw_conf, $vmdata, $verbose) = @_; - $cluster_conf = load_clusterfw_conf() if !$cluster_conf; - $hostfw_conf = load_hostfw_conf() if !$hostfw_conf; + my $vmfw_configs; - my $vmdata = read_local_vm_config(); - my $vmfw_configs = read_vm_firewall_configs($vmdata); + if ($vmdata) { # test mode + my $testdir = $vmdata->{testdir} || die "no test directory specified"; + my $filename = "$testdir/cluster.fw"; + $cluster_conf = load_clusterfw_conf($filename, $verbose); - my $routing_table = read_proc_net_route(); + $filename = "$testdir/host.fw"; + $hostfw_conf = load_hostfw_conf($cluster_conf, $filename, $verbose); - my $ipset_ruleset = {}; - generate_ipset_chains($ipset_ruleset, $cluster_conf); + $vmfw_configs = read_vm_firewall_configs($cluster_conf, $vmdata, $testdir, $verbose); + } else { # normal operation + $cluster_conf = load_clusterfw_conf(undef, $verbose) if !$cluster_conf; + + $hostfw_conf = load_hostfw_conf($cluster_conf, undef, $verbose) if !$hostfw_conf; + + $vmdata = read_local_vm_config(); + $vmfw_configs = read_vm_firewall_configs($cluster_conf, $vmdata, undef, $verbose); + } + + my ($ruleset, $ipset_ruleset) = compile_iptables_filter($cluster_conf, $hostfw_conf, $vmfw_configs, $vmdata, 4, $verbose); + return ($ruleset, $ipset_ruleset); +} + +sub compile_iptables_filter { + my ($cluster_conf, $hostfw_conf, $vmfw_configs, $vmdata, $ipversion, $verbose) = @_; + + $cluster_conf->{ipset}->{venet0} = []; + my $venet0_ipset_chain = compute_ipset_chain_name(0, 'venet0'); + + my $localnet; + if ($cluster_conf->{aliases}->{local_network}) { + $localnet = $cluster_conf->{aliases}->{local_network}->{cidr}; + } else { + $localnet = local_network() || '127.0.0.0/8'; + $cluster_conf->{aliases}->{local_network} = { cidr => $localnet }; + } + + push @{$cluster_conf->{ipset}->{management}}, { cidr => $localnet }; + + return ({}, {}) if !$cluster_conf->{options}->{enable}; my $ruleset = {}; @@ -2565,98 +2880,119 @@ sub compile { my $hostfw_options = $hostfw_conf->{options} || {}; - generate_std_chains($ruleset, $hostfw_options); + # fixme: what log level should we use here? + my $loglevel = get_option_log_level($hostfw_options, "log_level_out"); - my $hostfw_enable = !(defined($hostfw_options->{enable}) && ($hostfw_options->{enable} == 0)); + ruleset_chain_add_conn_filters($ruleset, "PVEFW-FORWARD", "ACCEPT"); - enable_host_firewall($ruleset, $hostfw_conf, $cluster_conf) if $hostfw_enable; - # generate firewall rules for QEMU VMs - foreach my $vmid (keys %{$vmdata->{qemu}}) { - my $conf = $vmdata->{qemu}->{$vmid}; - my $vmfw_conf = $vmfw_configs->{$vmid}; - next if !$vmfw_conf; - next if defined($vmfw_conf->{options}->{enable}) && ($vmfw_conf->{options}->{enable} == 0); + ruleset_create_chain($ruleset, "PVEFW-VENET-OUT"); + ruleset_addrule($ruleset, "PVEFW-FORWARD", "-i venet0 -m set --match-set ${venet0_ipset_chain} src -j PVEFW-VENET-OUT"); + ruleset_addrule($ruleset, "PVEFW-INPUT", "-i venet0 -m set --match-set ${venet0_ipset_chain} src -j PVEFW-VENET-OUT"); - foreach my $netid (keys %$conf) { - next if $netid !~ m/^net(\d+)$/; - my $net = PVE::QemuServer::parse_net($conf->{$netid}); - next if !$net; - my $iface = "tap${vmid}i$1"; + ruleset_create_chain($ruleset, "PVEFW-FWBR-IN"); + ruleset_chain_add_input_filters($ruleset, "PVEFW-FWBR-IN", $hostfw_options, $cluster_conf, $loglevel); - my $bridge = $net->{bridge}; - next if !$bridge; # fixme: ? + ruleset_addrule($ruleset, "PVEFW-FORWARD", "-m physdev --physdev-is-bridged --physdev-in fwln+ -j PVEFW-FWBR-IN"); - $bridge .= "v$net->{tag}" if $net->{tag}; + ruleset_create_chain($ruleset, "PVEFW-FWBR-OUT"); + ruleset_addrule($ruleset, "PVEFW-FORWARD", "-m physdev --physdev-is-bridged --physdev-out fwln+ -j PVEFW-FWBR-OUT"); - generate_bridge_chains($ruleset, $hostfw_conf, $bridge, $routing_table); + ruleset_create_chain($ruleset, "PVEFW-VENET-IN"); + ruleset_chain_add_input_filters($ruleset, "PVEFW-VENET-IN", $hostfw_options, $cluster_conf, $loglevel); - my $macaddr = $net->{macaddr}; - generate_tap_rules_direction($ruleset, $cluster_conf, $hostfw_conf, $iface, $netid, $macaddr, - $vmfw_conf, $vmid, $bridge, 'IN'); - generate_tap_rules_direction($ruleset, $cluster_conf, $hostfw_conf, $iface, $netid, $macaddr, - $vmfw_conf, $vmid, $bridge, 'OUT'); - } + ruleset_addrule($ruleset, "PVEFW-FORWARD", "-o venet0 -m set --match-set ${venet0_ipset_chain} dst -j PVEFW-VENET-IN"); + + generate_std_chains($ruleset, $hostfw_options, $ipversion); + + my $hostfw_enable = !(defined($hostfw_options->{enable}) && ($hostfw_options->{enable} == 0)); + + my $ipset_ruleset = {}; + + if ($hostfw_enable) { + eval { enable_host_firewall($ruleset, $hostfw_conf, $cluster_conf); }; + warn $@ if $@; # just to be sure - should not happen + } + + ruleset_addrule($ruleset, "PVEFW-OUTPUT", "-o venet0 -m set --match-set ${venet0_ipset_chain} dst -j PVEFW-VENET-IN"); + + # generate firewall rules for QEMU VMs + foreach my $vmid (keys %{$vmdata->{qemu}}) { + eval { + my $conf = $vmdata->{qemu}->{$vmid}; + my $vmfw_conf = $vmfw_configs->{$vmid}; + return if !$vmfw_conf; + + generate_ipset_chains($ipset_ruleset, $cluster_conf, $vmfw_conf); + + foreach my $netid (keys %$conf) { + next if $netid !~ m/^net(\d+)$/; + my $net = PVE::QemuServer::parse_net($conf->{$netid}); + next if !$net->{firewall}; + my $iface = "tap${vmid}i$1"; + + my $macaddr = $net->{macaddr}; + generate_tap_rules_direction($ruleset, $cluster_conf, $iface, $netid, $macaddr, + $vmfw_conf, $vmid, 'IN'); + generate_tap_rules_direction($ruleset, $cluster_conf, $iface, $netid, $macaddr, + $vmfw_conf, $vmid, 'OUT'); + } + }; + warn $@ if $@; # just to be sure - should not happen } # generate firewall rules for OpenVZ containers foreach my $vmid (keys %{$vmdata->{openvz}}) { - my $conf = $vmdata->{openvz}->{$vmid}; - - my $vmfw_conf = $vmfw_configs->{$vmid}; - next if !$vmfw_conf; - next if defined($vmfw_conf->{options}->{enable}) && ($vmfw_conf->{options}->{enable} == 0); - - if ($conf->{ip_address} && $conf->{ip_address}->{value}) { - my $ip = $conf->{ip_address}->{value}; - 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? - } + eval { + my $conf = $vmdata->{openvz}->{$vmid}; - generate_bridge_chains($ruleset, $hostfw_conf, $bridge, $routing_table); + my $vmfw_conf = $vmfw_configs->{$vmid}; + return if !$vmfw_conf; - my $macaddr = $d->{mac}; - my $iface = $d->{host_ifname}; - generate_tap_rules_direction($ruleset, $cluster_conf, $hostfw_conf, $iface, $netid, $macaddr, - $vmfw_conf, $vmid, $bridge, 'IN'); - generate_tap_rules_direction($ruleset, $cluster_conf, $hostfw_conf, $iface, $netid, $macaddr, - $vmfw_conf, $vmid, $bridge, 'OUT'); - } - } - } + generate_ipset_chains($ipset_ruleset, $cluster_conf, $vmfw_conf); - if($hostfw_options->{optimize}){ + if ($vmfw_conf->{options}->{enable}) { + if ($conf->{ip_address} && $conf->{ip_address}->{value}) { + my $ip = $conf->{ip_address}->{value}; + $ip =~ s/\s+/,/g; + parse_address_list($ip); # make sure we have a valid $ip list - 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"); - } + my @ips = split(',', $ip); - # fixme: what log level should we use here? - my $loglevel = get_option_log_level($hostfw_options, "log_level_out"); + foreach my $singleip (@ips) { + my $venet0ipset = {}; + $venet0ipset->{cidr} = $singleip; + push @{$cluster_conf->{ipset}->{venet0}}, $venet0ipset; + } + + generate_venet_rules_direction($ruleset, $cluster_conf, $vmfw_conf, $vmid, $ip, 'IN'); + generate_venet_rules_direction($ruleset, $cluster_conf, $vmfw_conf, $vmid, $ip, 'OUT'); + } + } - # fixme: should we really block inter-bridge traffic? + 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}; + next if !$bridge || $bridge !~ m/^vmbr\d+(v(\d+))?f$/; # firewall enabled ? + my $macaddr = $d->{mac}; + my $iface = $d->{host_ifname}; + generate_tap_rules_direction($ruleset, $cluster_conf, $iface, $netid, $macaddr, + $vmfw_conf, $vmid, 'IN'); + generate_tap_rules_direction($ruleset, $cluster_conf, $iface, $netid, $macaddr, + $vmfw_conf, $vmid, 'OUT'); + } + } + }; + warn $@ if $@; # just to be sure - should not happen + } - # always allow traffic from containers? - ruleset_addrule($ruleset, "PVEFW-FORWARD", "-i venet0 -j RETURN"); + if(ruleset_chain_exist($ruleset, "PVEFW-IPS")){ + ruleset_insertrule($ruleset, "PVEFW-FORWARD", "-m conntrack --ctstate RELATED,ESTABLISHED -j PVEFW-IPS"); + } - # 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"); + generate_ipset_chains($ipset_ruleset, undef, $cluster_conf); return ($ruleset, $ipset_ruleset); } @@ -2724,8 +3060,9 @@ sub get_ruleset_cmdlist { } foreach my $h (qw(INPUT OUTPUT FORWARD)) { - if (!$hooks->{$h}) { - $cmdlist .= "-A $h -j PVEFW-$h\n"; + my $chain = "PVEFW-$h"; + if ($ruleset->{$chain} && !$hooks->{$h}) { + $cmdlist .= "-A $h -j $chain\n"; } } @@ -2777,7 +3114,7 @@ sub get_ipset_cmdlist { my $active_chains = ipset_get_chains(); my $statushash = get_ruleset_status($ruleset, $active_chains, \&ipset_chain_digest, $verbose); - # remove stale _swap chains + # remove stale _swap chains foreach my $chain (keys %$active_chains) { if ($chain =~ m/^PVEFW-\S+_swap$/) { $cmdlist .= "destroy $chain\n"; @@ -2825,10 +3162,6 @@ sub apply_ruleset { enable_bridge_firewall(); - update_nf_conntrack_max($hostfw_conf); - - update_nf_conntrack_tcp_timeout_established($hostfw_conf); - my ($ipset_create_cmdlist, $ipset_delete_cmdlist, $ipset_changes) = get_ipset_cmdlist($ipset_ruleset, undef, $verbose); @@ -2867,6 +3200,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 { @@ -2924,25 +3262,37 @@ sub remove_pvefw_chains { $cmdlist .= "COMMIT\n"; iptables_restore_cmdlist($cmdlist); + + my $ipset_chains = ipset_get_chains(); + + $cmdlist = ""; + + foreach my $chain (keys %$ipset_chains) { + $cmdlist .= "flush $chain\n"; + $cmdlist .= "destroy $chain\n"; + } + + ipset_restore_cmdlist($cmdlist) if $cmdlist; } -sub update { - my ($start, $verbose) = @_; +sub init { + my $cluster_conf = load_clusterfw_conf(); + my $cluster_options = $cluster_conf->{options}; + my $enable = $cluster_options->{enable}; + + return if !$enable; + + # load required modules here +} +sub update { my $code = sub { my $cluster_conf = load_clusterfw_conf(); my $cluster_options = $cluster_conf->{options}; - my $enable = $cluster_options->{enable}; - - my $status = read_pvefw_status(); - - die "Firewall is disabled - cannot start\n" if !$enable && $start; - - if (!$enable) { + if (!$cluster_options->{enable}) { PVE::Firewall::remove_pvefw_chains(); - print "Firewall disabled\n" if $verbose; return; } @@ -2950,18 +3300,10 @@ sub update { my ($ruleset, $ipset_ruleset) = compile($cluster_conf, $hostfw_conf); - if ($start || $status eq 'active') { - - save_pvefw_status('active') if ($status ne 'active'); - - apply_ruleset($ruleset, $hostfw_conf, $ipset_ruleset, $verbose); - } else { - print "Firewall not active (status = $status)\n" if $verbose; - } + apply_ruleset($ruleset, $hostfw_conf, $ipset_ruleset); }; run_locked($code); } - 1;