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 D50A468D6B for ; Fri, 15 Jan 2021 11:06:50 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CBC2A232A3 for ; Fri, 15 Jan 2021 11:06:20 +0100 (CET) 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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 4D1BC23281 for ; Fri, 15 Jan 2021 11:06:19 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 11C5645250 for ; Fri, 15 Jan 2021 11:06:19 +0100 (CET) From: Wolfgang Bumiller To: pbs-devel@lists.proxmox.com Date: Fri, 15 Jan 2021 11:06:16 +0100 Message-Id: <20210115100618.1208-2-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210115100618.1208-1-w.bumiller@proxmox.com> References: <20210115100618.1208-1-w.bumiller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.051 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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. [manifest.rs] Subject: [pbs-devel] [PATCH v2 backup 2/4] bakckup::manifest: use tools::json for canonical representation 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: Fri, 15 Jan 2021 10:06:50 -0000 Signed-off-by: Wolfgang Bumiller --- no changs since v2 src/backup/manifest.rs | 44 +----------------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/src/backup/manifest.rs b/src/backup/manifest.rs index 8742cb0a..d9a55655 100644 --- a/src/backup/manifest.rs +++ b/src/backup/manifest.rs @@ -149,49 +149,7 @@ impl BackupManifest { // Generate canonical json fn to_canonical_json(value: &Value) -> Result, Error> { - let mut data = Vec::new(); - Self::write_canonical_json(value, &mut data)?; - Ok(data) - } - - fn write_canonical_json(value: &Value, output: &mut Vec) -> Result<(), Error> { - match value { - Value::Null => bail!("got unexpected null value"), - Value::String(_) | Value::Number(_) | Value::Bool(_) => { - serde_json::to_writer(output, &value)?; - } - Value::Array(list) => { - output.push(b'['); - let mut iter = list.iter(); - if let Some(item) = iter.next() { - Self::write_canonical_json(item, output)?; - for item in iter { - output.push(b','); - Self::write_canonical_json(item, output)?; - } - } - output.push(b']'); - } - Value::Object(map) => { - output.push(b'{'); - let mut keys: Vec<&str> = map.keys().map(String::as_str).collect(); - keys.sort(); - let mut iter = keys.into_iter(); - if let Some(key) = iter.next() { - serde_json::to_writer(&mut *output, &key)?; - output.push(b':'); - Self::write_canonical_json(&map[key], output)?; - for key in iter { - output.push(b','); - serde_json::to_writer(&mut *output, &key)?; - output.push(b':'); - Self::write_canonical_json(&map[key], output)?; - } - } - output.push(b'}'); - } - } - Ok(()) + crate::tools::json::to_canonical_json(value) } /// Compute manifest signature -- 2.20.1