public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 1/2] proxmox-backup-debug api: parse parameters before sending to api
Date: Tue,  8 Mar 2022 13:20:56 +0100	[thread overview]
Message-ID: <20220308122057.3059305-1-d.csapak@proxmox.com> (raw)

when we use http to make the api call, we have to parse the parameters
before, else we might send the string "true" instead of the boolean true
and the api rejects it with a 'Parameter verification error'.

We already have all api call schemas here, so parsing is possible.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 src/bin/proxmox_backup_debug/api.rs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/bin/proxmox_backup_debug/api.rs b/src/bin/proxmox_backup_debug/api.rs
index dd8c0e6b..64a4c01b 100644
--- a/src/bin/proxmox_backup_debug/api.rs
+++ b/src/bin/proxmox_backup_debug/api.rs
@@ -143,7 +143,7 @@ fn get_api_method(
 }
 
 fn merge_parameters(
-    uri_param: HashMap<String, String>,
+    uri_param: &HashMap<String, String>,
     param: Option<Value>,
     schema: ParameterSchema,
 ) -> Result<Value, Error> {
@@ -179,14 +179,18 @@ async fn call_api(
     rpcenv: &mut dyn RpcEnvironment,
     params: Option<Value>,
 ) -> Result<Value, Error> {
+    let (api_method, uri_params) = get_api_method(method, path)?;
+    let mut params = merge_parameters(&uri_params, params, api_method.parameters)?;
+
     if use_http_client() {
-        return call_api_http(method, path, params).await;
+        // remove url parameters here
+        for (param, _) in uri_params {
+            params.as_object_mut().unwrap().remove(&param);
+        }
+        return call_api_http(method, path, Some(params)).await;
     }
 
-    let (method, uri_param) = get_api_method(method, path)?;
-    let params = merge_parameters(uri_param, params, method.parameters)?;
-
-    call_api_code(method, rpcenv, params).await
+    call_api_code(api_method, rpcenv, params).await
 }
 
 async fn call_api_http(method: &str, path: &str, params: Option<Value>) -> Result<Value, Error> {
-- 
2.30.2





             reply	other threads:[~2022-03-08 12:20 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-08 12:20 Dominik Csapak [this message]
2022-03-08 12:20 ` [pbs-devel] [PATCH proxmox-backup 2/2] proxmox-backup-debug api: rustfmt fixes Dominik Csapak
2022-03-09  9:13 ` [pbs-devel] applied-series: [PATCH proxmox-backup 1/2] proxmox-backup-debug api: parse parameters before sending to api Wolfgang Bumiller

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=20220308122057.3059305-1-d.csapak@proxmox.com \
    --to=d.csapak@proxmox.com \
    --cc=pbs-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