public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH common] SectionConfig: fix handling unknown sections
Date: Wed, 16 Aug 2023 09:41:46 +0200	[thread overview]
Message-ID: <20230816074146.1382923-1-d.csapak@proxmox.com> (raw)

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 for all
analogous to "cb2646c7b4974e33f4148752deec71f0d589b0f3" in
proxmox-section-config. This way we can write unknown section out again
like we parsed it.

we have to adapt a single test case, which is ok since that is in an
`invalid` section of a config anyway.

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)

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 src/PVE/SectionConfig.pm    | 20 ++++++++++++--------
 test/section_config_test.pl |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/PVE/SectionConfig.pm b/src/PVE/SectionConfig.pm
index 2b75e6a..0ccbda7 100644
--- a/src/PVE/SectionConfig.pm
+++ b/src/PVE/SectionConfig.pm
@@ -369,17 +369,16 @@ 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) {
+			    $config->{$k} = [] if !defined($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 +524,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;
diff --git a/test/section_config_test.pl b/test/section_config_test.pl
index 02242bc..d574150 100755
--- a/test/section_config_test.pl
+++ b/test/section_config_test.pl
@@ -217,7 +217,7 @@ my $with_unknown_data = {
 	},
 	invalid => {
 	    type => 'bad',
-	    common => 'omg',
+	    common => ['omg'],
 	},
     },
     order => enum(qw(t1 t2 invalid t3)),
-- 
2.30.2





             reply	other threads:[~2023-08-16  7:42 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-16  7:41 Dominik Csapak [this message]
2023-08-16  8:00 ` Fiona Ebner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230816074146.1382923-1-d.csapak@proxmox.com \
    --to=d.csapak@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal