diff --git a/Cargo.lock b/Cargo.lock index 1052451f6..74fc2ec70 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -308,12 +308,6 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" -[[package]] -name = "arrayref" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" - [[package]] name = "arrayvec" version = "0.5.2" @@ -384,7 +378,7 @@ checksum = "b9552f96391c005e6ab449fa941420935e7e062489b12b8b1b08879b2163f5b5" dependencies = [ "bytes", "half", - "num-bigint", + "num-bigint 0.4.8", "num-traits", ] @@ -834,13 +828,13 @@ checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06" [[package]] name = "bcrypt" -version = "0.15.1" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e65938ed058ef47d92cf8b346cc76ef48984572ade631927e9937b5ffc7662c7" +checksum = "abaf6da45c74385272ddf00e1ac074c7d8a6c1a1dda376902bd6a427522a8b2c" dependencies = [ "base64 0.22.1", "blowfish 0.9.1", - "getrandom 0.2.17", + "getrandom 0.3.4", "subtle", "zeroize", ] @@ -875,7 +869,7 @@ checksum = "4d6867f1565b3aad85681f1015055b087fcfd840d6aeee6eee7f2da317603695" dependencies = [ "autocfg", "libm", - "num-bigint", + "num-bigint 0.4.8", "num-integer", "num-traits", "serde", @@ -945,9 +939,9 @@ checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" [[package]] name = "bitcoin-consensus-encoding" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "207311705279250ba465076a1bac4b1ac982855fff73fc5f67e22158ac58cdc9" +checksum = "6712f9c6fd6785b3b270884e57c441c403dc5d7e19ca45368c97c7a1de3000ec" dependencies = [ "bitcoin-internals", "hex-conservative 1.2.0", @@ -1047,22 +1041,20 @@ dependencies = [ [[package]] name = "blake2b_simd" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b79834656f71332577234b50bfc009996f7449e0c056884e6a02492ded0ca2f3" +checksum = "3560a7b1951efe814fcd721938313adc56753ca39f4b23847d7e9a2402f5dbff" dependencies = [ - "arrayref", "arrayvec 0.7.8", "constant_time_eq", ] [[package]] name = "blake3" -version = "1.8.6" +version = "1.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ae7bad254120e9e4c63bafc385310756f90c484eac0e36b8317cf09cb92a77" +checksum = "6d9e454fc11f76977dc803893aff6304ed33d6a26efae8696573bea74baa27ae" dependencies = [ - "arrayref", "arrayvec 0.7.8", "cc", "cfg-if", @@ -1353,9 +1345,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.4.2" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d262e149917187838d5b42777c8253bcb64500067342904e7d429499a6f277e" +checksum = "509591b7bcd67f4ef775afad7662703b4935daaa6ec0e5605cfb1090b32a2b6d" dependencies = [ "find-msvc-tools", "jobserver", @@ -1448,7 +1440,7 @@ dependencies = [ "jupiter", "jupiter-migrate", "orion-client", - "pgp", + "pgp 0.20.0", "rand 0.10.2", "regex", "reqwest 0.13.4", @@ -1673,7 +1665,7 @@ dependencies = [ "envsubst", "git-internal", "idgenerator", - "pgp", + "pgp 0.20.0", "redis", "regex", "rkyv 0.8.18", @@ -2316,7 +2308,7 @@ dependencies = [ "asn1-rs", "displaydoc", "nom 7.1.3", - "num-bigint", + "num-bigint 0.4.8", "num-traits", "rusticata-macros", ] @@ -2900,22 +2892,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "etcd-client" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88365f1a5671eb2f7fc240adb216786bc6494b38ce15f1d26ad6eaa303d5e822" -dependencies = [ - "http", - "prost", - "tokio", - "tokio-stream", - "tonic", - "tonic-build", - "tower", - "tower-service", -] - [[package]] name = "etcetera" version = "0.11.0" @@ -2989,9 +2965,9 @@ checksum = "64cd1e32ddd350061ae6edb1b082d7c54915b5c672c389143b9a63403a109f24" [[package]] name = "find-msvc-tools" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b73573e6edcd2af0cdf47bd6cb58f0b3839491263c314eaad1ccf24430e1de" +checksum = "d45db016d36b838f563236e9193d0ee6ce38f3f68b6c94e914b4929c96bbb890" [[package]] name = "fixedbitset" @@ -3096,9 +3072,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88cf1f829d945f548cf8fec32c61b1f202b6d93b45848602fc02af4b12ad218" +checksum = "9a31d2a3fbaaeb2af2368bbdd904aa8e812d3c04a1ee10d3171f52d556e5d0a3" dependencies = [ "futures-channel", "futures-core", @@ -3111,9 +3087,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "262590f4fe6afeb0bc83be1daa64e52657fe185690a958af7f3ad0e92085c5ae" +checksum = "b1f9e3d69d39e4862ffed03ed071a76f9a13ba1d9109d355b0f0aa6b15e393c4" dependencies = [ "futures-core", "futures-sink", @@ -3121,15 +3097,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cd50c473c80f6d7c3670a752354b8e569b1a7cbfdc0419ec88e5edad85e0dc7" +checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e" [[package]] name = "futures-executor" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6754879cc9f2c66f88c6e5c35344bb0bdb0708b0352b1201815667c7eabc7458" +checksum = "031b47cf1a3c6cc8bc2fc76cd437f521619387907d469316e7c0bc278f1f5432" dependencies = [ "futures-core", "futures-task", @@ -3149,38 +3125,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4577ecaa3c4f96589d473f679a71b596316f6641bc350038b962a5daf0085d7a" +checksum = "53c0fa8157de1303bfffdaa1cc2a673bfffb60102f76b0ef4441659124373fed" [[package]] name = "futures-macro" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d6d3cde68c518367be28956066ddfef33813991b77a55005a69dae04bf3b10b" +checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.3", ] [[package]] name = "futures-sink" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e34418ac499d6305c2fb5ad0ed2f6ac998c5f8ca209b4510f7f94242c647e307" +checksum = "1944426bf7d03f1d14f708785e4b33efd750b36d48a157b836b3efc15ede8e1d" [[package]] name = "futures-task" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b231ed28831efb4a61a08580c4bc233ec56bc009f4cd8f52da2c3cb97df0c109" +checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd" [[package]] name = "futures-util" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a77a90a256fce34da66415271e30f94ee91c57b04b8a2c042d9cf3220179deaa" +checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc" dependencies = [ "futures-channel", "futures-core", @@ -3215,9 +3191,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "1.4.4" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4e5aa225bc56696909483320f0ff9b600f1a971b52e07a17d70f3d9b43254b" +checksum = "337d46834ee672ab3e48caca2cb0c78cc174fb12b3a68d0d88f99a0519a5e36e" dependencies = [ "generic-array 0.14.7", "rustversion", @@ -3388,9 +3364,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.15" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb093c84e8bd9b188d4c4a8cb6579fc016968d14c99882163cd3ff402a4f155" +checksum = "9f877e75f39e9827ec50a572dd592684ac28c029578726c85f1b2aa6ab807449" dependencies = [ "atomic-waker", "bytes", @@ -3651,9 +3627,9 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f41fd6a08e4d4ec69df65976da761afd5ad5e58a9d4acb46bd1c953a9e3ff2" +checksum = "23169fe34a5fbcdd3f3862e78fb9b6fccd5f02a6dc6f732547005d45631ce71c" dependencies = [ "bytes", "futures-core", @@ -3776,7 +3752,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.6.5", + "socket2", "system-configuration", "tokio", "tower-service", @@ -3810,9 +3786,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c" +checksum = "fa68d21081c4a05d5a901a1c62add574c77048b6a1c67be3b50ce0b60d4ca513" dependencies = [ "displaydoc", "potential_utf", @@ -3824,9 +3800,9 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29" +checksum = "d56e28588da92eee5c3201a6eff33fabdd49b62269c8938d4ff050ce4d900deb" dependencies = [ "displaydoc", "litemap", @@ -3837,9 +3813,9 @@ dependencies = [ [[package]] name = "icu_normalizer" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4" +checksum = "12f9cf5f235641ed274641dd81c3f28d870e276763d0797aeeab72317b1c646f" dependencies = [ "icu_collections", "icu_normalizer_data", @@ -3851,16 +3827,17 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38" +checksum = "1563da1ed3e0b3bf3d74c9b85917ac9c56464d2f57242270c09c9e752f8021a0" [[package]] name = "icu_properties" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de" +checksum = "7e7ca276ad3145661a65914e6daf131ca5120cd3dcee8f8f3214b8875184a148" dependencies = [ + "displaydoc", "icu_collections", "icu_locale_core", "icu_properties_data", @@ -3871,15 +3848,15 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14" +checksum = "e590f038c1464a96894fd6d10127e90a8be4509f56ff7ecef851b15cee0b7caa" [[package]] name = "icu_provider" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421" +checksum = "92a7ed671a6aad807a8651a2e1782a6598fda9ce5185dd8158549e95a91c6428" dependencies = [ "displaydoc", "icu_locale_core", @@ -4059,9 +4036,9 @@ checksum = "6a756c3fac73139e83f14c2d742155dd2b78d3ee56597b419a0579b7bdd6dd78" [[package]] name = "ipnetwork" -version = "0.20.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e" +checksum = "02c3eaab3ac0ede60ffa41add21970a7df7d91772c03383aac6c2c3d53cc716b" dependencies = [ "serde", ] @@ -4278,7 +4255,7 @@ dependencies = [ "indexmap 2.14.0", "io-orbit", "jupiter-migrate", - "pgp", + "pgp 0.20.0", "rand 0.10.2", "redis", "redis-test", @@ -4450,7 +4427,7 @@ dependencies = [ "quoted_printable", "rustls", "rustls-platform-verifier", - "socket2 0.6.5", + "socket2", "tokio", "tokio-rustls", "url", @@ -4583,14 +4560,14 @@ dependencies = [ [[package]] name = "libredox" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2026a5056764a10b2bf5d56488cba40da507f5493a6a429340e2004d9ed085fa" +checksum = "28d0a00925a9f930d679b6789b721e3a7f9ed110f41b86d2497caa780c3a070a" dependencies = [ "bitflags 2.13.1", "libc", "plain", - "redox_syscall 0.9.1", + "redox_syscall 0.9.2", ] [[package]] @@ -4605,10 +4582,10 @@ dependencies = [ ] [[package]] -name = "libvault-core" -version = "0.1.0" +name = "libvault" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd3f4097a8eddf72929686d5c52e7210c311061611067a4d1d74bf280f579a8" +checksum = "2f89b137c88aef07a006b1955d619fbb777beefa80a50fa52224b3296ee2c964" dependencies = [ "anyhow", "arc-swap", @@ -4627,7 +4604,6 @@ dependencies = [ "derivative", "derive_more 0.99.20", "enum-map", - "etcd-client", "foreign-types", "glob", "go-defer", @@ -4643,9 +4619,11 @@ dependencies = [ "openssl", "openssl-sys", "pem", + "pgp 0.19.0", "priority-queue", "radix_trie 0.2.1", - "rand 0.8.7", + "rand 0.9.5", + "rand_chacha 0.3.1", "regex", "reqwest 0.12.28", "rustls", @@ -4656,10 +4634,13 @@ dependencies = [ "serde_derive", "serde_json", "serde_yaml", + "smallvec", + "ssh-key 0.6.7", "stretto", "strum 0.25.0", "strum_macros", - "thiserror 1.0.69", + "tempfile", + "thiserror 2.0.20", "tokio", "toml 0.8.23", "tonic", @@ -4703,9 +4684,9 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "litemap" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" +checksum = "47d9d19d1d6efa0109d2f65ff4c85cddd50bd572e5a00127ab10987290bcefae" [[package]] name = "lock_api" @@ -5038,12 +5019,6 @@ dependencies = [ "vault", ] -[[package]] -name = "multimap" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084" - [[package]] name = "munge" version = "0.4.7" @@ -5200,6 +5175,16 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-bigint" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93e7820bc0a80a0238e650327316f929ba18d5be054b647490a3a6a339f3e7c0" +dependencies = [ + "num-integer", + "num-traits", +] + [[package]] name = "num-bigint-dig" version = "0.8.6" @@ -5234,9 +5219,9 @@ checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441" [[package]] name = "num-integer" -version = "0.1.46" +version = "0.1.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +checksum = "7ce2d95d4b3734dc35aa2f45e1aa22cd416814592a4f9d9205e11affd5b8e10b" dependencies = [ "num-traits", ] @@ -5287,6 +5272,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8" dependencies = [ + "proc-macro-crate", "proc-macro2", "quote", "syn 2.0.119", @@ -5734,9 +5720,9 @@ dependencies = [ [[package]] name = "pageant" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3a5ae18f65a85c67a77d18d42d3606c07948e3c17c1e5f74852b26589e88a5" +checksum = "3adadc44070da6f464b0918655a12f5792c156e088d8c4082d13e27d94c3e791" dependencies = [ "base16ct 1.0.0", "byteorder", @@ -5950,9 +5936,9 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pest" -version = "2.8.8" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7df728be843c7070fab6ab7c328c4e9e9d78e23bf749c0669c86ee7ebfa050a2" +checksum = "5a07a60cc7a4d00c91f95c685609d1d2f79050e6804b70ebedd7650f0b839bcf" dependencies = [ "memchr", "ucd-trie", @@ -5960,9 +5946,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.8.8" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e2dd6fc3b26b3462ee188aac870f5a41d398f1cd5e2408d16531bd71c9591fd" +checksum = "b3a83744a5c8455b8b3e0dc5031362780a347c878bdd11584d1a8984228cc88d" dependencies = [ "pest", "pest_generator", @@ -5970,9 +5956,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.8.8" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a7a9205cfb6f596a9e8b689c0a15f9ceb7a1aafae7aaf788150ac65b29975b6" +checksum = "e0cd3451aa3de60d4b9a1e736885e4dea6b31617598026f12256ad566d63304a" dependencies = [ "pest", "pest_meta", @@ -5983,9 +5969,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.8.8" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85abd351c0de1e8384fc791a0737111a350394937e92b956b743dac12429f57c" +checksum = "e04d3a0849e241d7dfce834c83b1c5edc8622009e8dd51a12ba1927c32f05496" dependencies = [ "pest", ] @@ -6000,6 +5986,75 @@ dependencies = [ "indexmap 2.14.0", ] +[[package]] +name = "pgp" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaffe1ec22db286599c30ae6be75b37493b558735d86c8e59ec5c38794415fe4" +dependencies = [ + "aead 0.5.2", + "aes 0.8.4", + "aes-gcm 0.10.3", + "aes-kw", + "argon2 0.5.3", + "base64 0.22.1", + "bitfields", + "block-padding 0.3.3", + "blowfish 0.9.1", + "buffer-redux", + "byteorder", + "bytes", + "bzip2", + "camellia", + "cast5", + "cfb-mode", + "cipher 0.4.4", + "const-oid 0.9.6", + "crc24", + "curve25519-dalek 4.1.3", + "cx448", + "derive_builder", + "derive_more 2.1.1", + "des 0.8.1", + "digest 0.10.7", + "dsa", + "eax", + "ecdsa 0.16.9", + "ed25519-dalek 2.2.0", + "elliptic-curve 0.13.8", + "flate2", + "generic-array 0.14.7", + "hex", + "hkdf 0.12.4", + "idea", + "k256", + "log", + "md-5 0.10.6", + "nom 8.0.0", + "num-bigint-dig", + "num-traits", + "num_enum", + "ocb3", + "p256 0.13.2", + "p384 0.13.1", + "p521 0.13.3", + "rand 0.8.7", + "regex", + "replace_with", + "ripemd", + "rsa 0.9.10", + "sha1 0.10.7", + "sha1-checked", + "sha2 0.10.9", + "sha3 0.10.9", + "signature 2.2.0", + "smallvec", + "snafu 0.8.9", + "twofish", + "x25519-dalek", + "zeroize", +] + [[package]] name = "pgp" version = "0.20.0" @@ -6063,7 +6118,7 @@ dependencies = [ "sha3 0.10.9", "signature 2.2.0", "smallvec", - "snafu", + "snafu 0.9.2", "subtle", "twofish", "x25519-dalek", @@ -6192,9 +6247,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" +checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "plain" @@ -6263,9 +6318,9 @@ dependencies = [ [[package]] name = "potential_utf" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" +checksum = "d83eb9bc6d8e5cf568e7a1101d60ee05e81ed50ea106026f3d18deeb046d7661" dependencies = [ "zerovec", ] @@ -6302,16 +6357,6 @@ dependencies = [ "unicode-width 0.2.2", ] -[[package]] -name = "prettyplease" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" -dependencies = [ - "proc-macro2", - "syn 2.0.119", -] - [[package]] name = "primefield" version = "0.14.0" @@ -6390,58 +6435,6 @@ dependencies = [ "yansi", ] -[[package]] -name = "prost" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-build" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf" -dependencies = [ - "heck 0.5.0", - "itertools 0.14.0", - "log", - "multimap", - "once_cell", - "petgraph", - "prettyplease", - "prost", - "prost-types", - "regex", - "syn 2.0.119", - "tempfile", -] - -[[package]] -name = "prost-derive" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" -dependencies = [ - "anyhow", - "itertools 0.14.0", - "proc-macro2", - "quote", - "syn 2.0.119", -] - -[[package]] -name = "prost-types" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16" -dependencies = [ - "prost", -] - [[package]] name = "psm" version = "0.1.32" @@ -6607,7 +6600,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "socket2 0.6.5", + "socket2", "thiserror 2.0.20", "tokio", "tracing", @@ -6616,9 +6609,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.16" +version = "0.11.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f4bfc015262b9df63c8845072ce59068853ff5872180c2ce2f13038b970e560" +checksum = "04759210543be93709136e28212294a659ef5001836ff4eab4d663e4529bba83" dependencies = [ "aws-lc-rs", "bytes", @@ -6646,7 +6639,7 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.6.5", + "socket2", "tracing", "windows-sys 0.61.2", ] @@ -6820,9 +6813,9 @@ dependencies = [ [[package]] name = "redis" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3257df217f7eab0044627a268c9cc6cdb60c0c421c88f83ac41c4e31520b6b84" +checksum = "e37a4ca5c6ca42aa3e6df2fd32b987a65d32a4c2159a6f3fe0fd1df306a2658f" dependencies = [ "arc-swap", "arcstr", @@ -6834,14 +6827,14 @@ dependencies = [ "futures-channel", "futures-util", "itoa", - "num-bigint", + "num-bigint 0.5.1", "percent-encoding", "pin-project-lite", "rustls", "rustls-native-certs", "ryu", "sha1_smol", - "socket2 0.6.5", + "socket2", "tokio", "tokio-rustls", "tokio-util", @@ -6858,7 +6851,7 @@ dependencies = [ "futures", "rand 0.9.5", "redis", - "socket2 0.6.5", + "socket2", "tempfile", ] @@ -6882,9 +6875,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07507be7b4a5f9f26eeb41eeaebb1f5a7ff29dfb29739facc21d35bf8b11c21e" +checksum = "f1c93da5bb2c5d4e6c0ef7abeead62c89169a0a4882bfb83ac892f2423aea2fe" dependencies = [ "bitflags 2.13.1", ] @@ -6902,18 +6895,18 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216e8f773d7923bcba9ceb86a86c93cabb3903a11872fc3f138c49630e50b96d" +checksum = "7e440fb4e4b4147295338efb76001ab9e4efc0e5839df2c47fc5ac2381d365c3" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9283685feec7d69af75fb0e858d5e7378f33fe4fc699383b2916ab9273e03c" +checksum = "92ecd8964f8453721699a1ed72037b0db49ce2f5a5138486ee89bed6f67cdf3a" dependencies = [ "proc-macro2", "quote", @@ -7199,6 +7192,7 @@ dependencies = [ "pkcs1 0.7.5", "pkcs8 0.10.2", "rand_core 0.6.4", + "sha2 0.10.9", "signature 2.2.0", "spki 0.7.3", "subtle", @@ -7226,9 +7220,9 @@ dependencies = [ [[package]] name = "russh" -version = "0.62.6" +version = "0.62.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41043523e0edcbd4e31d00903e26f12994f63b21bae9904f7405c1ed92752a5" +checksum = "9decb68e4e44e1079700e54f17c8f23806ec53d7e0db73ab1c71d9dabc666812" dependencies = [ "aes 0.9.2", "aws-lc-rs", @@ -7251,7 +7245,7 @@ dependencies = [ "enum_dispatch", "flate2", "futures", - "generic-array 1.4.4", + "generic-array 1.4.5", "getrandom 0.4.3", "ghash 0.6.0", "hex-literal", @@ -7263,7 +7257,7 @@ dependencies = [ "md5", "ml-kem", "module-lattice", - "num-bigint", + "num-bigint 0.4.8", "p256 0.14.0", "p384 0.14.0", "p521 0.14.0", @@ -7286,8 +7280,8 @@ dependencies = [ "sha3 0.12.0", "signature 3.0.0", "spki 0.8.0", - "ssh-encoding", - "ssh-key", + "ssh-encoding 0.3.0", + "ssh-key 0.7.0-rc.11", "subtle", "thiserror 2.0.20", "tokio", @@ -7304,7 +7298,7 @@ checksum = "3aec6cb630dbe85d72ffd7bcd95f07e1bd69f9f270ee8adfa1afe443a6331438" dependencies = [ "log", "nix 0.31.3", - "ssh-encoding", + "ssh-encoding 0.3.0", "windows-sys 0.61.2", ] @@ -7534,9 +7528,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" [[package]] name = "rustls-webpki" -version = "0.103.13" +version = "0.103.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" +checksum = "0527518605e68109d875e248ea259b6758801cf165e4b2c2733ae3b51f12535a" dependencies = [ "aws-lc-rs", "ring", @@ -7694,9 +7688,9 @@ dependencies = [ [[package]] name = "sea-orm" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e29e1a2e2e6da3d2486086f9d96b4bf5b7d8bf344e16c48bd87ce7977b8d0154" +checksum = "a334e83ced3ae3ee44db0f84d1fcf8d2087a1ad9bb9036f00f9f6067156ea197" dependencies = [ "async-stream", "async-trait", @@ -7742,9 +7736,9 @@ dependencies = [ [[package]] name = "sea-orm-cli" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53cc7731b9472864d21bc6223c6747de539c5ec0cfe29bbd92aac0537c22812c" +checksum = "5a53505884d7c907bcf4f7b4ddb1b29425e62fef8b98aea9c99e17781cceb798" dependencies = [ "chrono", "clap", @@ -7759,9 +7753,9 @@ dependencies = [ [[package]] name = "sea-orm-macros" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88a6fd7ae2932a838d3bc7ca1e5483ffa10d6b25e4c43c8aebb4cd14773c2d08" +checksum = "4039a86f9acc4d3b52747508b347dddc6fd725bbc429902ebeb6d26225fc2528" dependencies = [ "heck 0.5.0", "itertools 0.14.0", @@ -7775,9 +7769,9 @@ dependencies = [ [[package]] name = "sea-orm-migration" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ae369463e80e8a75e57434ba10dd9008a1010d81ec66cba5909561add7223f" +checksum = "bd09adbef87100d07131a60a8c5508b53d0cf2136521f654aae47af5e6a097fe" dependencies = [ "async-trait", "clap", @@ -7791,9 +7785,9 @@ dependencies = [ [[package]] name = "sea-query" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d190cfb3bcceb8a8d7d04dee5a0c77f60c7627979cdcb47fdcb8934f009badf" +checksum = "546040c653a705e60ec65ecd3191a809603734bebbc225775916dea9ae409b31" dependencies = [ "chrono", "ordered-float", @@ -8329,9 +8323,9 @@ checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "similar" -version = "3.1.2" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85ee016af5d736b69fc89e19254540fa4b5f5492853fb5503920f084011c78b6" +checksum = "4f66ca1f7aca2474dc10c942eb22feffc897735f54cd1db90138c2fddb490987" dependencies = [ "bstr", ] @@ -8383,20 +8377,29 @@ dependencies = [ "serde_core", ] +[[package]] +name = "snafu" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e84b3f4eacbf3a1ce05eac6763b4d629d60cbc94d632e4092c54ade71f1e1a2" +dependencies = [ + "snafu-derive 0.8.9", +] + [[package]] name = "snafu" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e45cb604038abb7b926b679887b3226d8d0f23874b66623625a0454be425a4b7" dependencies = [ - "snafu-derive", + "snafu-derive 0.9.2", ] [[package]] name = "snafu-derive" -version = "0.9.2" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287f59010008f0d7cf5e3b03196d666c1acc46c8d3e9cf34c28a1a7157601e72" +checksum = "c1c97747dbf44bb1ca44a561ece23508e99cb592e862f22222dcf42f51d1e451" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -8405,13 +8408,15 @@ dependencies = [ ] [[package]] -name = "socket2" -version = "0.5.10" +name = "snafu-derive" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" +checksum = "287f59010008f0d7cf5e3b03196d666c1acc46c8d3e9cf34c28a1a7157601e72" dependencies = [ - "libc", - "windows-sys 0.52.0", + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.119", ] [[package]] @@ -8622,7 +8627,7 @@ dependencies = [ "time", "tracing", "uuid", - "whoami 2.1.2", + "whoami 2.1.3", ] [[package]] @@ -8652,6 +8657,16 @@ dependencies = [ "uuid", ] +[[package]] +name = "ssh-cipher" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caac132742f0d33c3af65bfcde7f6aa8f62f0e991d80db99149eb9d44708784f" +dependencies = [ + "cipher 0.4.4", + "ssh-encoding 0.2.0", +] + [[package]] name = "ssh-cipher" version = "0.3.0" @@ -8666,10 +8681,21 @@ dependencies = [ "ctutils", "des 0.9.0", "poly1305", - "ssh-encoding", + "ssh-encoding 0.3.0", "zeroize", ] +[[package]] +name = "ssh-encoding" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb9242b9ef4108a78e8cd1a2c98e193ef372437f8c22be363075233321dd4a15" +dependencies = [ + "base64ct", + "pem-rfc7468 0.7.0", + "sha2 0.10.9", +] + [[package]] name = "ssh-encoding" version = "0.3.0" @@ -8685,6 +8711,28 @@ dependencies = [ "zeroize", ] +[[package]] +name = "ssh-key" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b86f5297f0f04d08cabaa0f6bff7cb6aec4d9c3b49d87990d63da9d9156a8c3" +dependencies = [ + "ed25519-dalek 2.2.0", + "num-bigint-dig", + "p256 0.13.2", + "p384 0.13.1", + "p521 0.13.3", + "rand_core 0.6.4", + "rsa 0.9.10", + "sec1 0.7.3", + "sha2 0.10.9", + "signature 2.2.0", + "ssh-cipher 0.2.0", + "ssh-encoding 0.2.0", + "subtle", + "zeroize", +] + [[package]] name = "ssh-key" version = "0.7.0-rc.11" @@ -8706,8 +8754,8 @@ dependencies = [ "sha1 0.11.0", "sha2 0.11.0", "signature 3.0.0", - "ssh-cipher", - "ssh-encoding", + "ssh-cipher 0.3.0", + "ssh-encoding 0.3.0", "zeroize", ] @@ -9152,9 +9200,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d" +checksum = "b1e27c91459209c2986af3dcf603a5a74a4368754ce37414f59acc971167f643" dependencies = [ "displaydoc", "zerovec", @@ -9187,7 +9235,7 @@ dependencies = [ "parking_lot 0.12.5", "pin-project-lite", "signal-hook-registry", - "socket2 0.6.5", + "socket2", "tokio-macros", "windows-sys 0.61.2", ] @@ -9407,9 +9455,9 @@ checksum = "7d56353a2a665ad0f41a421187180aab746c8c325620617ad883a99a1cbe66d2" [[package]] name = "tonic" -version = "0.13.1" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e581ba15a835f4d9ea06c55ab1bd4dce26fc53752c69a04aac00703bfb49ba9" +checksum = "ac2a5518c70fa84342385732db33fb3f44bc4cc748936eb5833d2df34d6445ef" dependencies = [ "async-trait", "axum", @@ -9424,10 +9472,9 @@ dependencies = [ "hyper-util", "percent-encoding", "pin-project", - "prost", - "socket2 0.5.10", + "socket2", + "sync_wrapper", "tokio", - "tokio-rustls", "tokio-stream", "tower", "tower-layer", @@ -9435,20 +9482,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tonic-build" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac6f67be712d12f0b41328db3137e0d0757645d8904b4cb7d51cd9c2279e847" -dependencies = [ - "prettyplease", - "proc-macro2", - "prost-build", - "prost-types", - "quote", - "syn 2.0.119", -] - [[package]] name = "tower" version = "0.5.3" @@ -10009,9 +10042,9 @@ checksum = "e2eebbbfe4093922c2b6734d7c679ebfebd704a0d7e56dfcb0d05818ce28977d" [[package]] name = "uuid" -version = "1.24.0" +version = "1.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf3923a6f5c4c6382e0b653c4117f48d631ea17f38ed86e2a828e6f7412f5239" +checksum = "2cefc03fd367c0c6d4305de1b312cf00248c4114f4a0418ce6a6af769e3b0bd9" dependencies = [ "getrandom 0.4.3", "js-sys", @@ -10035,9 +10068,9 @@ dependencies = [ "common", "hex", "jupiter", - "libvault-core", + "libvault", "openssl", - "pgp", + "pgp 0.20.0", "rand 0.8.7", "secp256k1", "serde", @@ -10330,9 +10363,9 @@ dependencies = [ [[package]] name = "whoami" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "998767ef88740d1f5b0682a9c53c24431453923962269c2db68ee43788c5a40d" +checksum = "626c4bac6755d76ffc12cb01b2eac751db1996b9e0041de9aa02c8c211ddc82c" [[package]] name = "winapi" @@ -10703,9 +10736,9 @@ dependencies = [ [[package]] name = "writeable" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" +checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc" [[package]] name = "wyz" @@ -10753,9 +10786,9 @@ checksum = "aee1b19627c7c60102ab80d3a9cbe18de90bfe03bfa6c3715447681f0e8c8af6" [[package]] name = "yaml-rust2" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "631a50d867fafb7093e709d75aaee9e0e0d5deb934021fcea25ac2fe09edc51e" +checksum = "b36710ce3a279cfce8465dbab826f161675a262950b922cb2c3663852dfe9eb0" dependencies = [ "arraydeque", "encoding_rs", @@ -10854,9 +10887,9 @@ dependencies = [ [[package]] name = "zerotrie" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf" +checksum = "4ea269c3bd32f0a32c321907a2ae912ba6f4649bb0fc764a15627e99a7095a3f" dependencies = [ "displaydoc", "yoke", @@ -10865,9 +10898,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239" +checksum = "bb0464e17806c1d976d5cba29399c7f08e516e279e2ba493f63123b5fca67dd8" dependencies = [ "yoke", "zerofrom", @@ -10876,13 +10909,13 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" +checksum = "9f212a141d820099d57ffafb9569be9617a6f27d3dc881fbee8fb56642f917a9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.3", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 8289162c6..c0136d3dd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,7 +39,7 @@ orion-client = { path = "clients/orion-client" } orion-scheduler-client = { path = "clients/orion-scheduler-client" } git-internal = "0.8.7" -libvault-core = "0.1.0" +libvault = "0.3.0" #==== anyhow = "1.0.104" @@ -59,11 +59,11 @@ tokio-util = "0.7.19" async-trait = "0.1.92" async-stream = "0.3.6" async-recursion = "1.1.1" -futures = "0.3.33" -futures-util = "0.3.33" +futures = "0.3.34" +futures-util = "0.3.34" axum = { version = "0.8.9", features = ["macros", "json"] } axum-extra = "0.12.6" -russh = "0.62.6" +russh = "0.62.7" tower-http = "0.7.0" tower = "0.5.3" tower-sessions = { version = "0.15", features = ["memory-store"] } @@ -77,8 +77,8 @@ lettre = { version = "0.11", default-features = false, features = [ "rustls-platform-verifier", ] } #==== -sea-orm = "2.0.1" -sea-orm-migration = "2.0.1" +sea-orm = "2.0.2" +sea-orm-migration = "2.0.2" #==== rand = "0.10.2" @@ -94,7 +94,7 @@ hmac = "0.13" idgenerator = "2.0.0" config = "0.15.25" reqwest = "0.13.4" -uuid = "1.24.0" +uuid = "1.24.1" regex = "1.13.1" ctrlc = "3.5.2" cedar-policy = "4.12.0" @@ -123,7 +123,7 @@ bs58 = "0.5.1" indexmap = "2.14" envsubst = "0.2.1" directories = "6.0.0" -redis = "1.5.0" +redis = "1.6.0" redis-test = "1.0.4" rustls = "0.23.43" object_store = "0.14.1" diff --git a/vault/Cargo.toml b/vault/Cargo.toml index be3f52df2..5f4665c22 100644 --- a/vault/Cargo.toml +++ b/vault/Cargo.toml @@ -23,7 +23,7 @@ bs58 = { workspace = true } secp256k1 = { workspace = true, features = ["serde", "rand", "hashes"] } tokio = { workspace = true, features = ["full"] } smallvec = { workspace = true } -libvault-core = { workspace = true } +libvault = { workspace = true } [dev-dependencies] diff --git a/vault/src/integration/jupiter_backend.rs b/vault/src/integration/jupiter_backend.rs index 69f19c6fa..19dd5de2e 100644 --- a/vault/src/integration/jupiter_backend.rs +++ b/vault/src/integration/jupiter_backend.rs @@ -1,6 +1,6 @@ use async_trait::async_trait; use jupiter::storage::Storage; -use libvault_core::storage::Backend; +use libvault::storage::Backend; pub struct JupiterBackend { ctx: Storage, @@ -14,19 +14,19 @@ impl JupiterBackend { #[async_trait] impl Backend for JupiterBackend { - async fn list(&self, prefix: &str) -> Result, libvault_core::errors::RvError> { + async fn list(&self, prefix: &str) -> Result, libvault::errors::RvError> { let service = self.ctx.vault_storage(); let prefix = prefix.to_string(); service .list_keys(prefix) .await - .map_err(|_| libvault_core::errors::RvError::ErrPhysicalBackendKeyInvalid) + .map_err(|_| libvault::errors::RvError::ErrPhysicalBackendKeyInvalid) } async fn get( &self, key: &str, - ) -> Result, libvault_core::errors::RvError> { + ) -> Result, libvault::errors::RvError> { let service = self.ctx.vault_storage(); let key = key.to_string(); service @@ -34,36 +34,36 @@ impl Backend for JupiterBackend { .await .map(|opt| { opt.and_then(|model| { - libvault_core::storage::BackendEntry { + libvault::storage::BackendEntry { key: model.key, value: model.value, } .into() }) }) - .map_err(|_| libvault_core::errors::RvError::ErrPhysicalBackendKeyInvalid) + .map_err(|_| libvault::errors::RvError::ErrPhysicalBackendKeyInvalid) } async fn put( &self, - entry: &libvault_core::storage::BackendEntry, - ) -> Result<(), libvault_core::errors::RvError> { + entry: &libvault::storage::BackendEntry, + ) -> Result<(), libvault::errors::RvError> { let service = self.ctx.vault_storage(); let entry_clone = entry.clone(); service .save(entry_clone.key, entry_clone.value) .await .map(|_| ()) - .map_err(|_| libvault_core::errors::RvError::ErrPhysicalBackendKeyInvalid) + .map_err(|_| libvault::errors::RvError::ErrPhysicalBackendKeyInvalid) } - async fn delete(&self, key: &str) -> Result<(), libvault_core::errors::RvError> { + async fn delete(&self, key: &str) -> Result<(), libvault::errors::RvError> { let service = self.ctx.vault_storage(); let key = key.to_string(); service .delete(key) .await .map(|_| ()) - .map_err(|_| libvault_core::errors::RvError::ErrPhysicalBackendKeyInvalid) + .map_err(|_| libvault::errors::RvError::ErrPhysicalBackendKeyInvalid) } } diff --git a/vault/src/integration/vault_core.rs b/vault/src/integration/vault_core.rs index 26876833f..da886da37 100644 --- a/vault/src/integration/vault_core.rs +++ b/vault/src/integration/vault_core.rs @@ -3,7 +3,7 @@ use std::{path::PathBuf, sync::Arc}; use async_trait::async_trait; use common::errors::MegaError; use jupiter::storage::Storage; -use libvault_core::{RustyVault, logical::Response, storage::Backend}; +use libvault::{RustyVault, logical::Response, storage::Backend}; use serde::{Deserialize, Serialize}; use serde_json::{Map, Value}; use tracing::log; @@ -58,7 +58,7 @@ impl VaultCore { pub async fn config(ctx: Storage, key_path: PathBuf) -> Self { let backend: Arc = Arc::new(JupiterBackend::new(ctx.clone())); - let seal_config = libvault_core::core::SealConfig { + let seal_config = libvault::core::SealConfig { secret_shares: 10, secret_threshold: 5, }; diff --git a/vault/src/pki.rs b/vault/src/pki.rs index fe1a01262..fdd252edc 100644 --- a/vault/src/pki.rs +++ b/vault/src/pki.rs @@ -16,7 +16,7 @@ impl VaultCore { /// Initialize the Vault CA async fn init_ca(&self) { // err = not found - if self.read_api("pki/ca/pem").await.is_err() { + if self.read_api("pki/ca/tls/pem").await.is_err() { self.config_ca().await; self.generate_root(false).await; self.config_role(json!({ @@ -67,7 +67,7 @@ impl VaultCore { self.write_api( format!( - "pki/root/generate/{}", + "pki/root/tls/generate/{}", if exported { "exported" } else { "internal" } ) .as_str(), @@ -77,7 +77,7 @@ impl VaultCore { .expect("Failed to generate root cert"); } - /// - `data`: see [RoleEntry](libvault_core::modules::pki::path_roles) + /// - `data`: see [RoleEntry](libvault::modules::pki::path_roles) /// - This function configures a role for issuing certificates. /// - The `ROLE` constant is used as the role name. /// @@ -105,13 +105,13 @@ impl VaultCore { .clone(); // config role - self.write_api(format!("pki/roles/{ROLE}"), Some(role_data)) + self.write_api(format!("pki/roles/tls/{ROLE}"), Some(role_data)) .await .expect("Failed to configure role"); } /// issue certificate - /// - `data`: see [issue_path](libvault_core::modules::pki::path_issue) + /// - `data`: see [issue_path](libvault::modules::pki::path_issue) /// - return: `(cert_pem, private_key)` pub async fn issue_cert(&self, data: Value) -> (String, String) { // let dns_sans = ["test.com", "a.test.com", "b.test.com"]; @@ -121,7 +121,7 @@ impl VaultCore { .clone(); // issue cert - let resp = self.write_api(format!("pki/issue/{ROLE}"), Some(issue_data)); + let resp = self.write_api(format!("pki/issue/tls/{ROLE}"), Some(issue_data)); let resp_body = resp.await.unwrap(); let cert_data = resp_body.unwrap().data.unwrap(); @@ -164,7 +164,7 @@ impl VaultCore { /// Get root certificate of CA pub async fn get_root_cert(&self) -> String { - let resp_ca_pem = self.read_api("pki/ca/pem").await.unwrap().unwrap(); + let resp_ca_pem = self.read_api("pki/ca/tls/pem").await.unwrap().unwrap(); let ca_data = resp_ca_pem.data.unwrap(); ca_data["certificate"].as_str().unwrap().to_owned() @@ -182,7 +182,7 @@ mod tests_raw { use common::errors::MegaError; use jupiter::tests::test_storage; - use libvault_core::logical::Response; + use libvault::logical::Response; use openssl::{asn1::Asn1Time, ec::EcKey, nid::Nid, pkey::PKey, rsa::Rsa, x509::X509}; use serde_json::{Map, Value, json}; @@ -239,11 +239,11 @@ mod tests_raw { // config role assert!( - test_write_api(core, "pki/roles/test", true, Some(role_data)) + test_write_api(core, "pki/roles/tls/test", true, Some(role_data)) .await .is_ok() ); - let resp = test_read_api(core, "pki/roles/test", true).await; + let resp = test_read_api(core, "pki/roles/tls/test", true).await; assert!(resp.as_ref().unwrap().is_some()); let resp = resp.unwrap(); assert!(resp.is_some()); @@ -281,7 +281,7 @@ mod tests_raw { let resp = test_write_api( core, format!( - "pki/root/generate/{}", + "pki/root/tls/generate/{}", if exported { "exported" } else { "internal" } ) .as_str(), @@ -298,7 +298,7 @@ mod tests_raw { assert!(data.is_some()); let key_data = data.unwrap(); - let resp_ca_pem = test_read_api(core, "pki/ca/pem", true).await; + let resp_ca_pem = test_read_api(core, "pki/ca/tls/pem", true).await; let resp_ca_pem_cert_data = resp_ca_pem.unwrap().unwrap().data.unwrap(); let ca_cert = X509::from_pem( @@ -353,7 +353,7 @@ mod tests_raw { .clone(); // issue cert - let resp = test_write_api(core, "pki/issue/test", true, Some(issue_data)).await; + let resp = test_write_api(core, "pki/issue/tls/test", true, Some(issue_data)).await; assert!(resp.is_ok()); let resp_body = resp.unwrap(); assert!(resp_body.is_some()); @@ -414,7 +414,7 @@ mod tests_raw { hex::encode(authority_key_id.unwrap().as_slice()) ); - let resp_ca_pem = test_read_api(core, "pki/ca/pem", true).await; + let resp_ca_pem = test_read_api(core, "pki/ca/tls/pem", true).await; let resp_ca_pem_cert_data = resp_ca_pem.unwrap().unwrap().data.unwrap(); let ca_cert = X509::from_pem(