Proxmox/pve-common
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-common.git synced 2025-03-11 20:58:41 +03:00
Code Releases Activity

SectionConfig: fix handling unknown sections

Browse Source 
if we're parsing an unknown section, we cannot check the schema with
`is_array` to check if it's an array type or not, thus we have to
handle that separately.

fix this by handling data in unknown sections like an array similar to
"cb2646c7b4974e33f4148752deec71f0d589b0f3" in proxmox-section-config.
This way we can write unknown section out again like we parsed it.

Add a regression test for an unknown field not in the schema.

This fixes an issue, where calling `qm destroy ID --purge` removed much
of the configs ob backup jobs (since there we parse an 'unknown' section
and run into the `is_array` error)
(Reported in the forum: https://forum.proxmox.com/threads/132091)

Suggested-by: Fiona Ebner <f.ebner@proxmox.com>
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2023-08-16 11:09:11 +02:00 committed by Fiona Ebner
parent 5738817d17
commit d2a6411cab
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/PVE/SectionConfig.pm
View File

@ -369,17 +369,22 @@ sub parse_config {
my ($k, $v) = ($1, $3);
eval {
if ($is_array->($type, $k)) {
if (!$unknown) {
$v = $plugin->check_value($type, $k, $v, $sectionId);
if ($unknown) {
if (!defined($config->{$k})) {
$config->{$k} = $v;
} else {
if (!ref($config->{$k})) {
$config->{$k} = [$config->{$k}];
}
push $config->{$k}->@*, $v;
}
} elsif ($is_array->($type, $k)) {
$v = $plugin->check_value($type, $k, $v, $sectionId);
$config->{$k} = [] if !defined($config->{$k});
push $config->{$k}->@*, $v;
} else {
die "duplicate attribute\n" if defined($config->{$k});
if (!$unknown) {
$v = $plugin->check_value($type, $k, $v, $sectionId);
}
$v = $plugin->check_value($type, $k, $v, $sectionId);
$config->{$k} = $v;
}
};
@ -525,7 +530,12 @@ sub write_config {
next if defined($done_hash->{$k});
$done_hash->{$k} = 1;
my $v = $scfg->{$k};
$data .= "\t$k $v\n";
my $ref = ref($v);
if (defined($ref) && $ref eq 'ARRAY') {
$data .= "\t$k $_\n" for $v->@*;
} else {
$data .= "\t$k $v\n";
}
}
$out .= "$data\n";
next;

2
test/section_config_test.pl
View File

@ -218,6 +218,7 @@ my $with_unknown_data = {
invalid => {
type => 'bad',
common => 'omg',
unknownfield => 'shouldnotbehere',
},
},
order => enum(qw(t1 t2 invalid t3)),
@ -234,6 +235,7 @@ one: t2
bad: invalid
common omg
unknownfield shouldnotbehere
two: t3
field2 5