implement delete parameter for rule update API

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

diff --git a/src/PVE/API2/Firewall/Rules.pm b/src/PVE/API2/Firewall/Rules.pm
index 16e22badce94110d9d7e4fcfed4f8c0b569559e9..032631dc39accd40073128c39ebc53f0ca4f1d24 100644 (file)
--- a/src/PVE/API2/Firewall/Rules.pm
+++ b/src/PVE/API2/Firewall/Rules.pm
@@ -136,7 +136,9 @@ sub register_create_rule {
     my $properties = $class->additional_parameters();
 
     my $create_rule_properties = PVE::Firewall::add_rule_properties($properties);
-
+    $create_rule_properties->{action}->{optional} = 0;
+    $create_rule_properties->{type}->{optional} = 0;
+    
     $class->register_method({
        name => 'create_rule',
        path => '',
@@ -154,11 +156,13 @@ sub register_create_rule {
            my ($fw_conf, $rules) = $class->load_config($param);
 
            my $digest = $fw_conf->{digest};
-           
-           my $rule = { type => 'out', action => 'ACCEPT', enable => 0};
+
+           my $rule = {};
 
            PVE::Firewall::copy_rule_data($rule, $param);
 
+           $rule->{enable} = 0 if !defined($param->{enable});
+
            unshift @$rules, $rule;
 
            $class->save_rules($param, $fw_conf, $rules);
@@ -181,6 +185,12 @@ sub register_update_rule {
        optional => 1,
     };
 
+    $properties->{delete} = {
+       type => 'string', format => 'pve-configid-list',
+       description => "A list of settings you want to delete.",
+       optional => 1,
+    };
+
     my $update_rule_properties = PVE::Firewall::add_rule_properties($properties);
 
     $class->register_method({
@@ -219,7 +229,14 @@ sub register_update_rule {
                push @$newrules, $rule if $moveto >= scalar(@$rules);
                $rules = $newrules;
            } else {
+               raise_param_exc({ type => "property is missing"})
+                   if !defined($param->{type});
+               raise_param_exc({ action => "property is missing"})
+                   if !defined($param->{action});
+
                PVE::Firewall::copy_rule_data($rule, $param);
+               
+               PVE::Firewall::delete_rule_properties($rule, $param->{'delete'}) if $param->{'delete'};
            }
 
            $class->save_rules($param, $fw_conf, $rules);
@@ -359,4 +376,35 @@ sub save_rules {
 
 __PACKAGE__->register_handlers();
 
+package PVE::API2::Firewall::VMRules;
+
+use strict;
+use warnings;
+use PVE::JSONSchema qw(get_standard_option);
+
+use base qw(PVE::API2::Firewall::RulesBase);
+
+__PACKAGE__->additional_parameters({ 
+    node => get_standard_option('pve-node'),
+    vmid => get_standard_option('pve-vmid'),                              
+});
+
+sub load_config {
+    my ($class, $param) = @_;
+
+    my $fw_conf = PVE::Firewall::load_vmfw_conf($param->{vmid});
+    my $rules = $fw_conf->{rules};
+
+    return ($fw_conf, $rules);
+}
+
+sub save_rules {
+    my ($class, $param, $fw_conf, $rules) = @_;
+
+    $fw_conf->{rules} = $rules;
+    PVE::Firewall::save_vmfw_conf($param->{vmid}, $fw_conf);
+}
+
+__PACKAGE__->register_handlers();
+
 1;