The 'resources' property is required (i.e., not optional) for all rule types and the 'nodes' property is required for node affinity rules.
Though setting these as required does not prevent users from setting them to an empty string as non-optional properties are only checked for definedness in PVE::JSONSchema at the moment. This allows users to write invalid rule sections to the rules config as subsequent config reads will complain about the missing required options not being set as PVE::SectionConfig::write_config(...) will drop these if their values evaluate to empty strings. Therefore, add an additional check to prevent users from being able to pass empty nodes and/or resource lists when creating or modifying existing HA rules. Fixes: https://bugzilla.proxmox.com/show_bug.cgi?id=7399 Signed-off-by: Daniel Kral <[email protected]> --- src/PVE/API2/HA/Rules.pm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/PVE/API2/HA/Rules.pm b/src/PVE/API2/HA/Rules.pm index 046a4a9b..f09ab362 100644 --- a/src/PVE/API2/HA/Rules.pm +++ b/src/PVE/API2/HA/Rules.pm @@ -42,9 +42,11 @@ my $get_api_ha_rule = sub { return $cfg; }; -my $assert_resources_are_configured = sub { +my $assert_valid_resources_param = sub { my ($resources) = @_; + die "no resources were specified\n" if !%$resources; + my $unconfigured_resources = []; for my $resource (sort keys %$resources) { @@ -56,9 +58,11 @@ my $assert_resources_are_configured = sub { if @$unconfigured_resources; }; -my $assert_nodes_do_exist = sub { +my $assert_valid_nodes_param = sub { my ($nodes) = @_; + die "no nodes were specified\n" if !%$nodes; + my $nonexistent_nodes = []; my $localnode = PVE::INotify::nodename(); @@ -281,8 +285,8 @@ __PACKAGE__->register_method({ die "HA rule '$ruleid' already defined\n" if $rules->{ids}->{$ruleid}; - $assert_resources_are_configured->($opts->{resources}); - $assert_nodes_do_exist->($opts->{nodes}) if $opts->{nodes}; + $assert_valid_resources_param->($opts->{resources}); + $assert_valid_nodes_param->($opts->{nodes}) if $opts->{nodes}; $rules->{order}->{$ruleid} = PVE::HA::Rules::get_next_ordinal($rules); $rules->{ids}->{$ruleid} = $opts; @@ -339,8 +343,8 @@ __PACKAGE__->register_method({ my $plugin = PVE::HA::Rules->lookup($type); my $opts = $plugin->check_config($ruleid, $param, 0, 1); - $assert_resources_are_configured->($opts->{resources}); - $assert_nodes_do_exist->($opts->{nodes}) if $opts->{nodes}; + $assert_valid_resources_param->($opts->{resources}); + $assert_valid_nodes_param->($opts->{nodes}) if $opts->{nodes}; my $options = $plugin->private()->{options}->{$type}; PVE::SectionConfig::delete_from_config($rule, $options, $opts, $delete); -- 2.47.3
