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 DAEAC6D6AE for ; Tue, 28 Sep 2021 12:39:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D1EA0D1D4 for ; Tue, 28 Sep 2021 12:39:13 +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 id 59A29D1CB for ; Tue, 28 Sep 2021 12:39:13 +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 2339D4247C; Tue, 28 Sep 2021 12:39:13 +0200 (CEST) From: Dietmar Maurer To: pbs-devel@lists.proxmox.com Date: Tue, 28 Sep 2021 12:39:04 +0200 Message-Id: <20210928103904.4058186-1-dietmar@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.570 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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. [schema.rs] Subject: [pbs-devel] [PATCH proxmox] ParameterError: construct XPath like string to identify nested properties X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Sep 2021 10:39:13 -0000 --- proxmox/src/api/schema.rs | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/proxmox/src/api/schema.rs b/proxmox/src/api/schema.rs index 10e84f7..1d2000f 100644 --- a/proxmox/src/api/schema.rs +++ b/proxmox/src/api/schema.rs @@ -46,6 +46,17 @@ impl ParameterError { pub fn is_empty(&self) -> bool { self.len() == 0 } + + pub fn add_errors(&mut self, prefix: &str, err: Error) { + if let Some(param_err) = err.downcast_ref::() { + for (sub_key, sub_err) in param_err.errors().iter() { + self.push(format!("{}/{}", prefix, sub_key), format_err!("{}", sub_err)); + } + } else { + self.push(prefix.to_string(), err); + } + } + } impl fmt::Display for ParameterError { @@ -1079,8 +1090,13 @@ pub fn verify_json_array(data: &Value, schema: &ArraySchema) -> Result<(), Error schema.check_length(list.len())?; - for item in list { - verify_json(item, &schema.items)?; + for (i, item) in list.iter().enumerate() { + let result = verify_json(item, &schema.items); + if let Err(err) = result { + let mut errors = ParameterError::new(); + errors.add_errors(&format!("[{}]", i), err); + return Err(errors.into()); + } } Ok(()) @@ -1097,7 +1113,6 @@ pub fn verify_json_object( _ => bail!("Expected object - got scalar value."), }; - // fixme: improve error messages from nested objects/arrays let mut errors = ParameterError::new(); let additional_properties = schema.additional_properties(); @@ -1110,7 +1125,7 @@ pub fn verify_json_object( _ => verify_json(value, prop_schema), }; if let Err(err) = result { - errors.push(key.to_string(), err); + errors.add_errors(key, err); }; } else if !additional_properties { errors.push(key.to_string(), format_err!("schema does not allow additional properties.")); -- 2.30.2