fix port parser

[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 cd3ea7e8bbe26a5e6d7fabb5151566da4ac3c26d..d9ba2f4d6acbd0fb366bf0d3a870eb30b5830cd9 100644 (file)
--- a/src/PVE/API2/Firewall/Rules.pm
+++ b/src/PVE/API2/Firewall/Rules.pm
@@ -32,6 +32,10 @@ sub save_rules {
 
 my $additional_param_hash = {};
 
+sub allow_groups {
+    return 1;
+}
+
 sub additional_parameters {
     my ($class, $new_value) = @_;
 
@@ -136,7 +140,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,10 +160,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);
+           PVE::Firewall::verify_rule($rule, $class->allow_groups());
+
+           $rule->{enable} = 0 if !defined($param->{enable});
 
            unshift @$rules, $rule;
 
@@ -181,6 +190,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 +234,16 @@ 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'};
+
+               PVE::Firewall::verify_rule($rule, $class->allow_groups());
            }
 
            $class->save_rules($param, $fw_conf, $rules);
@@ -287,6 +311,10 @@ __PACKAGE__->additional_parameters({ group => {
     maxLength => 20, # fixme: what length?
 }});
 
+sub allow_groups {
+    return 0;
+}
+
 sub load_config {
     my ($class, $param) = @_;