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 F3B5068CDE for ; Fri, 15 Jan 2021 10:21:21 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E79A12299C for ; Fri, 15 Jan 2021 10:20:51 +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 278DB22994 for ; Fri, 15 Jan 2021 10:20:51 +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 D479F455EE for ; Fri, 15 Jan 2021 10:20:50 +0100 (CET) From: Wolfgang Bumiller To: pbs-devel@lists.proxmox.com Date: Fri, 15 Jan 2021 10:20:46 +0100 Message-Id: <20210115092049.16706-1-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.053 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. [json.rs, tools.rs] Subject: [pbs-devel] [PATCH backup 1/4] add tools::json for canonical json generation 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 09:21:22 -0000 moving this from backup::manifest, no functional changes Signed-off-by: Wolfgang Bumiller --- src/tools.rs | 1 + src/tools/json.rs | 49 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 src/tools/json.rs diff --git a/src/tools.rs b/src/tools.rs index 599bbd04..d96cd647 100644 --- a/src/tools.rs +++ b/src/tools.rs @@ -28,6 +28,7 @@ pub mod format; pub mod fs; pub mod fuse_loop; pub mod http; +pub mod json; pub mod logrotate; pub mod loopdev; pub mod lru_cache; diff --git a/src/tools/json.rs b/src/tools/json.rs new file mode 100644 index 00000000..c81afccb --- /dev/null +++ b/src/tools/json.rs @@ -0,0 +1,49 @@ +use anyhow::{bail, Error}; +use serde_json::Value; + +// Generate canonical json +pub fn to_canonical_json(value: &Value) -> Result, Error> { + let mut data = Vec::new(); + write_canonical_json(value, &mut data)?; + Ok(data) +} + +pub 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() { + write_canonical_json(item, output)?; + for item in iter { + output.push(b','); + 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':'); + write_canonical_json(&map[key], output)?; + for key in iter { + output.push(b','); + serde_json::to_writer(&mut *output, &key)?; + output.push(b':'); + write_canonical_json(&map[key], output)?; + } + } + output.push(b'}'); + } + } + Ok(()) +} -- 2.20.1