diff --git a/Cargo.lock b/Cargo.lock index 3a439e4..21c2f5d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -317,12 +317,12 @@ dependencies = [ [[package]] name = "axum-client-ip" -version = "0.7.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff8ee1869817523c8f91c20bf17fd932707f66c2e7e0b0f811b29a227289562" +checksum = "a8ba1af5b620232acf37f2eb6d22151ea465491e0b4c25f552d1990f64ec5a67" dependencies = [ "axum", - "forwarded-header-value", + "client-ip", "serde", ] @@ -476,6 +476,31 @@ dependencies = [ "objc2", ] +[[package]] +name = "bon" +version = "3.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a602c73c7b0148ec6d12af6fd5cc7a46e2eacc8878271a999abac56eed12f561" +dependencies = [ + "bon-macros", + "rustversion", +] + +[[package]] +name = "bon-macros" +version = "3.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f" +dependencies = [ + "darling 0.23.0", + "ident_case", + "prettyplease", + "proc-macro2", + "quote", + "rustversion", + "syn", +] + [[package]] name = "bs58" version = "0.5.1" @@ -607,6 +632,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" +[[package]] +name = "client-ip" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39d2056bf065c8b4bce5a8898d40e175211ff4410add2a84d695845d3937c729" +dependencies = [ + "http", +] + [[package]] name = "cmake" version = "0.1.58" @@ -956,7 +990,7 @@ dependencies = [ "tracing", "tracing-subscriber", "url", - "vergen-git2", + "vergen-git2 10.0.1", ] [[package]] @@ -1009,7 +1043,7 @@ dependencies = [ "url", "utoipa", "uuid", - "vergen-git2", + "vergen-git2 9.1.0", "webauthn-rs", "x25519-dalek", ] @@ -1603,6 +1637,18 @@ dependencies = [ "url", ] +[[package]] +name = "git2" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddddbf932745a6be37109b6112d3ee09696106f848449069d3a57bba937ab82e" +dependencies = [ + "bitflags", + "libc", + "libgit2-sys", + "log", +] + [[package]] name = "globset" version = "0.4.18" @@ -4608,9 +4654,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.49" +version = "0.3.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711a53c2d47bbd818258c498c8dbfe186a2526c631495cfe7e078567f86b8469" +checksum = "18dfaaeddcb932337b5e7866ee7d0ce9b76d2fd092997146f187ec09b4558a50" dependencies = [ "deranged", "libc", @@ -4630,9 +4676,9 @@ checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109" [[package]] name = "time-macros" -version = "0.2.29" +version = "0.2.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71c652a3727a9cbb9a02f707f530b618ce00d0ccd762009c8c23bd191df3c17d" +checksum = "c431b87111666e491a90baa837f914fb45cd5dc3c268591b0220ff5057f2085f" dependencies = [ "num-conv", "time-core", @@ -5171,8 +5217,20 @@ dependencies = [ "anyhow", "derive_builder", "rustversion", + "vergen-lib 9.1.0", +] + +[[package]] +name = "vergen" +version = "10.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5574dd2f922b1a46a06a4b1dc11193a4012108fd54cf725e1816cb8183d8778" +dependencies = [ + "anyhow", + "bon", + "rustversion", "time", - "vergen-lib", + "vergen-lib 10.0.1", ] [[package]] @@ -5183,11 +5241,26 @@ checksum = "d51ab55ddf1188c8d679f349775362b0fa9e90bd7a4ac69838b2a087623f0d57" dependencies = [ "anyhow", "derive_builder", - "git2", + "git2 0.20.4", "rustversion", "time", - "vergen", - "vergen-lib", + "vergen 9.1.0", + "vergen-lib 9.1.0", +] + +[[package]] +name = "vergen-git2" +version = "10.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "410e2f72acce10471037150cd9c585ee7b54560f348bf70cd5fc8e87d3433e45" +dependencies = [ + "anyhow", + "bon", + "git2 0.21.0", + "rustversion", + "time", + "vergen 10.0.1", + "vergen-lib 10.0.1", ] [[package]] @@ -5201,6 +5274,17 @@ dependencies = [ "rustversion", ] +[[package]] +name = "vergen-lib" +version = "10.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cd42fd155c2c2971f6d00face12ec245fbb604fce011ccaf2306d014c2e97ca" +dependencies = [ + "anyhow", + "bon", + "rustversion", +] + [[package]] name = "version_check" version = "0.9.5" diff --git a/Cargo.toml b/Cargo.toml index 82dae79..7acbf72 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ rustls-webpki = { version = "0.103", features = ["aws-lc-rs", "std"] } rustls-pki-types = "1" # base `axum` deps axum = { version = "0.8", features = ["ws"] } -axum-client-ip = "0.7" +axum-client-ip = "1.0" axum-extra = { version = "0.12", features = [ "cookie", "cookie-private", @@ -69,7 +69,7 @@ tokio = { version = "1", features = ["net"] } [build-dependencies] tonic-prost-build = "0.14" -vergen-git2 = { version = "9.1", features = ["build"] } +vergen-git2 = { version = "10.0", features = ["build"] } [lints.clippy] uninlined_format_args = "deny"