[pve-devel] [PATCH pve-manager v2] fix #6932: api: acme: add digest and plugin to return schema

[pve-devel] [PATCH pve-manager v2] fix #6932: api: acme: add digest and plugin to return schema

[Nicolas Frey]

fixes regression from `427e2627 api: add ACME plugin return schema`
by adding digest and plugin parameters and deleting id parameter, as
it is replaced by plugin on return schemas. This mismatch would
result in `400 Result verification failed` on index and
get_plugin_config.

Signed-off-by: Nicolas Frey <n.frey@proxmox.com>
---
 PVE/API2/ACMEPlugin.pm | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/PVE/API2/ACMEPlugin.pm b/PVE/API2/ACMEPlugin.pm
index c12b75c5..2f210903 100644
--- a/PVE/API2/ACMEPlugin.pm
+++ b/PVE/API2/ACMEPlugin.pm
@@ -50,7 +50,17 @@ my $modify_cfg_for_api = sub {
     return $plugin_cfg;
 };
 
-my $acme_challenge_api_create_and_return_schema = PVE::ACME::Challenge->createSchema();
+my $acme_challenge_create_schema = PVE::ACME::Challenge->createSchema();
+my $acme_challenge_return_schema = {
+    type => "object",
+    properties => {
+        PVE::ACME::Challenge->createSchema()->{properties}->%*,
+        digest => get_standard_option('pve-config-digest'),
+        plugin => get_standard_option('pve-acme-pluginid'),
+    },
+};
+# replaced by plugin property
+delete $acme_challenge_return_schema->{properties}->{id};
 
 __PACKAGE__->register_method({
     name => 'index',
@@ -74,7 +84,7 @@ __PACKAGE__->register_method({
     },
     returns => {
         type => 'array',
-        items => $acme_challenge_api_create_and_return_schema,
+        items => $acme_challenge_return_schema,
         links => [{ rel => 'child', href => "{plugin}" }],
     },
     code => sub {
@@ -108,7 +118,7 @@ __PACKAGE__->register_method({
             id => get_standard_option('pve-acme-pluginid'),
         },
     },
-    returns => $acme_challenge_api_create_and_return_schema,
+    returns => $acme_challenge_return_schema,
     code => sub {
         my ($param) = @_;
 
@@ -126,7 +136,7 @@ __PACKAGE__->register_method({
         check => ['perm', '/', ['Sys.Modify']],
     },
     protected => 1,
-    parameters => $acme_challenge_api_create_and_return_schema,
+    parameters => $acme_challenge_create_schema,
     returns => {
         type => "null",
     },
-- 
2.47.3


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel