do not abort if security groups does not exists

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

diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index ef54621a5d3a9455bb0bc60a3001b36dc46a9837..fd83ba32438ae3787f61a7884eb83a7fb1ee4dc9 100644 (file)
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -1243,7 +1243,7 @@ sub ruleset_generate_cmdstr {
                die "invalid security group name '$dest'\n";
            }
        } elsif ($dest =~ m/^${ip_alias_pattern}$/){
-           my $alias = lc($source);
+           my $alias = lc($dest);
            my $e = $cluster_conf->{aliases}->{$alias};
            die "no such alias $dest" if !$e;
            push @cmd, "-d $e->{cidr}";
@@ -1476,6 +1476,26 @@ sub ruleset_create_vm_chain {
     }
 }
 
+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) = @_;
 
@@ -1487,18 +1507,8 @@ sub ruleset_generate_vm_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, $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;
            eval {
@@ -1665,9 +1675,14 @@ sub enable_host_firewall {
 
     # add host rules first, so that cluster wide rules can be overwritten
     foreach my $rule (@$rules, @$cluster_rules) {
-       next if $rule->{type} ne 'in';
        $rule->{iface_in} = $rule->{iface} if $rule->{iface};
-       ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" }, undef, $cluster_conf);
+       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
@@ -1693,9 +1708,14 @@ sub enable_host_firewall {
 
     # add host rules first, so that cluster wide rules can be overwritten
     foreach my $rule (@$rules, @$cluster_rules) {
-       next if $rule->{type} ne 'out';
        $rule->{iface_out} = $rule->{iface} if $rule->{iface};
-       ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" }, undef, $cluster_conf);
+       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
@@ -1708,10 +1728,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);