cleanup firewall service implementation

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

diff --git a/src/PVE/API2/Firewall/Groups.pm b/src/PVE/API2/Firewall/Groups.pm
index 8b65f215e6b7eea5acb65d6c72136e98f7f5edef..9e4d08a4f260dd31e0a28268bff4ecc2c680379d 100644 (file)
--- a/src/PVE/API2/Firewall/Groups.pm
+++ b/src/PVE/API2/Firewall/Groups.pm
@@ -12,6 +12,25 @@ use Data::Dumper; # fixme: remove
 
 use base qw(PVE::RESTHandler);
 
+my $get_security_group_list = sub {
+    my ($cluster_conf) = @_;
+
+    my $res = [];
+    foreach my $group (keys %{$cluster_conf->{groups}}) {
+       my $data = { 
+           group => $group,
+       };
+       if (my $comment = $cluster_conf->{group_comments}->{$group}) {
+           $data->{comment} = $comment;
+       }
+       push @$res, $data;
+    }
+
+    my ($list, $digest) = PVE::Firewall::copy_list_with_digest($res);
+
+    return wantarray ? ($list, $digest) : $list;
+};
+
 __PACKAGE__->register_method({
     name => 'list_security_groups',
     path => '',
@@ -19,13 +38,14 @@ __PACKAGE__->register_method({
     description => "List security groups.",
     parameters => {
        additionalProperties => 0,
+       properties => {},
     },
     returns => {
        type => 'array',
        items => {
            type => "object",
            properties => { 
-               name => get_standard_option('pve-security-group-name'),
+               group => get_standard_option('pve-security-group-name'),
                digest => get_standard_option('pve-config-digest', { optional => 0} ),
                comment => { 
                    type => 'string',
@@ -33,29 +53,14 @@ __PACKAGE__->register_method({
                }
            },
        },
-       links => [ { rel => 'child', href => "{name}" } ],
+       links => [ { rel => 'child', href => "{group}" } ],
     },
     code => sub {
        my ($param) = @_;
 
        my $cluster_conf = PVE::Firewall::load_clusterfw_conf();
 
-       my $digest = $cluster_conf->{digest};
-
-       my $res = [];
-       foreach my $group (keys %{$cluster_conf->{groups}}) {
-           my $data = { 
-               name => $group,
-               digest => $digest,
-               count => scalar(@{$cluster_conf->{groups}->{$group}}) 
-           };
-           if (my $comment = $cluster_conf->{group_comments}->{$group}) {
-               $data->{comment} = $comment;
-           }
-           push @$res, $data;
-       }
-
-       return $res;
+       return &$get_security_group_list($cluster_conf);
     }});
 
 __PACKAGE__->register_method({
@@ -67,7 +72,7 @@ __PACKAGE__->register_method({
     parameters => {
        additionalProperties => 0,
        properties => { 
-           name => get_standard_option('pve-security-group-name'),
+           group => get_standard_option('pve-security-group-name'),
            comment => {
                type => 'string',
                optional => 1,
@@ -85,27 +90,27 @@ __PACKAGE__->register_method({
 
        my $cluster_conf = PVE::Firewall::load_clusterfw_conf();
 
-       my $digest = $cluster_conf->{digest};
-
-       PVE::Tools::assert_if_modified($digest, $param->{digest});
-
-       foreach my $name (keys %{$cluster_conf->{groups}}) {
-           raise_param_exc({ name => "Security group '$name' already exists" }) 
-               if !$param->{rename} && $name eq $param->{name};
-       }
-
        if ($param->{rename}) {
-           raise_param_exc({ name => "Security group '$param->{rename}' does not exists" }) 
+           my (undef, $digest) = &$get_security_group_list($cluster_conf);
+           PVE::Tools::assert_if_modified($digest, $param->{digest});
+
+           raise_param_exc({ group => "Security group '$param->{rename}' does not exists" }) 
                if !$cluster_conf->{groups}->{$param->{rename}};
+
            my $data = delete $cluster_conf->{groups}->{$param->{rename}};
-           $cluster_conf->{groups}->{$param->{name}} = $data;
+           $cluster_conf->{groups}->{$param->{group}} = $data;
            if (my $comment = delete $cluster_conf->{group_comments}->{$param->{rename}}) {
-               $cluster_conf->{group_comments}->{$param->{name}} = $comment;
+               $cluster_conf->{group_comments}->{$param->{group}} = $comment;
            }
-           $cluster_conf->{group_comments}->{$param->{name}} = $param->{comment} if defined($param->{comment});
+           $cluster_conf->{group_comments}->{$param->{group}} = $param->{comment} if defined($param->{comment});
        } else {
-           $cluster_conf->{groups}->{$param->{name}} = [];
-           $cluster_conf->{group_comments}->{$param->{name}} = $param->{comment} if defined($param->{comment});
+           foreach my $name (keys %{$cluster_conf->{groups}}) {
+               raise_param_exc({ group => "Security group '$name' already exists" }) 
+                   if $name eq $param->{group};
+           }
+
+           $cluster_conf->{groups}->{$param->{group}} = [];
+           $cluster_conf->{group_comments}->{$param->{group}} = $param->{comment} if defined($param->{comment});
        }
 
        PVE::Firewall::save_clusterfw_conf($cluster_conf);
@@ -115,16 +120,16 @@ __PACKAGE__->register_method({
 
 __PACKAGE__->register_method({
     name => 'delete_security_group',
-    path => '{name}',
+    path => '{group}',
     method => 'DELETE',
     description => "Delete security group.",
     protected => 1,
     parameters => {
        additionalProperties => 0,
        properties => { 
-           name => get_standard_option('pve-security-group-name'),
+           group => get_standard_option('pve-security-group-name'),
            digest => get_standard_option('pve-config-digest'),
-       }
+       },
     },
     returns => { type => 'null' },
     code => sub {
@@ -132,14 +137,15 @@ __PACKAGE__->register_method({
            
        my $cluster_conf = PVE::Firewall::load_clusterfw_conf();
 
-       PVE::Tools::assert_if_modified($cluster_conf->{digest}, $param->{digest});
+       return undef if !$cluster_conf->{groups}->{$param->{group}};
 
-       return undef if !$cluster_conf->{groups}->{$param->{name}};
+       my (undef, $digest) = &$get_security_group_list($cluster_conf);
+       PVE::Tools::assert_if_modified($digest, $param->{digest});
 
-       die "Security group '$param->{name}' is not empty\n" 
-           if scalar(@{$cluster_conf->{groups}->{$param->{name}}});
+       die "Security group '$param->{group}' is not empty\n" 
+           if scalar(@{$cluster_conf->{groups}->{$param->{group}}});
 
-       delete $cluster_conf->{groups}->{$param->{name}};
+       delete $cluster_conf->{groups}->{$param->{group}};
 
        PVE::Firewall::save_clusterfw_conf($cluster_conf);