Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Archive writing and reading #104

Merged
merged 6 commits into from
Dec 26, 2022
Merged

Archive writing and reading #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0edaab5
Add tar/flate2 dependencies.
tmpfs Dec 26, 2022
037fc08
Upgrade clap, replace atty with is-terminal.
tmpfs Dec 26, 2022
0bf262e
Prepare archive writer and manifest.
tmpfs Dec 26, 2022
0290432
Preparing archive reader.
tmpfs Dec 26, 2022
81f4485
Assert on archive read.
tmpfs Dec 26, 2022
df1c46a
Fix clippy warnings.
tmpfs Dec 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
619 changes: 299 additions & 320 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ exclude = [

[dependencies]
thiserror = "1"
clap = { version = "3.2.20", features = ["derive", "wrap_help"] }
clap = { version = "4", features = ["derive", "wrap_help"] }
tracing = "0.1"
tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
sos-core = { path = "../library/workspace/core" }
Expand Down
2 changes: 1 addition & 1 deletion workspace/agent/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ publish = false

[dependencies]
thiserror = "1"
clap = { version = "3.2.20", features = ["derive", "wrap_help"] }
clap = { version = "4", features = ["derive", "wrap_help"] }
sos-node = { path = "../node", version = "0.1.0", default-features = false, features = ["agent-server"] }
tracing = "0.1"
tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
Expand Down
4 changes: 2 additions & 2 deletions workspace/audit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ publish = false

[dependencies]
thiserror = "1"
clap = { version = "3.2.20", features = ["derive", "wrap_help"] }
clap = { version = "4", features = ["derive", "wrap_help"] }
sos-core = { path = "../core", version = "0.1.0" }
serde_json = "1"
tracing = "0.1"
tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
web3-address = { version = "0.4", features = ["ethereum"] }
web3-address = { version = "0.4.1", features = ["ethereum"] }

[[bin]]
name = "sos-audit"
Expand Down
2 changes: 0 additions & 2 deletions workspace/audit/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ enum Command {
address: Vec<Address>,

/// Audit log file
#[clap(parse(from_os_str))]
audit_log: PathBuf,
},
/// Monitor changes to an audit log file
Expand All @@ -47,7 +46,6 @@ enum Command {
address: Vec<Address>,

/// Audit log file
#[clap(parse(from_os_str))]
audit_log: PathBuf,
},
}
Expand Down
2 changes: 1 addition & 1 deletion workspace/check/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ publish = false
[dependencies]
thiserror = "1"
sos-core = { path = "../core", version = "0.1.0" }
clap = { version = "3.2.20", features = ["derive", "wrap_help"] }
clap = { version = "4", features = ["derive", "wrap_help"] }
tracing = "0.1"
tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
hex = "0.4"
Expand Down
4 changes: 2 additions & 2 deletions workspace/client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ thiserror = "1"
sos-core = { path = "../core", version = "0.1.0" }
sos-node = { path = "../node", version = "0.1.0", default-features = false, features = ["client", "agent-client"] }
sos-readline = { path = "../readline", version = "0.1.0" }
clap = { version = "3.2.20", features = ["derive", "wrap_help"] }
clap = { version = "4", features = ["derive", "wrap_help"] }
tokio = { version = "1", features = ["full"] }
url = "2"
futures = "0.3"
Expand All @@ -27,7 +27,7 @@ shell-words = "1"
terminal-banner = "0.1"
zeroize = "1.4"
secrecy = "0.8"
web3-address = { version = "0.4", features = ["ethereum"] }
web3-address = { version = "0.4.1", features = ["ethereum"] }

vcard4 = { version = "0.1.4", features = ["serde"] }

Expand Down
1 change: 0 additions & 1 deletion workspace/client/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ enum Command {
name: Option<String>,

/// Directory to write the signing keystore.
#[clap(parse(from_os_str))]
keystore: PathBuf,
},
/// Launch the interactive shell.
Expand Down
2 changes: 1 addition & 1 deletion workspace/client/src/shell/editor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ fn from_bytes(secret: &Secret, content: &[u8]) -> Result<Secret> {
Secret::Contact(_) => {
let value = std::str::from_utf8(content)?;
let vcard: Vcard = value.try_into()?;
Secret::Contact(vcard)
Secret::Contact(Box::new(vcard))
}
})
}
Expand Down
1 change: 0 additions & 1 deletion workspace/client/src/shell/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ enum ShellCommand {
#[clap(alias = "su")]
Switch {
/// Keystore file for the identity.
#[clap(parse(from_os_str))]
keystore: PathBuf,
},
/// Print the current identity.
Expand Down
9 changes: 6 additions & 3 deletions workspace/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ filetime = "0.2"
rand = "0.8"
thiserror = "1"
web3-signature = { version = "0.2.6", features = ["single-party"] }
web3-address = { version = "0.4", features = ["ethereum"] }
web3-address = { version = "0.4.1", features = ["ethereum"] }
serde = { version = "1", features = ["derive"] }
hex = { version = "0.4", features = ["serde"] }
serde_json = "1"
Expand All @@ -24,7 +24,7 @@ subtle = "2.4"
zeroize = { version = "1.4", features = ["zeroize_derive"] }
argon2 = { version = "0.4", features = ["std"]}
# matches the version in k256
sha3 = "0.9"
sha3 = "0.10"
uuid = { version = "1", features = ["serde", "v4"] }
url = { version = "2.2", features = ["serde"] }
bitflags = "1"
Expand All @@ -38,7 +38,10 @@ passwords = "3"
totp-sos = { version = "3", features = ["serde"] }
vcard4 = { version = "0.1.4", features = ["serde"] }

time = { version = "0.3.13", features = ["serde", "local-offset", "formatting", "wasm-bindgen"] }
tar = { version = "0.4", default-features = false }
flate2 = "1"

time = { version = "0.3", features = ["serde", "local-offset", "formatting", "wasm-bindgen"] }

#probly-search = "2.0.0-alpha-1"

Expand Down
Loading