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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 4822370401 for ; Thu, 1 Apr 2021 17:30:48 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 286A28399 for ; Thu, 1 Apr 2021 17:30:18 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id B1DC78381 for ; Thu, 1 Apr 2021 17:30:16 +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 65FD642F71 for ; Thu, 1 Apr 2021 17:30:16 +0200 (CEST) From: Stefan Reiter To: pve-devel@lists.proxmox.com Date: Thu, 1 Apr 2021 17:30:09 +0200 Message-Id: <20210401153009.18733-2-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210401153009.18733-1-s.reiter@proxmox.com> References: <20210401153009.18733-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -1.167 Adjusted score from AWL reputation of From: address 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 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 2/2] JSONSchema: don't cycle-check 'download' responses 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, 01 Apr 2021 15:30:48 -0000 Signed-off-by: Stefan Reiter --- Note that this happens before the result is put in '->{data}' so that part of the previous patch is not necessary here. src/PVE/JSONSchema.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/PVE/JSONSchema.pm b/src/PVE/JSONSchema.pm index 4864549..c29c777 100644 --- a/src/PVE/JSONSchema.pm +++ b/src/PVE/JSONSchema.pm @@ -1178,7 +1178,10 @@ sub validate { # we can disable that in the final release # todo: is there a better/faster way to detect cycles? my $cycles = 0; - find_cycle($instance, sub { $cycles = 1 }); + # 'download' responses can contain a filehandle, don't cycle-check that as + # it produces a warning + my $is_download = ref($instance) eq 'HASH' && exists($instance->{download}); + find_cycle($instance, sub { $cycles = 1 }) if !$is_download; if ($cycles) { add_error($errors, undef, "data structure contains recursive cycles"); } elsif ($schema) { -- 2.20.1