From 30e099c3c2a79241646433693e57d7f1baa13ade Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sun, 7 Jan 2024 22:19:21 +0000 Subject: [PATCH 1/4] rage: Add snapshot tests for the CLIs --- Cargo.lock | 162 ++++++++++++++++++ rage/Cargo.toml | 1 + rage/tests/cli_tests.rs | 4 + .../cmd/rage-keygen/gen-output.out/key.txt | 3 + rage/tests/cmd/rage-keygen/gen-output.toml | 6 + rage/tests/cmd/rage-keygen/gen-stdout.toml | 11 ++ rage/tests/cmd/rage-keygen/help.toml | 11 ++ rage/tests/cmd/rage-keygen/help_it.toml | 12 ++ rage/tests/cmd/rage-keygen/version.toml | 6 + rage/tests/cmd/rage-mount/help.toml | 17 ++ rage/tests/cmd/rage-mount/help_it.toml | 18 ++ rage/tests/cmd/rage-mount/version.toml | 6 + rage/tests/cmd/rage/decrypt-armor-flag.toml | 12 ++ .../file.age.txt | 8 + .../decrypt-filein-fileout-long.in/key.txt | 3 + .../decrypt-filein-fileout-long.out/file.txt | 1 + .../cmd/rage/decrypt-filein-fileout-long.toml | 5 + .../cmd/rage/decrypt-missing-identities.toml | 22 +++ .../tests/cmd/rage/decrypt-missing-input.toml | 11 ++ ...decrypt-mixed-identity-and-passphrase.toml | 20 +++ ...ecrypt-mixed-identity-and-plugin-name.toml | 11 ++ .../cmd/rage/decrypt-passphrase-flag.toml | 12 ++ .../cmd/rage/decrypt-recipient-flag.toml | 12 ++ .../rage/decrypt-recipients-file-flag.toml | 12 ++ .../rage/decrypt-stdin-stdout-long.in/key.txt | 3 + .../cmd/rage/decrypt-stdin-stdout-long.toml | 16 ++ .../decrypt-stdin-stdout-short.in/key.txt | 3 + .../cmd/rage/decrypt-stdin-stdout-short.toml | 16 ++ .../key.age.txt | 8 + ...identity-encrypted-without-passphrase.toml | 11 ++ .../cmd/rage/encrypt-invalid-recipient.toml | 11 ++ .../recipients.txt | 1 + .../rage/encrypt-invalid-recipients-file.toml | 11 ++ .../rage/encrypt-missing-recipients-file.toml | 11 ++ .../cmd/rage/encrypt-missing-recipients.toml | 12 ++ ...encrypt-mixed-identity-and-passphrase.toml | 11 ++ ...ncrypt-mixed-recipient-and-passphrase.toml | 11 ++ ...-mixed-recipients-file-and-passphrase.toml | 11 ++ ...rypt-passphrase-without-file-argument.toml | 11 ++ .../cmd/rage/encrypt-plugin-name-flag.toml | 11 ++ rage/tests/cmd/rage/help.toml | 45 +++++ rage/tests/cmd/rage/help_it.toml | 48 ++++++ .../cmd/rage/identity-flag-ambiguous.toml | 11 ++ .../cmd/rage/mixed-encrypt-and-decrypt.toml | 11 ++ .../rage/same-input-and-output.in/same.txt | 0 .../tests/cmd/rage/same-input-and-output.toml | 11 ++ rage/tests/cmd/rage/version.toml | 6 + supply-chain/config.toml | 52 ++++++ supply-chain/imports.lock | 24 +++ 49 files changed, 752 insertions(+) create mode 100644 rage/tests/cli_tests.rs create mode 100644 rage/tests/cmd/rage-keygen/gen-output.out/key.txt create mode 100644 rage/tests/cmd/rage-keygen/gen-output.toml create mode 100644 rage/tests/cmd/rage-keygen/gen-stdout.toml create mode 100644 rage/tests/cmd/rage-keygen/help.toml create mode 100644 rage/tests/cmd/rage-keygen/help_it.toml create mode 100644 rage/tests/cmd/rage-keygen/version.toml create mode 100644 rage/tests/cmd/rage-mount/help.toml create mode 100644 rage/tests/cmd/rage-mount/help_it.toml create mode 100644 rage/tests/cmd/rage-mount/version.toml create mode 100644 rage/tests/cmd/rage/decrypt-armor-flag.toml create mode 100644 rage/tests/cmd/rage/decrypt-filein-fileout-long.in/file.age.txt create mode 100644 rage/tests/cmd/rage/decrypt-filein-fileout-long.in/key.txt create mode 100644 rage/tests/cmd/rage/decrypt-filein-fileout-long.out/file.txt create mode 100644 rage/tests/cmd/rage/decrypt-filein-fileout-long.toml create mode 100644 rage/tests/cmd/rage/decrypt-missing-identities.toml create mode 100644 rage/tests/cmd/rage/decrypt-missing-input.toml create mode 100644 rage/tests/cmd/rage/decrypt-mixed-identity-and-passphrase.toml create mode 100644 rage/tests/cmd/rage/decrypt-mixed-identity-and-plugin-name.toml create mode 100644 rage/tests/cmd/rage/decrypt-passphrase-flag.toml create mode 100644 rage/tests/cmd/rage/decrypt-recipient-flag.toml create mode 100644 rage/tests/cmd/rage/decrypt-recipients-file-flag.toml create mode 100644 rage/tests/cmd/rage/decrypt-stdin-stdout-long.in/key.txt create mode 100644 rage/tests/cmd/rage/decrypt-stdin-stdout-long.toml create mode 100644 rage/tests/cmd/rage/decrypt-stdin-stdout-short.in/key.txt create mode 100644 rage/tests/cmd/rage/decrypt-stdin-stdout-short.toml create mode 100644 rage/tests/cmd/rage/encrypt-identity-encrypted-without-passphrase.in/key.age.txt create mode 100644 rage/tests/cmd/rage/encrypt-identity-encrypted-without-passphrase.toml create mode 100644 rage/tests/cmd/rage/encrypt-invalid-recipient.toml create mode 100644 rage/tests/cmd/rage/encrypt-invalid-recipients-file.in/recipients.txt create mode 100644 rage/tests/cmd/rage/encrypt-invalid-recipients-file.toml create mode 100644 rage/tests/cmd/rage/encrypt-missing-recipients-file.toml create mode 100644 rage/tests/cmd/rage/encrypt-missing-recipients.toml create mode 100644 rage/tests/cmd/rage/encrypt-mixed-identity-and-passphrase.toml create mode 100644 rage/tests/cmd/rage/encrypt-mixed-recipient-and-passphrase.toml create mode 100644 rage/tests/cmd/rage/encrypt-mixed-recipients-file-and-passphrase.toml create mode 100644 rage/tests/cmd/rage/encrypt-passphrase-without-file-argument.toml create mode 100644 rage/tests/cmd/rage/encrypt-plugin-name-flag.toml create mode 100644 rage/tests/cmd/rage/help.toml create mode 100644 rage/tests/cmd/rage/help_it.toml create mode 100644 rage/tests/cmd/rage/identity-flag-ambiguous.toml create mode 100644 rage/tests/cmd/rage/mixed-encrypt-and-decrypt.toml create mode 100644 rage/tests/cmd/rage/same-input-and-output.in/same.txt create mode 100644 rage/tests/cmd/rage/same-input-and-output.toml create mode 100644 rage/tests/cmd/rage/version.toml diff --git a/Cargo.lock b/Cargo.lock index 6c99c17..b2d793d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -172,12 +172,55 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" +[[package]] +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + [[package]] name = "anstyle" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + [[package]] name = "arc-swap" version = "1.6.0" @@ -481,6 +524,12 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + [[package]] name = "console" version = "0.15.7" @@ -505,6 +554,15 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +[[package]] +name = "content_inspector" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7bda66e858c683005a53a9a60c69a4aca7eeaa45d124526e389f7aec8e62f38" +dependencies = [ + "memchr", +] + [[package]] name = "cookie-factory" version = "0.3.2" @@ -732,6 +790,12 @@ dependencies = [ "syn 2.0.46", ] +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + [[package]] name = "either" version = "1.9.0" @@ -1048,6 +1112,12 @@ version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + [[package]] name = "gumdrop" version = "0.8.1" @@ -1125,6 +1195,16 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +[[package]] +name = "humantime-serde" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c" +dependencies = [ + "humantime", + "serde", +] + [[package]] name = "i18n-config" version = "0.4.5" @@ -1461,6 +1541,12 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "normalize-line-endings" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" + [[package]] name = "num-bigint-dig" version = "0.8.4" @@ -1585,6 +1671,16 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +[[package]] +name = "os_pipe" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "page_size" version = "0.5.0" @@ -1917,6 +2013,7 @@ dependencies = [ "rust-embed", "tar", "time", + "trycmd", "zip", ] @@ -2286,6 +2383,12 @@ dependencies = [ "digest", ] +[[package]] +name = "shlex" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" + [[package]] name = "signature" version = "2.2.0" @@ -2296,6 +2399,12 @@ dependencies = [ "rand_core", ] +[[package]] +name = "similar" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" + [[package]] name = "slab" version = "0.4.9" @@ -2311,6 +2420,37 @@ version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +[[package]] +name = "snapbox" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6bccd62078347f89a914e3004d94582e13824d4e3d8a816317862884c423835" +dependencies = [ + "anstream", + "anstyle", + "content_inspector", + "dunce", + "filetime", + "libc", + "normalize-line-endings", + "os_pipe", + "similar", + "snapbox-macros", + "tempfile", + "wait-timeout", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "snapbox-macros" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaaf09df9f0eeae82be96290918520214530e738a7fe5a351b0f24cf77c0ca31" +dependencies = [ + "anstream", +] + [[package]] name = "spin" version = "0.5.2" @@ -2592,6 +2732,22 @@ dependencies = [ "winnow", ] +[[package]] +name = "trycmd" +version = "0.14.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2925e71868a12b173c1eb166018c2d2f9dfaedfcaec747bdb6ea2246785d258e" +dependencies = [ + "glob", + "humantime", + "humantime-serde", + "rayon", + "serde", + "shlex", + "snapbox", + "toml_edit", +] + [[package]] name = "type-map" version = "0.4.0" @@ -2648,6 +2804,12 @@ dependencies = [ "subtle", ] +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "uuid" version = "1.6.1" diff --git a/rage/Cargo.toml b/rage/Cargo.toml index 3d54600..8ff9cd0 100644 --- a/rage/Cargo.toml +++ b/rage/Cargo.toml @@ -80,6 +80,7 @@ clap = { version = "4", default-features = false } clap_complete = "4" flate2 = "1" man = "0.3" +trycmd = "0.14" [features] default = ["ssh"] diff --git a/rage/tests/cli_tests.rs b/rage/tests/cli_tests.rs new file mode 100644 index 0000000..5c4acf5 --- /dev/null +++ b/rage/tests/cli_tests.rs @@ -0,0 +1,4 @@ +#[test] +fn cli_tests() { + trycmd::TestCases::new().case("tests/cmd/*/*.toml"); +} diff --git a/rage/tests/cmd/rage-keygen/gen-output.out/key.txt b/rage/tests/cmd/rage-keygen/gen-output.out/key.txt new file mode 100644 index 0000000..accd9ff --- /dev/null +++ b/rage/tests/cmd/rage-keygen/gen-output.out/key.txt @@ -0,0 +1,3 @@ +# created: 20[..]-[..]-[..]T[..]:[..]:[..]Z +# public key: age1[..] +AGE-SECRET-KEY-1[..] \ No newline at end of file diff --git a/rage/tests/cmd/rage-keygen/gen-output.toml b/rage/tests/cmd/rage-keygen/gen-output.toml new file mode 100644 index 0000000..3805019 --- /dev/null +++ b/rage/tests/cmd/rage-keygen/gen-output.toml @@ -0,0 +1,6 @@ +bin.name = "rage-keygen" +args = "-o key.txt" +stdout = "" +stderr = """ +Public key: age1[..] +""" diff --git a/rage/tests/cmd/rage-keygen/gen-stdout.toml b/rage/tests/cmd/rage-keygen/gen-stdout.toml new file mode 100644 index 0000000..e9490e0 --- /dev/null +++ b/rage/tests/cmd/rage-keygen/gen-stdout.toml @@ -0,0 +1,11 @@ +bin.name = "rage-keygen" +args = "" +stdout = """ +# created: 20[..]-[..]-[..]T[..]:[..]:[..]Z +# public key: age1[..] +AGE-SECRET-KEY-1[..] +""" +# Because trycmd isn't a terminal, rage-keygen thinks stdout is piped to a file. +stderr = """ +Public key: age1[..] +""" diff --git a/rage/tests/cmd/rage-keygen/help.toml b/rage/tests/cmd/rage-keygen/help.toml new file mode 100644 index 0000000..9688396 --- /dev/null +++ b/rage/tests/cmd/rage-keygen/help.toml @@ -0,0 +1,11 @@ +bin.name = "rage-keygen" +args = "--help" +stdout = "" +stderr = """ +Usage: [..]rage-keygen[EXE] [OPTIONS] + +Optional arguments: + -h, --help Print this help message and exit. + -V, --version Print version info and exit. + -o, --output OUTPUT Write the result to the file at path OUTPUT. Defaults to standard output. +""" diff --git a/rage/tests/cmd/rage-keygen/help_it.toml b/rage/tests/cmd/rage-keygen/help_it.toml new file mode 100644 index 0000000..2e2814d --- /dev/null +++ b/rage/tests/cmd/rage-keygen/help_it.toml @@ -0,0 +1,12 @@ +bin.name = "rage-keygen" +args = "--help" +env.add.LANG = "it" +stdout = "" +stderr = """ +Usage: [..]rage-keygen[EXE] [OPTIONS] + +Optional arguments: + -h, --help Print this help message and exit. + -V, --version Print version info and exit. + -o, --output OUTPUT Write the result to the file at path OUTPUT. Defaults to standard output. +""" diff --git a/rage/tests/cmd/rage-keygen/version.toml b/rage/tests/cmd/rage-keygen/version.toml new file mode 100644 index 0000000..7354776 --- /dev/null +++ b/rage/tests/cmd/rage-keygen/version.toml @@ -0,0 +1,6 @@ +bin.name = "rage-keygen" +args = "--version" +stdout = """ +rage-keygen 0.9.2 +""" +stderr = "" diff --git a/rage/tests/cmd/rage-mount/help.toml b/rage/tests/cmd/rage-mount/help.toml new file mode 100644 index 0000000..52e91e0 --- /dev/null +++ b/rage/tests/cmd/rage-mount/help.toml @@ -0,0 +1,17 @@ +bin.name = "rage-mount" +args = "--help" +stdout = "" +stderr = """ +Usage: [..]rage-mount[EXE] [OPTIONS] + +Positional arguments: + filename The encrypted filesystem to mount. + mountpoint The directory to mount the filesystem at. + +Optional arguments: + -h, --help Print this help message and exit. + -V, --version Print version info and exit. + -t, --types TYPES Indicates the filesystem type (one of "tar", "zip"). + --max-work-factor WF Maximum work factor to allow for passphrase decryption. + -i, --identity IDENTITY Use the private key file at IDENTITY. May be repeated. +""" diff --git a/rage/tests/cmd/rage-mount/help_it.toml b/rage/tests/cmd/rage-mount/help_it.toml new file mode 100644 index 0000000..c4730f2 --- /dev/null +++ b/rage/tests/cmd/rage-mount/help_it.toml @@ -0,0 +1,18 @@ +bin.name = "rage-mount" +args = "--help" +env.add.LANG = "it" +stdout = "" +stderr = """ +Usage: [..]rage-mount[EXE] [OPTIONS] + +Positional arguments: + filename The encrypted filesystem to mount. + mountpoint The directory to mount the filesystem at. + +Optional arguments: + -h, --help Print this help message and exit. + -V, --version Print version info and exit. + -t, --types TYPES Indicates the filesystem type (one of "tar", "zip"). + --max-work-factor WF Maximum work factor to allow for passphrase decryption. + -i, --identity IDENTITY Use the private key file at IDENTITY. May be repeated. +""" diff --git a/rage/tests/cmd/rage-mount/version.toml b/rage/tests/cmd/rage-mount/version.toml new file mode 100644 index 0000000..b41e977 --- /dev/null +++ b/rage/tests/cmd/rage-mount/version.toml @@ -0,0 +1,6 @@ +bin.name = "rage-mount" +args = "--version" +stdout = """ +rage-mount 0.9.2 +""" +stderr = "" diff --git a/rage/tests/cmd/rage/decrypt-armor-flag.toml b/rage/tests/cmd/rage/decrypt-armor-flag.toml new file mode 100644 index 0000000..a101200 --- /dev/null +++ b/rage/tests/cmd/rage/decrypt-armor-flag.toml @@ -0,0 +1,12 @@ +bin.name = "rage" +args = "--decrypt --armor" +status = "failed" +stdin = "" +stdout = "" +stderr = """ +Error: -a/--armor can't be used with -d/--decrypt. +Note that armored files are detected automatically. + +[ Did rage not do what you expected? Could an error be more useful? ] +[ Tell us: https://str4d.xyz/rage/report ] +""" diff --git a/rage/tests/cmd/rage/decrypt-filein-fileout-long.in/file.age.txt b/rage/tests/cmd/rage/decrypt-filein-fileout-long.in/file.age.txt new file mode 100644 index 0000000..6f9dc67 --- /dev/null +++ b/rage/tests/cmd/rage/decrypt-filein-fileout-long.in/file.age.txt @@ -0,0 +1,8 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHUGc3Zlhpekp0K012aXdu +T1VZN0lmWlRmNjdLYVB4RldkTFVLTkNDUXlBCmJjRUcrM3E0a0U0N3IyK1JsTitG +dHVTd0N6TVFRTWgzdG5uSzJmNm9YMTgKLT4gQXQ1WWAtZ3JlYXNlIDxodGFSVHJg +IFg0cWYsO0ogZ2Fzc1EKZGtPSTB3Ci0tLSBKazRIaHJxdnNJcHpyclRkQjg3QW5r +SVE2MHdtWkErYTNrNWJibWd1bmNBCkK9FoOkiLB93gD79vNed8L3LM9rhKm5qma2 +lSiwRx/aM1DKaZO0CMmYQkoM2tPReA== +-----END AGE ENCRYPTED FILE----- diff --git a/rage/tests/cmd/rage/decrypt-filein-fileout-long.in/key.txt b/rage/tests/cmd/rage/decrypt-filein-fileout-long.in/key.txt new file mode 100644 index 0000000..91b9f11 --- /dev/null +++ b/rage/tests/cmd/rage/decrypt-filein-fileout-long.in/key.txt @@ -0,0 +1,3 @@ +# created: 2024-01-07T22:30:16Z +# public key: age1g8g50ksmsfxuv4rpyhlnau8tx87y2xz8v4agzs2vltcxlssy2qwqq6qc4t +AGE-SECRET-KEY-1SRQGS50G584HFA5JG9D6D9S6639VVHJUE5XHHKJET9DRU76HK4RQP0X5Q3 diff --git a/rage/tests/cmd/rage/decrypt-filein-fileout-long.out/file.txt b/rage/tests/cmd/rage/decrypt-filein-fileout-long.out/file.txt new file mode 100644 index 0000000..ae4d0d4 --- /dev/null +++ b/rage/tests/cmd/rage/decrypt-filein-fileout-long.out/file.txt @@ -0,0 +1 @@ +Test plaintext. diff --git a/rage/tests/cmd/rage/decrypt-filein-fileout-long.toml b/rage/tests/cmd/rage/decrypt-filein-fileout-long.toml new file mode 100644 index 0000000..105c114 --- /dev/null +++ b/rage/tests/cmd/rage/decrypt-filein-fileout-long.toml @@ -0,0 +1,5 @@ +bin.name = "rage" +args = "--decrypt --identity key.txt --output file.txt file.age.txt" +stdin = "" +stdout = "" +stderr = "" diff --git a/rage/tests/cmd/rage/decrypt-missing-identities.toml b/rage/tests/cmd/rage/decrypt-missing-identities.toml new file mode 100644 index 0000000..c211d67 --- /dev/null +++ b/rage/tests/cmd/rage/decrypt-missing-identities.toml @@ -0,0 +1,22 @@ +bin.name = "rage" +args = "--decrypt" +status = "failed" +stdin = """ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHUGc3Zlhpekp0K012aXdu +T1VZN0lmWlRmNjdLYVB4RldkTFVLTkNDUXlBCmJjRUcrM3E0a0U0N3IyK1JsTitG +dHVTd0N6TVFRTWgzdG5uSzJmNm9YMTgKLT4gQXQ1WWAtZ3JlYXNlIDxodGFSVHJg +IFg0cWYsO0ogZ2Fzc1EKZGtPSTB3Ci0tLSBKazRIaHJxdnNJcHpyclRkQjg3QW5r +SVE2MHdtWkErYTNrNWJibWd1bmNBCkK9FoOkiLB93gD79vNed8L3LM9rhKm5qma2 +lSiwRx/aM1DKaZO0CMmYQkoM2tPReA== +-----END AGE ENCRYPTED FILE----- +""" +stdout = "" +stderr = """ +Error: Missing identities. +Did you forget to specify -i/--identity? + + +[ Did rage not do what you expected? Could an error be more useful? ] +[ Tell us: https://str4d.xyz/rage/report ] +""" diff --git a/rage/tests/cmd/rage/decrypt-missing-input.toml b/rage/tests/cmd/rage/decrypt-missing-input.toml new file mode 100644 index 0000000..88b27c9 --- /dev/null +++ b/rage/tests/cmd/rage/decrypt-missing-input.toml @@ -0,0 +1,11 @@ +bin.name = "rage" +args = "--decrypt" +status = "failed" +stdin = "" +stdout = "" +stderr = """ +Error: failed to fill whole buffer + +[ Did rage not do what you expected? Could an error be more useful? ] +[ Tell us: https://str4d.xyz/rage/report ] +""" diff --git a/rage/tests/cmd/rage/decrypt-mixed-identity-and-passphrase.toml b/rage/tests/cmd/rage/decrypt-mixed-identity-and-passphrase.toml new file mode 100644 index 0000000..87a50b7 --- /dev/null +++ b/rage/tests/cmd/rage/decrypt-mixed-identity-and-passphrase.toml @@ -0,0 +1,20 @@ +bin.name = "rage" +args = "--decrypt --identity key.txt" +status = "failed" +# Passphrase: foobar +stdin = """ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNjcnlwdCBXWDZGUHRENjJxeGt5M1hU +cG83QjZnIDE5CkNDaXFUTnNNMzRaUzJwQzI1SnYxemg0dVdPY2hOTHJWWlhpT0ow +MXpqSFEKLS0tIFZpdUNKcGpiS3hoM0dqK0hrV2crN1FWTlgzMnI2WFQralQxMFRT +ZEE2STgKP9mM/XiDG/1ywkJwinSSQVzTCEt3v6BvjO9DyDg7l2uF60qdzXCY5qL/ +3jdrkFSp +-----END AGE ENCRYPTED FILE----- +""" +stdout = "" +stderr = """ +Error: -i/--identity can't be used with passphrase-encrypted files. + +[ Did rage not do what you expected? Could an error be more useful? ] +[ Tell us: https://str4d.xyz/rage/report ] +""" diff --git a/rage/tests/cmd/rage/decrypt-mixed-identity-and-plugin-name.toml b/rage/tests/cmd/rage/decrypt-mixed-identity-and-plugin-name.toml new file mode 100644 index 0000000..6049ac8 --- /dev/null +++ b/rage/tests/cmd/rage/decrypt-mixed-identity-and-plugin-name.toml @@ -0,0 +1,11 @@ +bin.name = "rage" +args = "--decrypt --identity key.txt -j plugin-name" +status = "failed" +stdin = "" +stdout = "" +stderr = """ +Error: -i/--identity can't be used with -j. + +[ Did rage not do what you expected? Could an error be more useful? ] +[ Tell us: https://str4d.xyz/rage/report ] +""" diff --git a/rage/tests/cmd/rage/decrypt-passphrase-flag.toml b/rage/tests/cmd/rage/decrypt-passphrase-flag.toml new file mode 100644 index 0000000..8b6c0b5 --- /dev/null +++ b/rage/tests/cmd/rage/decrypt-passphrase-flag.toml @@ -0,0 +1,12 @@ +bin.name = "rage" +args = "--decrypt --passphrase" +status = "failed" +stdin = "" +stdout = "" +stderr = """ +Error: -p/--passphrase can't be used with -d/--decrypt. +Note that passphrase-encrypted files are detected automatically. + +[ Did rage not do what you expected? Could an error be more useful? ] +[ Tell us: https://str4d.xyz/rage/report ] +""" diff --git a/rage/tests/cmd/rage/decrypt-recipient-flag.toml b/rage/tests/cmd/rage/decrypt-recipient-flag.toml new file mode 100644 index 0000000..5242581 --- /dev/null +++ b/rage/tests/cmd/rage/decrypt-recipient-flag.toml @@ -0,0 +1,12 @@ +bin.name = "rage" +args = "--decrypt -r foobar" +status = "failed" +stdin = "" +stdout = "" +stderr = """ +Error: -r/--recipient can't be used with -d/--decrypt. +Did you mean to use -i/--identity to specify a private key? + +[ Did rage not do what you expected? Could an error be more useful? ] +[ Tell us: https://str4d.xyz/rage/report ] +""" diff --git a/rage/tests/cmd/rage/decrypt-recipients-file-flag.toml b/rage/tests/cmd/rage/decrypt-recipients-file-flag.toml new file mode 100644 index 0000000..2964cd0 --- /dev/null +++ b/rage/tests/cmd/rage/decrypt-recipients-file-flag.toml @@ -0,0 +1,12 @@ +bin.name = "rage" +args = "--decrypt -R foobar.txt" +status = "failed" +stdin = "" +stdout = "" +stderr = """ +Error: -R/--recipients-file can't be used with -d/--decrypt. +Did you mean to use -i/--identity to specify a private key? + +[ Did rage not do what you expected? Could an error be more useful? ] +[ Tell us: https://str4d.xyz/rage/report ] +""" diff --git a/rage/tests/cmd/rage/decrypt-stdin-stdout-long.in/key.txt b/rage/tests/cmd/rage/decrypt-stdin-stdout-long.in/key.txt new file mode 100644 index 0000000..91b9f11 --- /dev/null +++ b/rage/tests/cmd/rage/decrypt-stdin-stdout-long.in/key.txt @@ -0,0 +1,3 @@ +# created: 2024-01-07T22:30:16Z +# public key: age1g8g50ksmsfxuv4rpyhlnau8tx87y2xz8v4agzs2vltcxlssy2qwqq6qc4t +AGE-SECRET-KEY-1SRQGS50G584HFA5JG9D6D9S6639VVHJUE5XHHKJET9DRU76HK4RQP0X5Q3 diff --git a/rage/tests/cmd/rage/decrypt-stdin-stdout-long.toml b/rage/tests/cmd/rage/decrypt-stdin-stdout-long.toml new file mode 100644 index 0000000..1c08153 --- /dev/null +++ b/rage/tests/cmd/rage/decrypt-stdin-stdout-long.toml @@ -0,0 +1,16 @@ +bin.name = "rage" +args = "--decrypt --identity key.txt" +stdin = """ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHUGc3Zlhpekp0K012aXdu +T1VZN0lmWlRmNjdLYVB4RldkTFVLTkNDUXlBCmJjRUcrM3E0a0U0N3IyK1JsTitG +dHVTd0N6TVFRTWgzdG5uSzJmNm9YMTgKLT4gQXQ1WWAtZ3JlYXNlIDxodGFSVHJg +IFg0cWYsO0ogZ2Fzc1EKZGtPSTB3Ci0tLSBKazRIaHJxdnNJcHpyclRkQjg3QW5r +SVE2MHdtWkErYTNrNWJibWd1bmNBCkK9FoOkiLB93gD79vNed8L3LM9rhKm5qma2 +lSiwRx/aM1DKaZO0CMmYQkoM2tPReA== +-----END AGE ENCRYPTED FILE----- +""" +stdout = """ +Test plaintext. +""" +stderr = "" diff --git a/rage/tests/cmd/rage/decrypt-stdin-stdout-short.in/key.txt b/rage/tests/cmd/rage/decrypt-stdin-stdout-short.in/key.txt new file mode 100644 index 0000000..91b9f11 --- /dev/null +++ b/rage/tests/cmd/rage/decrypt-stdin-stdout-short.in/key.txt @@ -0,0 +1,3 @@ +# created: 2024-01-07T22:30:16Z +# public key: age1g8g50ksmsfxuv4rpyhlnau8tx87y2xz8v4agzs2vltcxlssy2qwqq6qc4t +AGE-SECRET-KEY-1SRQGS50G584HFA5JG9D6D9S6639VVHJUE5XHHKJET9DRU76HK4RQP0X5Q3 diff --git a/rage/tests/cmd/rage/decrypt-stdin-stdout-short.toml b/rage/tests/cmd/rage/decrypt-stdin-stdout-short.toml new file mode 100644 index 0000000..fee48f7 --- /dev/null +++ b/rage/tests/cmd/rage/decrypt-stdin-stdout-short.toml @@ -0,0 +1,16 @@ +bin.name = "rage" +args = "-d -i key.txt" +stdin = """ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHUGc3Zlhpekp0K012aXdu +T1VZN0lmWlRmNjdLYVB4RldkTFVLTkNDUXlBCmJjRUcrM3E0a0U0N3IyK1JsTitG +dHVTd0N6TVFRTWgzdG5uSzJmNm9YMTgKLT4gQXQ1WWAtZ3JlYXNlIDxodGFSVHJg +IFg0cWYsO0ogZ2Fzc1EKZGtPSTB3Ci0tLSBKazRIaHJxdnNJcHpyclRkQjg3QW5r +SVE2MHdtWkErYTNrNWJibWd1bmNBCkK9FoOkiLB93gD79vNed8L3LM9rhKm5qma2 +lSiwRx/aM1DKaZO0CMmYQkoM2tPReA== +-----END AGE ENCRYPTED FILE----- +""" +stdout = """ +Test plaintext. +""" +stderr = "" diff --git a/rage/tests/cmd/rage/encrypt-identity-encrypted-without-passphrase.in/key.age.txt b/rage/tests/cmd/rage/encrypt-identity-encrypted-without-passphrase.in/key.age.txt new file mode 100644 index 0000000..6f9dc67 --- /dev/null +++ b/rage/tests/cmd/rage/encrypt-identity-encrypted-without-passphrase.in/key.age.txt @@ -0,0 +1,8 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHUGc3Zlhpekp0K012aXdu +T1VZN0lmWlRmNjdLYVB4RldkTFVLTkNDUXlBCmJjRUcrM3E0a0U0N3IyK1JsTitG +dHVTd0N6TVFRTWgzdG5uSzJmNm9YMTgKLT4gQXQ1WWAtZ3JlYXNlIDxodGFSVHJg +IFg0cWYsO0ogZ2Fzc1EKZGtPSTB3Ci0tLSBKazRIaHJxdnNJcHpyclRkQjg3QW5r +SVE2MHdtWkErYTNrNWJibWd1bmNBCkK9FoOkiLB93gD79vNed8L3LM9rhKm5qma2 +lSiwRx/aM1DKaZO0CMmYQkoM2tPReA== +-----END AGE ENCRYPTED FILE----- diff --git a/rage/tests/cmd/rage/encrypt-identity-encrypted-without-passphrase.toml b/rage/tests/cmd/rage/encrypt-identity-encrypted-without-passphrase.toml new file mode 100644 index 0000000..5ecaa1a --- /dev/null +++ b/rage/tests/cmd/rage/encrypt-identity-encrypted-without-passphrase.toml @@ -0,0 +1,11 @@ +bin.name = "rage" +args = "--encrypt -i key.age.txt" +status = "failed" +stdin = "" +stdout = "" +stderr = """ +Error: Identity file 'key.age.txt' is encrypted with age but not with a passphrase. + +[ Did rage not do what you expected? Could an error be more useful? ] +[ Tell us: https://str4d.xyz/rage/report ] +""" diff --git a/rage/tests/cmd/rage/encrypt-invalid-recipient.toml b/rage/tests/cmd/rage/encrypt-invalid-recipient.toml new file mode 100644 index 0000000..9761e27 --- /dev/null +++ b/rage/tests/cmd/rage/encrypt-invalid-recipient.toml @@ -0,0 +1,11 @@ +bin.name = "rage" +args = "--encrypt --recipient foobar" +status = "failed" +stdin = "" +stdout = "" +stderr = """ +Error: Invalid recipient 'foobar' + +[ Did rage not do what you expected? Could an error be more useful? ] +[ Tell us: https://str4d.xyz/rage/report ] +""" diff --git a/rage/tests/cmd/rage/encrypt-invalid-recipients-file.in/recipients.txt b/rage/tests/cmd/rage/encrypt-invalid-recipients-file.in/recipients.txt new file mode 100644 index 0000000..323fae0 --- /dev/null +++ b/rage/tests/cmd/rage/encrypt-invalid-recipients-file.in/recipients.txt @@ -0,0 +1 @@ +foobar diff --git a/rage/tests/cmd/rage/encrypt-invalid-recipients-file.toml b/rage/tests/cmd/rage/encrypt-invalid-recipients-file.toml new file mode 100644 index 0000000..691c687 --- /dev/null +++ b/rage/tests/cmd/rage/encrypt-invalid-recipients-file.toml @@ -0,0 +1,11 @@ +bin.name = "rage" +args = "--encrypt -R recipients.txt" +status = "failed" +stdin = "" +stdout = "" +stderr = """ +Error: recipients file recipients.txt contains non-recipient data on line 1 + +[ Did rage not do what you expected? Could an error be more useful? ] +[ Tell us: https://str4d.xyz/rage/report ] +""" diff --git a/rage/tests/cmd/rage/encrypt-missing-recipients-file.toml b/rage/tests/cmd/rage/encrypt-missing-recipients-file.toml new file mode 100644 index 0000000..238cddb --- /dev/null +++ b/rage/tests/cmd/rage/encrypt-missing-recipients-file.toml @@ -0,0 +1,11 @@ +bin.name = "rage" +args = "--encrypt -R foobar.txt" +status = "failed" +stdin = "" +stdout = "" +stderr = """ +Error: No such file or directory (os error 2) + +[ Did rage not do what you expected? Could an error be more useful? ] +[ Tell us: https://str4d.xyz/rage/report ] +""" diff --git a/rage/tests/cmd/rage/encrypt-missing-recipients.toml b/rage/tests/cmd/rage/encrypt-missing-recipients.toml new file mode 100644 index 0000000..b8a9d25 --- /dev/null +++ b/rage/tests/cmd/rage/encrypt-missing-recipients.toml @@ -0,0 +1,12 @@ +bin.name = "rage" +args = "--encrypt" +status = "failed" +stdin = "" +stdout = "" +stderr = """ +Error: Missing recipients. +Did you forget to specify -r/--recipient? + +[ Did rage not do what you expected? Could an error be more useful? ] +[ Tell us: https://str4d.xyz/rage/report ] +""" diff --git a/rage/tests/cmd/rage/encrypt-mixed-identity-and-passphrase.toml b/rage/tests/cmd/rage/encrypt-mixed-identity-and-passphrase.toml new file mode 100644 index 0000000..2b2c441 --- /dev/null +++ b/rage/tests/cmd/rage/encrypt-mixed-identity-and-passphrase.toml @@ -0,0 +1,11 @@ +bin.name = "rage" +args = "--encrypt --identity key.txt --passphrase" +status = "failed" +stdin = "" +stdout = "" +stderr = """ +Error: -i/--identity can't be used with -p/--passphrase. + +[ Did rage not do what you expected? Could an error be more useful? ] +[ Tell us: https://str4d.xyz/rage/report ] +""" diff --git a/rage/tests/cmd/rage/encrypt-mixed-recipient-and-passphrase.toml b/rage/tests/cmd/rage/encrypt-mixed-recipient-and-passphrase.toml new file mode 100644 index 0000000..dafd8bf --- /dev/null +++ b/rage/tests/cmd/rage/encrypt-mixed-recipient-and-passphrase.toml @@ -0,0 +1,11 @@ +bin.name = "rage" +args = "-e -r foobar -p" +status = "failed" +stdin = "" +stdout = "" +stderr = """ +Error: -r/--recipient can't be used with -p/--passphrase + +[ Did rage not do what you expected? Could an error be more useful? ] +[ Tell us: https://str4d.xyz/rage/report ] +""" diff --git a/rage/tests/cmd/rage/encrypt-mixed-recipients-file-and-passphrase.toml b/rage/tests/cmd/rage/encrypt-mixed-recipients-file-and-passphrase.toml new file mode 100644 index 0000000..4015fa2 --- /dev/null +++ b/rage/tests/cmd/rage/encrypt-mixed-recipients-file-and-passphrase.toml @@ -0,0 +1,11 @@ +bin.name = "rage" +args = "-e -R foobar.txt -p" +status = "failed" +stdin = "" +stdout = "" +stderr = """ +Error: -R/--recipients-file can't be used with -p/--passphrase + +[ Did rage not do what you expected? Could an error be more useful? ] +[ Tell us: https://str4d.xyz/rage/report ] +""" diff --git a/rage/tests/cmd/rage/encrypt-passphrase-without-file-argument.toml b/rage/tests/cmd/rage/encrypt-passphrase-without-file-argument.toml new file mode 100644 index 0000000..dae0cfd --- /dev/null +++ b/rage/tests/cmd/rage/encrypt-passphrase-without-file-argument.toml @@ -0,0 +1,11 @@ +bin.name = "rage" +args = "-p" +status = "failed" +stdin = "" +stdout = "" +stderr = """ +Error: File to encrypt must be passed as an argument when using -p/--passphrase + +[ Did rage not do what you expected? Could an error be more useful? ] +[ Tell us: https://str4d.xyz/rage/report ] +""" diff --git a/rage/tests/cmd/rage/encrypt-plugin-name-flag.toml b/rage/tests/cmd/rage/encrypt-plugin-name-flag.toml new file mode 100644 index 0000000..392202e --- /dev/null +++ b/rage/tests/cmd/rage/encrypt-plugin-name-flag.toml @@ -0,0 +1,11 @@ +bin.name = "rage" +args = "-e -j plugin-name" +status = "failed" +stdin = "" +stdout = "" +stderr = """ +Error: -j can't be used with -e/--encrypt. + +[ Did rage not do what you expected? Could an error be more useful? ] +[ Tell us: https://str4d.xyz/rage/report ] +""" diff --git a/rage/tests/cmd/rage/help.toml b/rage/tests/cmd/rage/help.toml new file mode 100644 index 0000000..95d4736 --- /dev/null +++ b/rage/tests/cmd/rage/help.toml @@ -0,0 +1,45 @@ +bin.name = "rage" +args = "--help" +stdout = """ +Usage: + [..]rage[EXE] [--encrypt] -r RECIPIENT [-i IDENTITY] [-a] [-o OUTPUT] [INPUT] + [..]rage[EXE] --decrypt [-i IDENTITY] [-o OUTPUT] [INPUT] + +Positional arguments: + input Path to a file to read from. + +Optional arguments: + -h, --help Print this help message and exit. + -V, --version Print version info and exit. + -e, --encrypt Encrypt the input (the default). + -d, --decrypt Decrypt the input. + -p, --passphrase Encrypt with a passphrase instead of recipients. + --max-work-factor WF Maximum work factor to allow for passphrase decryption. + -a, --armor Encrypt to a PEM encoded format. + -r, --recipient RECIPIENT Encrypt to the specified RECIPIENT. May be repeated. + -R, --recipients-file PATH Encrypt to the recipients listed at PATH. May be repeated. + -i, --identity IDENTITY Use the identity file at IDENTITY. May be repeated. + -j PLUGIN-NAME Use age-plugin-PLUGIN-NAME in its default mode as an identity. + -o, --output OUTPUT Write the result to the file at path OUTPUT. + +INPUT defaults to standard input, and OUTPUT defaults to standard output. + +RECIPIENT can be: +- An age public key, as generated by [..]rage-keygen ("age1..."). +- An SSH public key ("ssh-ed25519 AAAA...", "ssh-rsa AAAA..."). + +PATH is a path to a file containing age recipients, one per line +(ignoring "#" prefixed comments and empty lines). + +IDENTITY is a path to a file with age identities, one per line +(ignoring "#" prefixed comments and empty lines), or to an SSH key file. +Passphrase-encrypted age identity files can be used as identity files. +Multiple identities may be provided, and any unused ones will be ignored. + +Example: + $ [..]rage-keygen -o key.txt + Public key: age1ql3z7hjy54pw3hyww5ayyfg7zqgvc7w3j2elw8zmrj2kg5sfn9aqmcac8p + $ tar cvz ~/data | [..]rage -r age1ql3z7hjy54pw3hyww5ayyfg7zqgvc7w3j2elw8zmrj2kg5sfn9aqmcac8p > data.tar.gz.age + $ [..]rage -d -i key.txt -o data.tar.gz data.tar.gz.age +""" +stderr = "" diff --git a/rage/tests/cmd/rage/help_it.toml b/rage/tests/cmd/rage/help_it.toml new file mode 100644 index 0000000..8d742bc --- /dev/null +++ b/rage/tests/cmd/rage/help_it.toml @@ -0,0 +1,48 @@ +bin.name = "rage" +args = "--help" +env.add.LANG = "it" +stdout = """ +Usage: + [..]rage[EXE] [--encrypt] -r RECIPIENT [-i IDENTITY] [-a] [-o OUTPUT] [INPUT] + [..]rage[EXE] --decrypt [-i IDENTITY] [-o OUTPUT] [INPUT] + +Positional arguments: + input Path to a file to read from. + +Optional arguments: + -h, --help Print this help message and exit. + -V, --version Print version info and exit. + -e, --encrypt Encrypt the input (the default). + -d, --decrypt Decrypt the input. + -p, --passphrase Encrypt with a passphrase instead of recipients. + --max-work-factor WF Maximum work factor to allow for passphrase decryption. + -a, --armor Encrypt to a PEM encoded format. + -r, --recipient RECIPIENT Encrypt to the specified RECIPIENT. May be repeated. + -R, --recipients-file PATH Encrypt to the recipients listed at PATH. May be repeated. + -i, --identity IDENTITY Use the identity file at IDENTITY. May be repeated. + -j PLUGIN-NAME Use age-plugin-PLUGIN-NAME in its default mode as an identity. + -o, --output OUTPUT Write the result to the file at path OUTPUT. + +INPUT ha come valore predefinito lo standard input, e OUTPUT ha come +valore predefinito lo standard output. + +RECIPIENT può essere: +- Una chiave pubblica age, come generata da [..]rage-keygen ("age1..."). +- Una chiave pubblica SSH ("ssh-ed25519 AAAA...", "ssh-rsa AAAA..."). + +PATH è il percorso ad un file contenente dei destinatari age, +uno per riga (ignorando i commenti che iniziano con "#" e le righe vuote). + +IDENTITY è il percorso ad un file contenente identità age, una per +riga (ignorando i commenti che iniziano con "#" e le righe vuote), o ad un +file contenente una chiave SSH. +I file di identità possono essere cifrati con age e una passphrase. +Possono essere fornite più identità, quelle inutilizzate verranno ignorate. + +Esempio: + $ [..]rage-keygen -o key.txt + Chiave pubblica: age1ql3z7hjy54pw3hyww5ayyfg7zqgvc7w3j2elw8zmrj2kg5sfn9aqmcac8p + $ tar cvz ~/data | [..]rage -r age1ql3z7hjy54pw3hyww5ayyfg7zqgvc7w3j2elw8zmrj2kg5sfn9aqmcac8p > data.tar.gz.age + $ [..]rage -d -i key.txt -o data.tar.gz data.tar.gz.age +""" +stderr = "" diff --git a/rage/tests/cmd/rage/identity-flag-ambiguous.toml b/rage/tests/cmd/rage/identity-flag-ambiguous.toml new file mode 100644 index 0000000..bdb8897 --- /dev/null +++ b/rage/tests/cmd/rage/identity-flag-ambiguous.toml @@ -0,0 +1,11 @@ +bin.name = "rage" +args = "-i key.txt" +status = "failed" +stdin = "" +stdout = "" +stderr = """ +Error: -i/--identity requires either -e/--encrypt or -d/--decrypt. + +[ Did rage not do what you expected? Could an error be more useful? ] +[ Tell us: https://str4d.xyz/rage/report ] +""" diff --git a/rage/tests/cmd/rage/mixed-encrypt-and-decrypt.toml b/rage/tests/cmd/rage/mixed-encrypt-and-decrypt.toml new file mode 100644 index 0000000..a853f95 --- /dev/null +++ b/rage/tests/cmd/rage/mixed-encrypt-and-decrypt.toml @@ -0,0 +1,11 @@ +bin.name = "rage" +args = "--encrypt --decrypt" +status = "failed" +stdin = "" +stdout = "" +stderr = """ +Error: -e/--encrypt can't be used with -d/--decrypt. + +[ Did rage not do what you expected? Could an error be more useful? ] +[ Tell us: https://str4d.xyz/rage/report ] +""" diff --git a/rage/tests/cmd/rage/same-input-and-output.in/same.txt b/rage/tests/cmd/rage/same-input-and-output.in/same.txt new file mode 100644 index 0000000..e69de29 diff --git a/rage/tests/cmd/rage/same-input-and-output.toml b/rage/tests/cmd/rage/same-input-and-output.toml new file mode 100644 index 0000000..6a49d83 --- /dev/null +++ b/rage/tests/cmd/rage/same-input-and-output.toml @@ -0,0 +1,11 @@ +bin.name = "rage" +args = "-r foobar -o same.txt same.txt" +status = "failed" +stdin = "" +stdout = "" +stderr = """ +Error: Input and output are the same file 'same.txt'. + +[ Did rage not do what you expected? Could an error be more useful? ] +[ Tell us: https://str4d.xyz/rage/report ] +""" diff --git a/rage/tests/cmd/rage/version.toml b/rage/tests/cmd/rage/version.toml new file mode 100644 index 0000000..dd3a60c --- /dev/null +++ b/rage/tests/cmd/rage/version.toml @@ -0,0 +1,6 @@ +bin.name = "rage" +args = "--version" +stdout = """ +rage 0.9.2 +""" +stderr = "" diff --git a/supply-chain/config.toml b/supply-chain/config.toml index 595cd76..ce21716 100644 --- a/supply-chain/config.toml +++ b/supply-chain/config.toml @@ -65,10 +65,26 @@ criteria = "safe-to-deploy" version = "0.1.1" criteria = "safe-to-deploy" +[[exemptions.anstream]] +version = "0.3.2" +criteria = "safe-to-run" + [[exemptions.anstyle]] version = "1.0.2" criteria = "safe-to-run" +[[exemptions.anstyle-parse]] +version = "0.2.1" +criteria = "safe-to-run" + +[[exemptions.anstyle-query]] +version = "1.0.0" +criteria = "safe-to-run" + +[[exemptions.anstyle-wincon]] +version = "1.0.2" +criteria = "safe-to-run" + [[exemptions.arc-swap]] version = "1.6.0" criteria = "safe-to-deploy" @@ -177,6 +193,10 @@ criteria = "safe-to-deploy" version = "0.1.5" criteria = "safe-to-deploy" +[[exemptions.content_inspector]] +version = "0.2.4" +criteria = "safe-to-run" + [[exemptions.cookie-factory]] version = "0.3.2" criteria = "safe-to-deploy" @@ -237,6 +257,10 @@ criteria = "safe-to-deploy" version = "0.9.0" criteria = "safe-to-deploy" +[[exemptions.dunce]] +version = "1.0.4" +criteria = "safe-to-run" + [[exemptions.encode_unicode]] version = "0.3.6" criteria = "safe-to-deploy" @@ -345,6 +369,10 @@ criteria = "safe-to-deploy" version = "2.1.0" criteria = "safe-to-deploy" +[[exemptions.humantime-serde]] +version = "1.1.1" +criteria = "safe-to-run" + [[exemptions.i18n-config]] version = "0.4.5" criteria = "safe-to-deploy" @@ -461,6 +489,10 @@ criteria = "safe-to-run" version = "1.15.0" criteria = "safe-to-deploy" +[[exemptions.os_pipe]] +version = "1.1.5" +criteria = "safe-to-run" + [[exemptions.page_size]] version = "0.5.0" criteria = "safe-to-deploy" @@ -669,6 +701,14 @@ criteria = "safe-to-deploy" version = "0.10.8" criteria = "safe-to-deploy" +[[exemptions.shlex]] +version = "1.2.0" +criteria = "safe-to-run" + +[[exemptions.similar]] +version = "2.4.0" +criteria = "safe-to-run" + [[exemptions.slab]] version = "0.4.9" criteria = "safe-to-deploy" @@ -677,6 +717,14 @@ criteria = "safe-to-deploy" version = "1.11.2" criteria = "safe-to-deploy" +[[exemptions.snapbox]] +version = "0.4.11" +criteria = "safe-to-run" + +[[exemptions.snapbox-macros]] +version = "0.3.4" +criteria = "safe-to-run" + [[exemptions.spin]] version = "0.5.2" criteria = "safe-to-deploy" @@ -761,6 +809,10 @@ criteria = "safe-to-deploy" version = "0.19.14" criteria = "safe-to-deploy" +[[exemptions.trycmd]] +version = "0.14.16" +criteria = "safe-to-run" + [[exemptions.type-map]] version = "0.4.0" criteria = "safe-to-deploy" diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock index b4055c4..213451d 100644 --- a/supply-chain/imports.lock +++ b/supply-chain/imports.lock @@ -447,6 +447,12 @@ who = "Pat Hickey " criteria = "safe-to-deploy" version = "1.0.8" +[[audits.embark-studios.audits.colorchoice]] +who = "Johan Andersson " +criteria = "safe-to-deploy" +version = "1.0.0" +notes = "No unsafe usage or ambient capabilities" + [[audits.embark-studios.audits.thiserror]] who = "Johan Andersson " criteria = "safe-to-deploy" @@ -465,6 +471,12 @@ criteria = "safe-to-deploy" delta = "0.6.1 -> 0.6.2" notes = "No notable changes" +[[audits.embark-studios.audits.utf8parse]] +who = "Johan Andersson " +criteria = "safe-to-deploy" +version = "0.2.1" +notes = "Single unsafe usage that looks sound, no ambient capabilities" + [[audits.fermyon.audits.oorandom]] who = "Radu Matei " criteria = "safe-to-run" @@ -522,6 +534,12 @@ that the RNG here is not cryptographically secure. """ aggregated-from = "https://chromium.googlesource.com/chromiumos/third_party/rust_crates/+/refs/heads/main/cargo-vet/audits.toml?format=TEXT" +[[audits.google.audits.glob]] +who = "George Burgess IV " +criteria = "safe-to-deploy" +version = "0.3.1" +aggregated-from = "https://chromium.googlesource.com/chromiumos/third_party/rust_crates/+/refs/heads/main/cargo-vet/audits.toml?format=TEXT" + [[audits.google.audits.itertools]] who = "ChromeOS" criteria = "safe-to-run" @@ -566,6 +584,12 @@ Issues: """ aggregated-from = "https://fuchsia.googlesource.com/fuchsia/+/refs/heads/main/third_party/rust_crates/supply-chain/audits.toml?format=TEXT" +[[audits.google.audits.normalize-line-endings]] +who = "Max Lee " +criteria = "safe-to-run" +version = "0.3.0" +aggregated-from = "https://chromium.googlesource.com/chromiumos/third_party/rust_crates/+/refs/heads/main/cargo-vet/audits.toml?format=TEXT" + [[audits.google.audits.pin-project-lite]] who = "David Koloski " criteria = "safe-to-deploy" From cb49e6d39f5d9f73dde1be781f8b7cd168f64289 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Mon, 8 Jan 2024 01:34:19 +0000 Subject: [PATCH 2/4] rage: Ensure all local errors are localizable --- rage/i18n/en-US/rage.ftl | 3 +++ rage/src/bin/rage/error.rs | 13 +++++++++++++ rage/src/bin/rage/main.rs | 16 ++++++---------- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/rage/i18n/en-US/rage.ftl b/rage/i18n/en-US/rage.ftl index d2a4f5f..7ccb8af 100644 --- a/rage/i18n/en-US/rage.ftl +++ b/rage/i18n/en-US/rage.ftl @@ -103,6 +103,9 @@ err-enc-broken-file = Could not write to file: {$err} err-enc-invalid-recipient = Invalid recipient '{$recipient}' +err-enc-invalid-recipients-file = + recipients file {$filename} contains non-recipient data on line {$line_number} + err-enc-missing-recipients = Missing recipients. rec-enc-missing-recipients = Did you forget to specify {-flag-recipient}? diff --git a/rage/src/bin/rage/error.rs b/rage/src/bin/rage/error.rs index 8cee4f1..5ce09a3 100644 --- a/rage/src/bin/rage/error.rs +++ b/rage/src/bin/rage/error.rs @@ -30,6 +30,10 @@ pub(crate) enum EncryptError { IdentityEncryptedWithoutPassphrase(String), IdentityNotFound(String), InvalidRecipient(String), + InvalidRecipientsFile { + filename: String, + line_number: usize, + }, Io(io::Error), MissingRecipients, MixedIdentityAndPassphrase, @@ -88,6 +92,15 @@ impl fmt::Display for EncryptError { "err-enc-invalid-recipient", recipient = recipient.as_str(), ), + EncryptError::InvalidRecipientsFile { + filename, + line_number, + } => wfl!( + f, + "err-enc-invalid-recipients-file", + filename = filename.as_str(), + line_number = line_number, + ), EncryptError::Io(e) => write!(f, "{}", e), EncryptError::MissingRecipients => { wlnfl!(f, "err-enc-missing-recipients")?; diff --git a/rage/src/bin/rage/main.rs b/rage/src/bin/rage/main.rs index 922cd95..1c4481a 100644 --- a/rage/src/bin/rage/main.rs +++ b/rage/src/bin/rage/main.rs @@ -111,7 +111,7 @@ fn read_recipients_list( buf: R, recipients: &mut Vec>, plugin_recipients: &mut Vec, -) -> io::Result<()> { +) -> Result<(), error::EncryptError> { for (line_number, line) in buf.lines().enumerate() { let line = line?; @@ -121,19 +121,15 @@ fn read_recipients_list( } else if let Err(e) = parse_recipient(filename, line, recipients, plugin_recipients) { #[cfg(feature = "ssh")] if matches!(e, error::EncryptError::UnsupportedKey(_, _)) { - return Err(io::Error::new(io::ErrorKind::InvalidData, e.to_string())); + return Err(io::Error::new(io::ErrorKind::InvalidData, e.to_string()).into()); } // Return a line number in place of the line, so we don't leak the file // contents in error messages. - return Err(io::Error::new( - io::ErrorKind::InvalidData, - format!( - "recipients file {} contains non-recipient data on line {}", - filename, - line_number + 1 - ), - )); + return Err(error::EncryptError::InvalidRecipientsFile { + filename: filename.to_owned(), + line_number: line_number + 1, + }); } } From e9d474a357f96deebb89e79a934477bce4384683 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Mon, 8 Jan 2024 01:51:49 +0000 Subject: [PATCH 3/4] rage: Make error outputs more consistent --- rage/i18n/en-US/rage.ftl | 10 +++++----- rage/i18n/es-AR/rage.ftl | 8 ++++---- rage/i18n/it/rage.ftl | 8 ++++---- rage/i18n/zh-CN/rage.ftl | 4 ++-- rage/i18n/zh-TW/rage.ftl | 4 ++-- rage/src/bin/rage/error.rs | 2 +- rage/tests/cmd/rage/decrypt-missing-identities.toml | 1 - rage/tests/cmd/rage/encrypt-invalid-recipient.toml | 2 +- .../cmd/rage/encrypt-invalid-recipients-file.toml | 2 +- .../rage/encrypt-mixed-recipient-and-passphrase.toml | 2 +- .../encrypt-mixed-recipients-file-and-passphrase.toml | 2 +- .../rage/encrypt-passphrase-without-file-argument.toml | 2 +- 12 files changed, 23 insertions(+), 24 deletions(-) diff --git a/rage/i18n/en-US/rage.ftl b/rage/i18n/en-US/rage.ftl index 7ccb8af..cb3446c 100644 --- a/rage/i18n/en-US/rage.ftl +++ b/rage/i18n/en-US/rage.ftl @@ -101,18 +101,18 @@ rec-enc-broken-stdout = Are you piping to a program that isn't reading from stdi err-enc-broken-file = Could not write to file: {$err} -err-enc-invalid-recipient = Invalid recipient '{$recipient}' +err-enc-invalid-recipient = Invalid recipient '{$recipient}'. err-enc-invalid-recipients-file = - recipients file {$filename} contains non-recipient data on line {$line_number} + Recipients file '{$filename}' contains non-recipient data on line {$line_number}. err-enc-missing-recipients = Missing recipients. rec-enc-missing-recipients = Did you forget to specify {-flag-recipient}? err-enc-mixed-identity-passphrase = {-flag-identity} can't be used with {-flag-passphrase}. -err-enc-mixed-recipient-passphrase = {-flag-recipient} can't be used with {-flag-passphrase} -err-enc-mixed-recipients-file-passphrase = {-flag-recipients-file} can't be used with {-flag-passphrase} -err-enc-passphrase-without-file = File to encrypt must be passed as an argument when using {-flag-passphrase} +err-enc-mixed-recipient-passphrase = {-flag-recipient} can't be used with {-flag-passphrase}. +err-enc-mixed-recipients-file-passphrase = {-flag-recipients-file} can't be used with {-flag-passphrase}. +err-enc-passphrase-without-file = File to encrypt must be passed as an argument when using {-flag-passphrase}. err-enc-plugin-name-flag = {-flag-plugin-name} can't be used with {-flag-encrypt}. diff --git a/rage/i18n/es-AR/rage.ftl b/rage/i18n/es-AR/rage.ftl index 819753e..e1e00fb 100644 --- a/rage/i18n/es-AR/rage.ftl +++ b/rage/i18n/es-AR/rage.ftl @@ -95,15 +95,15 @@ rec-enc-broken-stdout = Estás enviando por pipe a un programa que no está leye err-enc-broken-file = No se pudo escribir al archivo: {$err} -err-enc-invalid-recipient = Destinatario inválido '{$recipient}' +err-enc-invalid-recipient = Destinatario inválido '{$recipient}'. err-enc-missing-recipients = No se encontraron destinatarios. rec-enc-missing-recipients = ¿Te olvidaste de especificar {-flag-recipient}? err-enc-mixed-identity-passphrase = {-flag-identity} no puede ser usado con {-flag-passphrase}. -err-enc-mixed-recipient-passphrase = {-flag-recipient} no puede ser usado con {-flag-passphrase} -err-enc-mixed-recipients-file-passphrase = {-flag-recipients-file} no puede ser usado con {-flag-passphrase} -err-enc-passphrase-without-file = El archivo a encriptar debe ser pasado como argumento cuando se utiliza {-flag-passphrase} +err-enc-mixed-recipient-passphrase = {-flag-recipient} no puede ser usado con {-flag-passphrase}. +err-enc-mixed-recipients-file-passphrase = {-flag-recipients-file} no puede ser usado con {-flag-passphrase}. +err-enc-passphrase-without-file = El archivo a encriptar debe ser pasado como argumento cuando se utiliza {-flag-passphrase}. ## Decryption errors diff --git a/rage/i18n/it/rage.ftl b/rage/i18n/it/rage.ftl index 3a220ff..32b0e17 100644 --- a/rage/i18n/it/rage.ftl +++ b/rage/i18n/it/rage.ftl @@ -103,15 +103,15 @@ rec-enc-broken-stdout = Stai usando una pipe verso un programma che non sta legg err-enc-broken-file = Impossibile scrivere sul file: {$err} -err-enc-invalid-recipient = Destinatario '{$recipient}' invalido +err-enc-invalid-recipient = Destinatario '{$recipient}' invalido. err-enc-missing-recipients = Destinatari mancanti. rec-enc-missing-recipients = Hai dimenticato di specificare {-flag-recipient}? err-enc-mixed-identity-passphrase = {-flag-identity} non può essere usato assieme a {-flag-passphrase}. -err-enc-mixed-recipient-passphrase = {-flag-recipient} non può essere usato assieme a {-flag-passphrase} -err-enc-mixed-recipients-file-passphrase = {-flag-recipients-file} non può essere usato assieme a {-flag-passphrase} -err-enc-passphrase-without-file = Il file da cifrare deve essere passato come argomento quando si usa {-flag-passphrase} +err-enc-mixed-recipient-passphrase = {-flag-recipient} non può essere usato assieme a {-flag-passphrase}. +err-enc-mixed-recipients-file-passphrase = {-flag-recipients-file} non può essere usato assieme a {-flag-passphrase}. +err-enc-passphrase-without-file = Il file da cifrare deve essere passato come argomento quando si usa {-flag-passphrase}. err-enc-plugin-name-flag = {-flag-plugin-name} non può essere usato assieme a {-flag-encrypt}. diff --git a/rage/i18n/zh-CN/rage.ftl b/rage/i18n/zh-CN/rage.ftl index 3c0ffcb..4823f5e 100644 --- a/rage/i18n/zh-CN/rage.ftl +++ b/rage/i18n/zh-CN/rage.ftl @@ -93,7 +93,7 @@ rec-enc-broken-stdout = 您是否输出至非从 stdin 读取数据的程序？ err-enc-broken-file = 未能写入文件： {$err} -err-enc-invalid-recipient = 无效接收方 '{$recipient}' +err-enc-invalid-recipient = 无效接收方 '{$recipient}'。 err-enc-missing-recipients = 缺少接收方。 rec-enc-missing-recipients = 您是否忘记指定 {-flag-recipient} 标记？ @@ -101,7 +101,7 @@ rec-enc-missing-recipients = 您是否忘记指定 {-flag-recipient} 标记？ err-enc-mixed-identity-passphrase = {-flag-identity} 和 {-flag-passphrase} 标记不可联用。 err-enc-mixed-recipient-passphrase = {-flag-recipient} 和 {-flag-passphrase} 标记不可联用。 err-enc-mixed-recipients-file-passphrase = {-flag-recipients-file} 和 {-flag-passphrase} 标记不可联用。 -err-enc-passphrase-without-file = 在使用 {-flag-passphrase} 时， 必将要加密的文件传递为参数 +err-enc-passphrase-without-file = 在使用 {-flag-passphrase} 时， 必将要加密的文件传递为参数。 ## Decryption errors diff --git a/rage/i18n/zh-TW/rage.ftl b/rage/i18n/zh-TW/rage.ftl index 3fe2642..58d4fea 100644 --- a/rage/i18n/zh-TW/rage.ftl +++ b/rage/i18n/zh-TW/rage.ftl @@ -93,7 +93,7 @@ rec-enc-broken-stdout = 您是否輸出至非從 stdin 讀取數據的程序？ err-enc-broken-file = 未能寫入文件： {$err} -err-enc-invalid-recipient = 無效接收方 '{$recipient}' +err-enc-invalid-recipient = 無效接收方 '{$recipient}'。 err-enc-missing-recipients = 缺少接收方。 rec-enc-missing-recipients = 您是否忘記指定 {-flag-recipient} 標記？ @@ -101,7 +101,7 @@ rec-enc-missing-recipients = 您是否忘記指定 {-flag-recipient} 標記？ err-enc-mixed-identity-passphrase = {-flag-identity} 和 {-flag-passphrase} 標記不可聯用。 err-enc-mixed-recipient-passphrase = {-flag-recipient} 和 {-flag-passphrase} 標記不可聯用。 err-enc-mixed-recipients-file-passphrase = {-flag-recipients-file} 和 {-flag-passphrase} 標記不可聯用。 -err-enc-passphrase-without-file = 在使用 {-flag-passphrase} 時， 必將要加密的文件傳遞為參數 +err-enc-passphrase-without-file = 在使用 {-flag-passphrase} 時， 必將要加密的文件傳遞為參數。 ## Decryption errors diff --git a/rage/src/bin/rage/error.rs b/rage/src/bin/rage/error.rs index 5ce09a3..d175044 100644 --- a/rage/src/bin/rage/error.rs +++ b/rage/src/bin/rage/error.rs @@ -196,7 +196,7 @@ impl fmt::Display for DecryptError { DecryptError::Io(e) => write!(f, "{}", e), DecryptError::MissingIdentities => { wlnfl!(f, "err-dec-missing-identities")?; - wlnfl!(f, "rec-dec-missing-identities") + wfl!(f, "rec-dec-missing-identities") } DecryptError::MixedIdentityAndPassphrase => { wfl!(f, "err-dec-mixed-identity-passphrase") diff --git a/rage/tests/cmd/rage/decrypt-missing-identities.toml b/rage/tests/cmd/rage/decrypt-missing-identities.toml index c211d67..17ec1c2 100644 --- a/rage/tests/cmd/rage/decrypt-missing-identities.toml +++ b/rage/tests/cmd/rage/decrypt-missing-identities.toml @@ -16,7 +16,6 @@ stderr = """ Error: Missing identities. Did you forget to specify -i/--identity? - [ Did rage not do what you expected? Could an error be more useful? ] [ Tell us: https://str4d.xyz/rage/report ] """ diff --git a/rage/tests/cmd/rage/encrypt-invalid-recipient.toml b/rage/tests/cmd/rage/encrypt-invalid-recipient.toml index 9761e27..12e24c3 100644 --- a/rage/tests/cmd/rage/encrypt-invalid-recipient.toml +++ b/rage/tests/cmd/rage/encrypt-invalid-recipient.toml @@ -4,7 +4,7 @@ status = "failed" stdin = "" stdout = "" stderr = """ -Error: Invalid recipient 'foobar' +Error: Invalid recipient 'foobar'. [ Did rage not do what you expected? Could an error be more useful? ] [ Tell us: https://str4d.xyz/rage/report ] diff --git a/rage/tests/cmd/rage/encrypt-invalid-recipients-file.toml b/rage/tests/cmd/rage/encrypt-invalid-recipients-file.toml index 691c687..7c38637 100644 --- a/rage/tests/cmd/rage/encrypt-invalid-recipients-file.toml +++ b/rage/tests/cmd/rage/encrypt-invalid-recipients-file.toml @@ -4,7 +4,7 @@ status = "failed" stdin = "" stdout = "" stderr = """ -Error: recipients file recipients.txt contains non-recipient data on line 1 +Error: Recipients file 'recipients.txt' contains non-recipient data on line 1. [ Did rage not do what you expected? Could an error be more useful? ] [ Tell us: https://str4d.xyz/rage/report ] diff --git a/rage/tests/cmd/rage/encrypt-mixed-recipient-and-passphrase.toml b/rage/tests/cmd/rage/encrypt-mixed-recipient-and-passphrase.toml index dafd8bf..4e7cd48 100644 --- a/rage/tests/cmd/rage/encrypt-mixed-recipient-and-passphrase.toml +++ b/rage/tests/cmd/rage/encrypt-mixed-recipient-and-passphrase.toml @@ -4,7 +4,7 @@ status = "failed" stdin = "" stdout = "" stderr = """ -Error: -r/--recipient can't be used with -p/--passphrase +Error: -r/--recipient can't be used with -p/--passphrase. [ Did rage not do what you expected? Could an error be more useful? ] [ Tell us: https://str4d.xyz/rage/report ] diff --git a/rage/tests/cmd/rage/encrypt-mixed-recipients-file-and-passphrase.toml b/rage/tests/cmd/rage/encrypt-mixed-recipients-file-and-passphrase.toml index 4015fa2..eef4363 100644 --- a/rage/tests/cmd/rage/encrypt-mixed-recipients-file-and-passphrase.toml +++ b/rage/tests/cmd/rage/encrypt-mixed-recipients-file-and-passphrase.toml @@ -4,7 +4,7 @@ status = "failed" stdin = "" stdout = "" stderr = """ -Error: -R/--recipients-file can't be used with -p/--passphrase +Error: -R/--recipients-file can't be used with -p/--passphrase. [ Did rage not do what you expected? Could an error be more useful? ] [ Tell us: https://str4d.xyz/rage/report ] diff --git a/rage/tests/cmd/rage/encrypt-passphrase-without-file-argument.toml b/rage/tests/cmd/rage/encrypt-passphrase-without-file-argument.toml index dae0cfd..2f393d4 100644 --- a/rage/tests/cmd/rage/encrypt-passphrase-without-file-argument.toml +++ b/rage/tests/cmd/rage/encrypt-passphrase-without-file-argument.toml @@ -4,7 +4,7 @@ status = "failed" stdin = "" stdout = "" stderr = """ -Error: File to encrypt must be passed as an argument when using -p/--passphrase +Error: File to encrypt must be passed as an argument when using -p/--passphrase. [ Did rage not do what you expected? Could an error be more useful? ] [ Tell us: https://str4d.xyz/rage/report ] From a26b7eaf73598ab7e5032836c26f980a43800114 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Mon, 8 Jan 2024 02:54:50 +0000 Subject: [PATCH 4/4] age-plugin: Fix bugs in README --- age-plugin/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/age-plugin/README.md b/age-plugin/README.md index b7b25bf..22caf6d 100644 --- a/age-plugin/README.md +++ b/age-plugin/README.md @@ -120,7 +120,7 @@ impl IdentityPluginV1 for IdentityPlugin { index: usize, plugin_name: &str, bytes: &[u8] - ) -> Result<(), identityw::Error> { + ) -> Result<(), identity::Error> { todo!() } @@ -149,8 +149,8 @@ fn main() -> io::Result<()> { // The plugin was started by an age client; run the state machine. run_state_machine( &state_machine, - || RecipientPlugin, - || IdentityPlugin, + Some(|| RecipientPlugin), + Some(|| IdentityPlugin), )?; return Ok(()); }