correctly verify ipset name

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

diff --git a/src/PVE/API2/Firewall/IPSet.pm b/src/PVE/API2/Firewall/IPSet.pm
index 3b62346437a4c87daff381326909992df97bc406..856e5f854a351c3c5b7fda2aae81191acd51ab46 100644 (file)
--- a/src/PVE/API2/Firewall/IPSet.pm
+++ b/src/PVE/API2/Firewall/IPSet.pm
@@ -14,10 +14,7 @@ my $api_properties = {
        description => "Network/IP specification in CIDR format.",
        type => 'string', format => 'IPv4orCIDR',
     },
-    name => {
-       description => "IP set name.",
-       type => 'string',
-    },
+    name => get_standard_option('ipset-name'),
     comment => {
        type => 'string',
        optional => 1,
@@ -291,4 +288,165 @@ sub save_ipset {
 
 __PACKAGE__->register_handlers();
 
+package PVE::API2::Firewall::BaseIPSetList;
+
+use strict;
+use warnings;
+use PVE::JSONSchema qw(get_standard_option);
+use PVE::Exception qw(raise_param_exc);
+use PVE::Firewall;
+
+use base qw(PVE::RESTHandler);
+
+sub register_index {
+    my ($class) = @_;
+
+    $class->register_method({
+       name => 'ipset_index',
+       path => '',
+       method => 'GET',
+       description => "List IPSets",
+       parameters => {
+           additionalProperties => 0,
+       },
+       returns => {
+           type => 'array',
+           items => {
+               type => "object",
+               properties => { 
+                   name => get_standard_option('ipset-name'),
+               },
+           },
+           links => [ { rel => 'child', href => "{name}" } ],
+       },
+       code => sub {
+           my ($param) = @_;
+           
+           my $fw_conf = $class->load_config();
+
+           my $res = [];
+           foreach my $name (keys %{$fw_conf->{ipset}}) {
+               push @$res, { name => $name, count => scalar(@{$fw_conf->{ipset}->{$name}}) };
+           }
+
+           return $res;
+       }});
+}
+
+sub register_create {
+    my ($class) = @_;
+
+    $class->register_method({
+       name => 'create_ipset',
+       path => '',
+       method => 'POST',
+       description => "Create new IPSet",
+       protected => 1,
+       parameters => {
+           additionalProperties => 0,
+           properties => { 
+               name => get_standard_option('ipset-name'),
+               rename => get_standard_option('ipset-name', {
+                   description => "Rename an existing IPSet.",
+                   optional => 1,
+               }),
+           }
+       },
+       returns => { type => 'null' },
+       code => sub {
+           my ($param) = @_;
+           
+           my $fw_conf = $class->load_config();
+
+           foreach my $name (keys %{$fw_conf->{ipset}}) {
+               raise_param_exc({ name => "IPSet '$name' already exists" }) 
+                   if $name eq $param->{name};
+           }
+
+           if ($param->{rename}) {
+               raise_param_exc({ name => "IPSet '$param->{rename}' does not exists" }) 
+                   if !$fw_conf->{ipset}->{$param->{rename}};
+               my $data = delete $fw_conf->{ipset}->{$param->{rename}};
+               $fw_conf->{ipset}->{$param->{name}} = $data;
+           } else {
+               $fw_conf->{ipset}->{$param->{name}} = [];
+           }
+
+           $class->save_config($fw_conf);
+
+           return undef;
+       }});
+}
+
+sub register_delete {
+    my ($class) = @_;
+
+    $class->register_method({
+       name => 'delete_ipset',
+       path => '{name}',
+       method => 'DELETE',
+       description => "Delete IPSet",
+       protected => 1,
+       parameters => {
+           additionalProperties => 0,
+           properties => { 
+               name => get_standard_option('ipset-name'),
+           }
+       },
+       returns => { type => 'null' },
+       code => sub {
+           my ($param) = @_;
+           
+           my $fw_conf = $class->load_config();
+
+           return undef if !$fw_conf->{ipset}->{$param->{name}};
+
+           die "IPSet '$param->{name}' is not empty\n" 
+               if scalar(@{$fw_conf->{ipset}->{$param->{name}}});
+
+           delete $fw_conf->{ipset}->{$param->{name}};
+
+           $class->save_config($fw_conf);
+
+           return undef;
+       }});
+}
+
+sub register_handlers {
+    my ($class) = @_;
+
+    $class->register_index();
+    $class->register_create();
+    $class->register_delete();
+}
+
+package PVE::API2::Firewall::ClusterIPSetList;
+
+use strict;
+use warnings;
+use PVE::Firewall;
+
+use base qw(PVE::API2::Firewall::BaseIPSetList);
+
+sub load_config {
+    my ($class) = @_;
+ 
+    return PVE::Firewall::load_clusterfw_conf();
+}
+
+sub save_config {
+    my ($class, $fw_conf) = @_;
+
+    PVE::Firewall::save_clusterfw_conf($fw_conf);
+}
+
+__PACKAGE__->register_handlers();
+
+__PACKAGE__->register_method ({
+    subclass => "PVE::API2::Firewall::ClusterIPset",  
+    path => '{name}',
+    # set fragment delimiter (no subdirs) - we need that, because CIDR address contain a slash '/' 
+    fragmentDelimiter => '', 
+});
+
 1;