all lists on 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 http-server v3 1/2] proxy request: forward json content type and parameters
Date: Tue,  6 Jun 2023 15:08:48 +0200	[thread overview]
Message-ID: <20230606130851.260129-5-d.csapak@proxmox.com> (raw)
In-Reply-To: <20230606130851.260129-1-d.csapak@proxmox.com>

instead of always trying to encode them as x-www-form-urlencoded

Acked-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 src/PVE/APIServer/AnyEvent.pm | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/PVE/APIServer/AnyEvent.pm b/src/PVE/APIServer/AnyEvent.pm
index b2ae99b..e9d87b3 100644
--- a/src/PVE/APIServer/AnyEvent.pm
+++ b/src/PVE/APIServer/AnyEvent.pm
@@ -745,11 +745,16 @@ sub proxy_request {
 	my $content;
 
 	if  ($method eq 'POST' || $method eq 'PUT') {
-	    $headers->{'Content-Type'} = 'application/x-www-form-urlencoded';
-	    # use URI object to format application/x-www-form-urlencoded content.
-	    my $url = URI->new('http:');
-	    $url->query_form(%$params);
-	    $content = $url->query;
+	    if ($reqstate->{request}->header('Content-Type') =~ 'application/json') {
+		$headers->{'Content-Type'} = 'application/json';
+		$content = encode_json($params);
+	    } else {
+		$headers->{'Content-Type'} = 'application/x-www-form-urlencoded';
+		# use URI object to format application/x-www-form-urlencoded content.
+		my $url = URI->new('http:');
+		$url->query_form(%$params);
+		$content = $url->query;
+	    }
 	    if (defined($content)) {
 		$headers->{'Content-Length'} = length($content);
 	    }
-- 
2.30.2





  parent reply	other threads:[~2023-06-06 13:08 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-06 13:08 [pve-devel] [PATCH common/http/guest-common/qemu-server v3] schema/config array support Dominik Csapak
2023-06-06 13:08 ` [pve-devel] [PATCH common v3 1/3] JSONSchema: add support for array parameter in api calls, cli and config Dominik Csapak
2023-06-07 11:15   ` [pve-devel] applied: " Wolfgang Bumiller
2023-06-06 13:08 ` [pve-devel] [PATCH common v3 2/3] section config: implement array support Dominik Csapak
2023-06-06 13:08 ` [pve-devel] [PATCH common v3 3/3] JSONSchema: disable '-alist' format Dominik Csapak
2023-06-06 13:08 ` Dominik Csapak [this message]
2023-06-07 11:23   ` [pve-devel] applied: [PATCH http-server v3 1/2] proxy request: forward json content type and parameters Wolfgang Bumiller
2023-06-07 11:47     ` Thomas Lamprecht
2023-06-07 11:49       ` Dominik Csapak
2023-06-07 11:59         ` Thomas Lamprecht
2023-06-07 12:08           ` Wolfgang Bumiller
2023-06-07 12:14             ` Thomas Lamprecht
2023-06-07 12:23               ` Wolfgang Bumiller
2023-06-07 12:25                 ` Wolfgang Bumiller
2023-06-07 12:32                   ` Thomas Lamprecht
2023-06-06 13:08 ` [pve-devel] [PATCH http-server v3 2/2] use proper arrays for array parameter Dominik Csapak
2023-06-07  5:24   ` Dominik Csapak
2023-06-06 13:08 ` [pve-devel] [PATCH guest-common v3 1/1] vzdump: change 'exclude-path' from alist to an array format Dominik Csapak
2023-06-07 11:43   ` [pve-devel] applied: " Wolfgang Bumiller
2023-06-06 13:08 ` [pve-devel] [PATCH qemu-server v3 1/1] api: switch agent api call to 'array' type Dominik Csapak
2023-06-07 11:55   ` [pve-devel] applied: " Wolfgang Bumiller
2023-06-07 11:55 ` [pve-devel] applied-series: [PATCH common/http/guest-common/qemu-server v3] schema/config array support 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=20230606130851.260129-5-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal