grammar fix: s/does not exists/does not exist/g

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

diff --git a/src/PVE/API2/Firewall/Aliases.pm b/src/PVE/API2/Firewall/Aliases.pm
index 1a637deac6bfa0e291f389202726e39a2b785045..2a66abdbbe72d47ff179f10cddfa37e0e64ca13f 100644 (file)
--- a/src/PVE/API2/Firewall/Aliases.pm
+++ b/src/PVE/API2/Firewall/Aliases.pm
@@ -9,10 +9,10 @@ use PVE::Firewall;
 
 use base qw(PVE::RESTHandler);
 
-my $api_properties = { 
+my $api_properties = {
     cidr => {
        description => "Network/IP specification in CIDR format.",
-       type => 'string', format => 'IPv4orCIDR',
+       type => 'string', format => 'IPorCIDR',
     },
     name => get_standard_option('pve-fw-alias'),
     rename => get_standard_option('pve-fw-alias', {
@@ -39,6 +39,12 @@ sub save_aliases {
     die "implement this in subclass";
 }
 
+sub rule_env {
+    my ($class, $param) = @_;
+
+    die "implement this in subclass";
+}
+
 my $additional_param_hash = {};
 
 sub additional_parameters {
@@ -75,6 +81,7 @@ sub register_get_aliases {
        path => '',
        method => 'GET',
        description => "List aliases",
+       permissions => PVE::Firewall::rules_audit_permissions($class->rule_env()),
        parameters => {
            additionalProperties => 0,
            properties => $properties,
@@ -90,7 +97,7 @@ sub register_get_aliases {
                        type => 'string',
                        optional => 1,
                    },
-                   digest => get_standard_option('pve-config-digest', { optional => 0} ),      
+                   digest => get_standard_option('pve-config-digest', { optional => 0} ),
                },
            },
            links => [ { rel => 'child', href => "{name}" } ],
@@ -120,6 +127,7 @@ sub register_create_alias {
        path => '',
        method => 'POST',
        description => "Create IP or Network Alias.",
+       permissions => PVE::Firewall::rules_modify_permissions($class->rule_env()),
        protected => 1,
        parameters => {
            additionalProperties => 0,
@@ -132,10 +140,10 @@ sub register_create_alias {
            my ($fw_conf, $aliases) = $class->load_config($param);
 
            my $name = lc($param->{name});
-           
-           raise_param_exc({ name => "alias '$param->{name}' already exists" }) 
+
+           raise_param_exc({ name => "alias '$param->{name}' already exists" })
                if defined($aliases->{$name});
-           
+
            my $data = { name => $param->{name}, cidr => $param->{cidr} };
            $data->{comment} = $param->{comment} if $param->{comment};
 
@@ -153,12 +161,13 @@ sub register_read_alias {
     my $properties = $class->additional_parameters();
 
     $properties->{name} = $api_properties->{name};
-    
+
     $class->register_method({
        name => 'read_alias',
        path => '{name}',
        method => 'GET',
        description => "Read alias.",
+       permissions => PVE::Firewall::rules_audit_permissions($class->rule_env()),
        parameters => {
            additionalProperties => 0,
            properties => $properties,
@@ -194,6 +203,7 @@ sub register_update_alias {
        path => '{name}',
        method => 'PUT',
        description => "Update IP or Network alias.",
+       permissions => PVE::Firewall::rules_modify_permissions($class->rule_env()),
        protected => 1,
        parameters => {
            additionalProperties => 0,
@@ -220,10 +230,11 @@ sub register_update_alias {
 
            $aliases->{$name} = $data;
 
-           my $rename = lc($param->{rename});
+           my $rename = $param->{rename};
+           $rename = lc($rename) if $rename;
 
            if ($rename && ($name ne $rename)) {
-               raise_param_exc({ name => "alias '$param->{rename}' already exists" }) 
+               raise_param_exc({ name => "alias '$param->{rename}' already exists" })
                    if defined($aliases->{$rename});
                $aliases->{$name}->{name} = $param->{rename};
                $aliases->{$rename} = $aliases->{$name};
@@ -249,6 +260,7 @@ sub register_delete_alias {
        path => '{name}',
        method => 'DELETE',
        description => "Remove IP or Network alias.",
+       permissions => PVE::Firewall::rules_modify_permissions($class->rule_env()),
        protected => 1,
        parameters => {
            additionalProperties => 0,
@@ -268,7 +280,7 @@ sub register_delete_alias {
            delete $aliases->{$name};
 
            $class->save_aliases($param, $fw_conf, $aliases);
-           
+
            return undef;
        }});
 }
@@ -290,6 +302,12 @@ use warnings;
 
 use base qw(PVE::API2::Firewall::AliasesBase);
 
+sub rule_env {
+    my ($class, $param) = @_;
+
+    return 'cluster';
+}
+
 sub load_config {
     my ($class, $param) = @_;
 
@@ -316,15 +334,22 @@ use PVE::JSONSchema qw(get_standard_option);
 
 use base qw(PVE::API2::Firewall::AliasesBase);
 
-__PACKAGE__->additional_parameters({ 
+sub rule_env {
+    my ($class, $param) = @_;
+
+    return 'vm';
+}
+
+__PACKAGE__->additional_parameters({
     node => get_standard_option('pve-node'),
-    vmid => get_standard_option('pve-vmid'),                              
+    vmid => get_standard_option('pve-vmid'),
 });
 
 sub load_config {
     my ($class, $param) = @_;
 
-    my $fw_conf = PVE::Firewall::load_vmfw_conf('vm', $param->{vmid});
+    my $cluster_conf = PVE::Firewall::load_clusterfw_conf();
+    my $fw_conf = PVE::Firewall::load_vmfw_conf($cluster_conf, 'vm', $param->{vmid});
     my $aliases = $fw_conf->{aliases};
 
     return ($fw_conf, $aliases);
@@ -347,15 +372,22 @@ use PVE::JSONSchema qw(get_standard_option);
 
 use base qw(PVE::API2::Firewall::AliasesBase);
 
-__PACKAGE__->additional_parameters({ 
+sub rule_env {
+    my ($class, $param) = @_;
+
+    return 'ct';
+}
+
+__PACKAGE__->additional_parameters({
     node => get_standard_option('pve-node'),
-    vmid => get_standard_option('pve-vmid'),                              
+    vmid => get_standard_option('pve-vmid'),
 });
 
 sub load_config {
     my ($class, $param) = @_;
 
-    my $fw_conf = PVE::Firewall::load_vmfw_conf('ct', $param->{vmid});
+    my $cluster_conf = PVE::Firewall::load_clusterfw_conf();
+    my $fw_conf = PVE::Firewall::load_vmfw_conf($cluster_conf, 'ct', $param->{vmid});
     my $aliases = $fw_conf->{aliases};
 
     return ($fw_conf, $aliases);