avoid multiple calls to ipset_get_chains()

[pve-firewall.git] / src / PVE / Firewall.pm

diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index ff95cea2fe3c38a18134b6d222c45a09e912a7f8..45f6a5d8d00275b02e31c6b5e1fb9209abb0ec91 100644 (file)
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -800,7 +800,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 {
@@ -1785,17 +1785,9 @@ sub parse_cluster_fw_rules {
            next;
        }
     
-       if ($line =~ m/^\[ipgroup\s+(\S+)\]\s*$/i) {
-           $section = 'ipset';
-           $group = lc($1);
-           $res->{$section}->{$group}->{type} = 'hash:ip family inet hashsize 1024 maxelem 65536 ';
-           next;
-       }
-
        if ($line =~ m/^\[netgroup\s+(\S+)\]\s*$/i) {
            $section = 'ipset';
            $group = lc($1);
-           $res->{$section}->{$group}->{type} = 'hash:net family inet hashsize 1024 maxelem 65536 ';
            next;
        }
 
@@ -1828,17 +1820,25 @@ sub parse_cluster_fw_rules {
            push @{$res->{$section}->{$group}}, $rule;
        } elsif ($section eq 'ipset') {
            chomp $line;
-           my $ip;
-           if (!Net::IP->new($line)) {
+           $line =~ m/^(\!)?(\s)?((\d+)\.(\d+)\.(\d+)\.(\d+)(\/(\d+))?)/;
+           my $nomatch = $1;
+           my $ip = $3;
+
+           if(!$ip){
                warn "$prefix: $line is not an valid ip address";
                next;
            }
-           push @{$res->{$section}->{$group}->{ip}}, $line;
+           if (!Net::IP->new($ip)) {
+               warn "$prefix: $line is not an valid ip address";
+               next;
+           }
+           $ip .= " nomatch" if $nomatch;
+
+           push @{$res->{$section}->{$group}}, $ip;
        }
     }
 
     $res->{digest} = $digest->b64digest;
-
     return $res;
 }
 
@@ -1964,23 +1964,38 @@ 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, $ipset, $fw_conf->{ipset}->{$ipset});
     }
 }
 
 sub generate_ipset {
     my ($ipset_ruleset, $name, $options) = @_;
 
-    push @{$ipset_ruleset->{$name}}, "create $name $options->{type}";
+    my $hashsize = scalar(@$options);
+    if ($hashsize <= 64) {
+       $hashsize = 64;
+    } else {
+       $hashsize = round_powerof2($hashsize);
+    }
+
+    push @{$ipset_ruleset->{$name}}, "create $name hash:net family inet hashsize $hashsize maxelem $hashsize";
 
-    foreach my $ip (@{$options->{ip}}) {
+    foreach my $ip (@$options) {
        push @{$ipset_ruleset->{$name}}, "add $name $ip";
     }
 }
 
+sub round_powerof2 {
+    my ($int) = @_;
+
+    $int--;
+    $int |= $int >> $_ foreach (1,2,4,8,16);
+    return ++$int;
+}
+
 sub save_pvefw_status {
     my ($status) = @_;
 
@@ -2264,7 +2279,7 @@ sub get_ruleset_status {
            print "delete $chain ($sig)\n" if $verbose;
        }
     }
-    
+
     return $statushash;
 }
 
@@ -2341,6 +2356,8 @@ sub get_ipset_cmdlist {
 
     my $cmdlist = "";
 
+    my $delete_cmdlist = "";
+
     my $active_chains = ipset_get_chains();
     my $statushash = get_ruleset_status($ruleset, $active_chains, \&ipset_chain_digest, $verbose);
 
@@ -2352,33 +2369,32 @@ sub get_ipset_cmdlist {
            foreach my $cmd (@{$ruleset->{$chain}}) {
                $cmdlist .= "$cmd\n";
            }
-        }
+       }
 
        if ($stat->{action} eq 'update') {
            my $chain_swap = $chain."_swap";
-
+           
            foreach my $cmd (@{$ruleset->{$chain}}) {
                $cmd =~ s/$chain/$chain_swap/;
                $cmdlist .= "$cmd\n";
-
            }
            $cmdlist .= "swap $chain_swap $chain\n";
            $cmdlist .= "flush $chain_swap\n";
            $cmdlist .= "destroy $chain_swap\n";
-        }
+       }
 
     }
 
     foreach my $chain (keys %$statushash) {
        next if $statushash->{$chain}->{action} ne 'delete';
 
-       $cmdlist .= "flush $chain\n";
-       $cmdlist .= "destroy $chain\n";
+       $delete_cmdlist .= "flush $chain\n";
+       $delete_cmdlist .= "destroy $chain\n";
     }
 
-    my $changes = $cmdlist ? 1 : 0;
-
-    return wantarray ? ($cmdlist, $changes) : $cmdlist;
+    my $changes = ($cmdlist || $delete_cmdlist) ? 1 : 0;
+    
+    return ($cmdlist, $delete_cmdlist, $changes);
 }
 
 sub apply_ruleset {
@@ -2388,18 +2404,22 @@ sub apply_ruleset {
 
     update_nf_conntrack_max($hostfw_conf);
 
-    my $ipsetcmdlist = get_ipset_cmdlist($ipset_ruleset, $verbose);
+    my ($ipset_create_cmdlist, $ipset_delete_cmdlist) = get_ipset_cmdlist($ipset_ruleset, undef, $verbose);
 
     my $cmdlist = get_ruleset_cmdlist($ruleset, $verbose);
 
-    print $ipsetcmdlist if $verbose;
+    print $ipset_create_cmdlist if $verbose;
+
+    print $ipset_delete_cmdlist if $verbose;
 
     print $cmdlist if $verbose;
 
-    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 $active_chains = iptables_get_chains();
     my $statushash = get_ruleset_status($ruleset, $active_chains, \&iptables_chain_digest, $verbose);