From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH backup 1/4] add tools::json for canonical json generation
Date: Fri, 15 Jan 2021 10:20:46 +0100 [thread overview]
Message-ID: <20210115092049.16706-1-w.bumiller@proxmox.com> (raw)
moving this from backup::manifest, no functional changes
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
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<Vec<u8>, Error> {
+ let mut data = Vec::new();
+ write_canonical_json(value, &mut data)?;
+ Ok(data)
+}
+
+pub fn write_canonical_json(value: &Value, output: &mut Vec<u8>) -> 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
next reply other threads:[~2021-01-15 9:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-15 9:20 Wolfgang Bumiller [this message]
2021-01-15 9:20 ` [pbs-devel] [PATCH backup 2/4] bakckup::manifest: use tools::json for canonical representation Wolfgang Bumiller
2021-01-15 9:20 ` [pbs-devel] [PATCH backup 3/4] tfa: add webauthn configuration API entry points Wolfgang Bumiller
2021-01-15 9:20 ` [pbs-devel] [PATCH backup 4/4] gui: tfa configuration Wolfgang Bumiller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210115092049.16706-1-w.bumiller@proxmox.com \
--to=w.bumiller@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox