diff --git a/backend/Cargo.lock b/backend/Cargo.lock index 265cccc28..baf116394 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -60,6 +60,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + [[package]] name = "ansi_term" version = "0.12.1" @@ -99,7 +108,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" dependencies = [ - "term 0.7.0", + "term", ] [[package]] @@ -325,17 +334,6 @@ dependencies = [ "wyz", ] -[[package]] -name = "blake2b_simd" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "constant_time_eq", -] - [[package]] name = "blake2b_simd" version = "1.0.0" @@ -407,7 +405,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed59b5c00048f48d7af971b71f800fdf23e858844a6f9e4d32ca72e9399e7864" dependencies = [ "serde", - "serde_with", + "serde_with 1.14.0", ] [[package]] @@ -475,15 +473,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.19" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" dependencies = [ - "libc", + "iana-time-zone", + "js-sys", "num-integer", "num-traits", "serde", "time 0.1.44", + "wasm-bindgen", "winapi", ] @@ -634,7 +634,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94d4706de1b0fa5b132270cddffa8585166037822e260a944fe161acd137ca05" dependencies = [ "percent-encoding", - "time 0.3.12", + "time 0.3.14", "version_check", ] @@ -650,7 +650,7 @@ dependencies = [ "publicsuffix", "serde", "serde_json", - "time 0.3.12", + "time 0.3.14", "url", ] @@ -819,6 +819,16 @@ dependencies = [ "darling_macro 0.13.4", ] +[[package]] +name = "darling" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4529658bdda7fd6769b8614be250cdcfc3aeb0ee72fe66f9e41e5e5eb73eac02" +dependencies = [ + "darling_core 0.14.1", + "darling_macro 0.14.1", +] + [[package]] name = "darling_core" version = "0.10.2" @@ -847,6 +857,20 @@ dependencies = [ "syn 1.0.98", ] +[[package]] +name = "darling_core" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "649c91bc01e8b1eac09fb91e8dbc7d517684ca6be8ebc75bb9cafc894f9fdb6f" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2 1.0.42", + "quote 1.0.20", + "strsim 0.10.0", + "syn 1.0.98", +] + [[package]] name = "darling_macro" version = "0.10.2" @@ -869,6 +893,17 @@ dependencies = [ "syn 1.0.98", ] +[[package]] +name = "darling_macro" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddfc69c5bfcbd2fc09a0f38451d2daf0e372e367986a83906d1b0dbc88134fb5" +dependencies = [ + "darling_core 0.14.1", + "quote 1.0.20", + "syn 1.0.98", +] + [[package]] name = "dashmap" version = "5.3.4" @@ -876,7 +911,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3495912c9c1ccf2e18976439f4443f3fee0fd61f424ff99fde6a66b15ecb448f" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.12.3", + "hashbrown", "lock_api", "parking_lot_core 0.9.3", ] @@ -1006,17 +1041,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "dirs" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" -dependencies = [ - "libc", - "redox_users 0.3.5", - "winapi", -] - [[package]] name = "dirs" version = "4.0.0" @@ -1043,7 +1067,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", - "redox_users 0.4.3", + "redox_users", "winapi", ] @@ -1054,7 +1078,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", - "redox_users 0.4.3", + "redox_users", "winapi", ] @@ -1165,7 +1189,7 @@ dependencies = [ "libc", "log", "models", - "nix 0.24.2", + "nix 0.25.0", "nom 7.1.1", "num", "num_enum", @@ -1185,11 +1209,11 @@ dependencies = [ "reqwest_cookie_store", "rpassword", "rpc-toolkit", - "rust-argon2 1.0.0", + "rust-argon2", "scopeguard", "serde", "serde_json", - "serde_with", + "serde_with 2.0.1", "serde_yaml", "sha2 0.10.2", "sha2 0.9.9", @@ -1238,9 +1262,9 @@ dependencies = [ [[package]] name = "encode_unicode" -version = "0.3.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] name = "encoding_rs" @@ -1259,9 +1283,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" [[package]] name = "enum-as-inner" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" +checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ "heck 0.4.0", "proc-macro2 1.0.42", @@ -1628,12 +1652,6 @@ version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" - [[package]] name = "hashbrown" version = "0.12.3" @@ -1649,7 +1667,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d452c155cb93fecdfb02a73dd57b5d8e442c2063bd7aac72f1bc5e4263a43086" dependencies = [ - "hashbrown 0.12.3", + "hashbrown", ] [[package]] @@ -1840,6 +1858,19 @@ dependencies = [ "tokio", ] +[[package]] +name = "iana-time-zone" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad2bfd338099682614d3ee3fe0cd72e0b6a41ca6a87f6a74a3bd593c91650501" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "js-sys", + "wasm-bindgen", + "winapi", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -1912,7 +1943,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", - "hashbrown 0.12.3", + "hashbrown", "serde", ] @@ -1999,7 +2030,7 @@ dependencies = [ "serde", "serde_json", "thiserror", - "time 0.3.12", + "time 0.3.14", ] [[package]] @@ -2105,7 +2136,7 @@ dependencies = [ "regex", "regex-syntax", "string_cache", - "term 0.7.0", + "term", "tiny-keccak", "unicode-xid 0.2.3", ] @@ -2219,9 +2250,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.126" +version = "0.2.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" [[package]] name = "libloading" @@ -2233,12 +2264,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - [[package]] name = "lock_api" version = "0.4.7" @@ -2410,6 +2435,20 @@ dependencies = [ "memoffset", ] +[[package]] +name = "nix" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb" +dependencies = [ + "autocfg", + "bitflags", + "cfg-if 1.0.0", + "libc", + "memoffset", + "pin-utils", +] + [[package]] name = "nom" version = "5.1.2" @@ -2934,15 +2973,15 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "prettytable-rs" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fd04b170004fa2daccf418a7f8253aaf033c27760b5f225889024cf66d7ac2e" +checksum = "5f375cb74c23b51d23937ffdeb48b1fbf5b6409d4b9979c1418c1de58bc8f801" dependencies = [ "atty", "csv", "encode_unicode", "lazy_static", - "term 0.5.2", + "term", "unicode-width", ] @@ -3013,18 +3052,16 @@ dependencies = [ [[package]] name = "psl-types" -version = "2.0.10" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8eda7c62d9ecaafdf8b62374c006de0adf61666ae96a96ba74a37134aa4e470" +checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" [[package]] name = "publicsuffix" -version = "2.1.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "292972edad6bbecc137ab84c5e36421a4a6c979ea31d3cc73540dd04315b33e1" +checksum = "aeeedb0b429dc462f30ad27ef3de97058b060016f47790c066757be38ef792b4" dependencies = [ - "byteorder", - "hashbrown 0.11.2", "idna", "psl-types", ] @@ -3179,17 +3216,6 @@ dependencies = [ "bitflags", ] -[[package]] -name = "redox_users" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" -dependencies = [ - "getrandom 0.1.16", - "redox_syscall 0.1.57", - "rust-argon2 0.8.3", -] - [[package]] name = "redox_users" version = "0.4.3" @@ -3280,9 +3306,9 @@ dependencies = [ [[package]] name = "reqwest_cookie_store" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc7d9a4063adcdfbb061aa3011b813cce95d3a8990f9ccb5ea85017916a1b0b" +checksum = "0568e27f107b933735a07b3f8cb985ecfe3d3ce2f2225f82f10b3750f5981263" dependencies = [ "bytes", "cookie", @@ -3308,13 +3334,11 @@ dependencies = [ [[package]] name = "rpassword" -version = "6.0.1" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf099a1888612545b683d2661a1940089f6c2e5a8e38979b2159da876bfd956" +checksum = "26b763cb66df1c928432cc35053f8bd4cec3335d8559fc16010017d16b3c1680" dependencies = [ "libc", - "serde", - "serde_json", "winapi", ] @@ -3362,18 +3386,6 @@ dependencies = [ "syn 1.0.98", ] -[[package]] -name = "rust-argon2" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" -dependencies = [ - "base64 0.13.0", - "blake2b_simd 0.5.11", - "constant_time_eq", - "crossbeam-utils", -] - [[package]] name = "rust-argon2" version = "1.0.0" @@ -3381,7 +3393,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b50162d19404029c1ceca6f6980fe40d45c8b369f6f44446fa14bb39573b5bb9" dependencies = [ "base64 0.13.0", - "blake2b_simd 1.0.0", + "blake2b_simd", "constant_time_eq", "crossbeam-utils", ] @@ -3539,9 +3551,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.141" +version = "1.0.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7af873f2c95b99fcb0bd0fe622a43e29514658873c8ceba88c4cb88833a22500" +checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860" dependencies = [ "serde_derive", ] @@ -3575,9 +3587,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.141" +version = "1.0.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75743a150d003dd863b51dc809bcad0d73f2102c53632f1e954e738192a3413f" +checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" dependencies = [ "proc-macro2 1.0.42", "quote 1.0.20", @@ -3586,9 +3598,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.82" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" +checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" dependencies = [ "indexmap", "itoa 1.0.2", @@ -3626,9 +3638,24 @@ version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" dependencies = [ + "serde", + "serde_with_macros 1.5.2", +] + +[[package]] +name = "serde_with" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368f2d60d049ea019a84dcd6687b0d1e0030fe663ae105039bdf967ed5e6a9a7" +dependencies = [ + "base64 0.13.0", + "chrono", + "hex", + "indexmap", "serde", "serde_json", - "serde_with_macros", + "serde_with_macros 2.0.1", + "time 0.3.14", ] [[package]] @@ -3644,15 +3671,28 @@ dependencies = [ ] [[package]] -name = "serde_yaml" -version = "0.8.26" +name = "serde_with_macros" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" +checksum = "1ccadfacf6cf10faad22bbadf55986bdd0856edfb5d9210aa1dcf1f516e84e93" +dependencies = [ + "darling 0.14.1", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", +] + +[[package]] +name = "serde_yaml" +version = "0.9.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89f31df3f50926cdf2855da5fd8812295c34752cb20438dae42a67f79e021ac3" dependencies = [ "indexmap", + "itoa 1.0.2", "ryu", "serde", - "yaml-rust", + "unsafe-libyaml", ] [[package]] @@ -3858,7 +3898,7 @@ dependencies = [ "chrono", "crc", "crossbeam-queue", - "dirs 4.0.0", + "dirs", "either", "event-listener", "futures-channel", @@ -4433,17 +4473,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "term" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" -dependencies = [ - "byteorder", - "dirs 1.0.5", - "winapi", -] - [[package]] name = "term" version = "0.7.0" @@ -4541,14 +4570,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.12" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b7cc93fc23ba97fde84f7eea56c55d1ba183f495c6715defdfc7b9cb8c870f" +checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b" dependencies = [ "itoa 1.0.2", - "js-sys", "libc", "num_threads", + "serde", "time-macros", ] @@ -4850,29 +4879,29 @@ dependencies = [ [[package]] name = "trust-dns-client" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6d9ba1c6079f6f9b4664e482db1700bd53d2ee77b1c9752c1d7a66c0c8bda99" +checksum = "6c408c32e6a9dbb38037cece35740f2cf23c875d8ca134d33631cec83f74d3fe" dependencies = [ "cfg-if 1.0.0", "data-encoding", "futures-channel", "futures-util", "lazy_static", - "log", "radix_trie", "rand 0.8.5", "thiserror", - "time 0.3.12", + "time 0.3.14", "tokio", + "tracing", "trust-dns-proto", ] [[package]] name = "trust-dns-proto" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" +checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" dependencies = [ "async-trait", "cfg-if 1.0.0", @@ -4884,34 +4913,33 @@ dependencies = [ "idna", "ipnet", "lazy_static", - "log", "rand 0.8.5", "smallvec", "thiserror", "tinyvec", "tokio", + "tracing", "url", ] [[package]] name = "trust-dns-server" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a395a2e0fd8aac9b4613767a5b4ba4b2040de1b767fa03ace8c9d6f351d60b2d" +checksum = "1583cf9f8a359c9f16fdf760b79cb2be3f261b98db8027f81959c7a4f6645e2c" dependencies = [ "async-trait", "bytes", "cfg-if 1.0.0", "enum-as-inner", - "env_logger 0.9.0", "futures-executor", "futures-util", - "log", "serde", "thiserror", - "time 0.3.12", + "time 0.3.14", "tokio", "toml", + "tracing", "trust-dns-client", "trust-dns-proto", ] @@ -5031,6 +5059,12 @@ dependencies = [ "void", ] +[[package]] +name = "unsafe-libyaml" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "931179334a56395bcf64ba5e0ff56781381c1a5832178280c7d7f91d1679aeb0" + [[package]] name = "untrusted" version = "0.7.1" @@ -5380,15 +5414,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "zeroize" version = "1.5.7" diff --git a/backend/Cargo.toml b/backend/Cargo.toml index fd64d6df3..62c106ab0 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -87,7 +87,7 @@ lazy_static = "1.4.0" libc = "0.2.126" log = "0.4.17" models = { version = "*", path = "../libs/models" } -nix = "0.24.1" +nix = "0.25.0" nom = "7.1.1" num = "0.4.0" num_enum = "0.5.7" @@ -99,15 +99,15 @@ patch-db = { version = "*", path = "../patch-db/patch-db", features = [ pbkdf2 = "0.11.0" pin-project = "1.0.11" pkcs8 = { version = "0.9.0", features = ["std"] } -prettytable-rs = "0.8.0" +prettytable-rs = "0.9.0" proptest = "1.0.0" proptest-derive = "0.3.0" rand = { version = "0.8.5", features = ["std"] } rand-old = { package = "rand", version = "0.7.3" } regex = "1.6.0" reqwest = { version = "0.11.11", features = ["stream", "json", "socks"] } -reqwest_cookie_store = "0.3.0" -rpassword = "6.0.1" +reqwest_cookie_store = "0.4.0" +rpassword = "7.0.0" rpc-toolkit = "0.2.1" rust-argon2 = "1.0.0" scopeguard = "1.1" # because avahi-sys fucks your shit up @@ -115,8 +115,8 @@ serde = { version = "1.0.139", features = ["derive", "rc"] } serde_cbor = { package = "ciborium", version = "0.2.0" } serde_json = "1.0.82" serde_toml = { package = "toml", version = "0.5.9" } -serde_with = { version = "1.14.0", features = ["macros", "json"] } -serde_yaml = "0.8.25" +serde_with = { version = "2.0.1", features = ["macros", "json"] } +serde_yaml = "0.9.11" sha2 = "0.10.2" sha2-old = { package = "sha2", version = "0.9.9" } simple-logging = "2.0.2" @@ -139,7 +139,7 @@ tracing = "0.1.35" tracing-error = "0.2.0" tracing-futures = "0.2.5" tracing-subscriber = { version = "0.3.14", features = ["env-filter"] } -trust-dns-server = "0.21.2" +trust-dns-server = "0.22.0" typed-builder = "0.10.0" url = { version = "2.2.2", features = ["serde"] } uuid = { version = "1.1.2", features = ["v4"] } diff --git a/backend/src/auth.rs b/backend/src/auth.rs index 462119098..e1509f6af 100644 --- a/backend/src/auth.rs +++ b/backend/src/auth.rs @@ -203,7 +203,7 @@ fn display_sessions(arg: SessionList, matches: &ArgMatches) { } table.add_row(row); } - table.print_tty(false); + table.print_tty(false).unwrap(); } #[command(display(display_sessions))] diff --git a/backend/src/backup/target/mod.rs b/backend/src/backup/target/mod.rs index 65806ee15..c87e914a9 100644 --- a/backend/src/backup/target/mod.rs +++ b/backend/src/backup/target/mod.rs @@ -217,7 +217,7 @@ fn display_backup_info(info: BackupInfo, matches: &ArgMatches) { ]; table.add_row(row); } - table.print_tty(false); + table.print_tty(false).unwrap(); } #[command(display(display_backup_info))] diff --git a/backend/src/disk/mod.rs b/backend/src/disk/mod.rs index 4cc2b5ce9..91e63f21b 100644 --- a/backend/src/disk/mod.rs +++ b/backend/src/disk/mod.rs @@ -70,7 +70,7 @@ fn display_disk_info(info: Vec, matches: &ArgMatches) { table.add_row(row); } } - table.print_tty(false); + table.print_tty(false).unwrap(); } #[command(display(display_disk_info))] diff --git a/backend/src/net/tor.rs b/backend/src/net/tor.rs index ae66d3004..590bba2a4 100644 --- a/backend/src/net/tor.rs +++ b/backend/src/net/tor.rs @@ -44,7 +44,7 @@ fn display_services(services: Vec, matches: &ArgMatches) { let row = row![&service.to_string()]; table.add_row(row); } - table.print_tty(false); + table.print_tty(false).unwrap(); } #[command(rename = "list-services", display(display_services))] diff --git a/backend/src/net/wifi.rs b/backend/src/net/wifi.rs index 65f3bfb73..90ed8d0b7 100644 --- a/backend/src/net/wifi.rs +++ b/backend/src/net/wifi.rs @@ -215,7 +215,7 @@ fn display_wifi_info(info: WiFiInfo, matches: &ArgMatches) { &info.country.alpha2(), &format!("{}", info.ethernet) ]); - table_global.print_tty(false); + table_global.print_tty(false).unwrap(); let mut table_ssids = Table::new(); table_ssids.add_row(row![bc => "SSID", "STRENGTH"]); @@ -233,7 +233,7 @@ fn display_wifi_info(info: WiFiInfo, matches: &ArgMatches) { .for_each(drop); table_ssids.add_row(row); } - table_ssids.print_tty(false); + table_ssids.print_tty(false).unwrap(); let mut table_global = Table::new(); table_global.add_row(row![bc => @@ -249,7 +249,7 @@ fn display_wifi_info(info: WiFiInfo, matches: &ArgMatches) { ]); } - table_global.print_tty(false); + table_global.print_tty(false).unwrap(); } fn display_wifi_list(info: Vec, matches: &ArgMatches) { @@ -273,7 +273,7 @@ fn display_wifi_list(info: Vec, matches: &ArgMatches) { ]); } - table_global.print_tty(false); + table_global.print_tty(false).unwrap(); } #[command(display(display_wifi_info))] diff --git a/backend/src/ssh.rs b/backend/src/ssh.rs index c9b02a88f..4894c7152 100644 --- a/backend/src/ssh.rs +++ b/backend/src/ssh.rs @@ -137,7 +137,7 @@ fn display_all_ssh_keys(all: Vec, matches: &ArgMatches) { ]; table.add_row(row); } - table.print_tty(false); + table.print_tty(false).unwrap(); } #[command(display(display_all_ssh_keys))] diff --git a/backend/src/util/io.rs b/backend/src/util/io.rs index 8953b1c51..ba8e10196 100644 --- a/backend/src/util/io.rs +++ b/backend/src/util/io.rs @@ -113,7 +113,9 @@ where T: serde::Serialize, W: AsyncWrite + Unpin, { - let mut buffer = serde_yaml::to_vec(value).with_kind(crate::ErrorKind::Serialization)?; + let mut buffer = serde_yaml::to_string(value) + .with_kind(crate::ErrorKind::Serialization)? + .into_bytes(); buffer.extend_from_slice(b"\n"); writer.write_all(&buffer).await?; Ok(()) diff --git a/backend/src/util/serde.rs b/backend/src/util/serde.rs index bc6038a30..2a6e9bdd6 100644 --- a/backend/src/util/serde.rs +++ b/backend/src/util/serde.rs @@ -337,7 +337,9 @@ impl IoFormat { IoFormat::JsonPretty => { serde_json::to_vec_pretty(value).with_kind(crate::ErrorKind::Serialization) } - IoFormat::Yaml => serde_yaml::to_vec(value).with_kind(crate::ErrorKind::Serialization), + IoFormat::Yaml => serde_yaml::to_string(value) + .with_kind(crate::ErrorKind::Serialization) + .map(|s| s.into_bytes()), IoFormat::Cbor => { let mut res = Vec::new(); serde_cbor::ser::into_writer(value, &mut res) diff --git a/system-images/compat/Cargo.toml b/system-images/compat/Cargo.toml index 3a2ff7db3..9c7773264 100644 --- a/system-images/compat/Cargo.toml +++ b/system-images/compat/Cargo.toml @@ -19,7 +19,7 @@ itertools = "0.10.0" lazy_static = "1.4" linear-map = { version = "1.2", features = ["serde_impl"] } log = "0.4.11" -nix = "0.24.1" +nix = "0.25.0" pest = "2.1" pest_derive = "2.1" rand = "0.8.5"