From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id D5C91A1939 for ; Thu, 15 Jun 2023 14:36:47 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B0E6427067 for ; Thu, 15 Jun 2023 14:36:47 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 15 Jun 2023 14:36:47 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id EC247455A4 for ; Thu, 15 Jun 2023 14:36:46 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 15 Jun 2023 14:36:43 +0200 Message-Id: <20230615123643.3570737-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.015 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [jsonschema.pm] Subject: [pve-devel] [PATCH common v2] fix #4778: fix boolean type check for json parameters over the api X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jun 2023 12:36:47 -0000 if a real json boolean is sent via the api, $value is a JSON::PP::Boolean here instead of a string/scalar so we should validate that too the $value itself can be used normally in conditions like ---- if ($value) { ---- if the value is stringified, the result is either '1' or '0' so even if we have some explicit checks like that it should not make a problem Signed-off-by: Dominik Csapak --- change from v1: * put check inside the 'if ref' condition since that will be 'JSON::PP::Boolean' after decoding * added more info to commit message src/PVE/JSONSchema.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/PVE/JSONSchema.pm b/src/PVE/JSONSchema.pm index 85d47f2..60b02cb 100644 --- a/src/PVE/JSONSchema.pm +++ b/src/PVE/JSONSchema.pm @@ -10,6 +10,7 @@ use Devel::Cycle -quiet; # todo: remove? use PVE::Tools qw(split_list $IPV6RE $IPV4RE); use PVE::Exception qw(raise); use HTTP::Status qw(:constants); +use JSON; use Net::IP qw(:PROC); use Data::Dumper; @@ -1040,6 +1041,9 @@ sub check_type { return 1; } else { if ($vt) { + if ($type eq 'boolean' && JSON::is_bool($value)) { + return 1; + } add_error($errors, $path, "type check ('$type') failed - got $vt"); return undef; } else { -- 2.30.2