diff --git a/Cargo.lock b/Cargo.lock index 1d6ae8c9..e8454be1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -91,26 +91,25 @@ dependencies = [ [[package]] name = "async-nats" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1174495e436c928905018f10a36160f7a8a6786450f50f4ce7fba05d1539704c" +checksum = "94e3e851ddf3b62be8a8085e1e453968df9cdbf990a37bbb589b5b4f587c68d7" dependencies = [ - "async-nats-tokio-rustls-deps", - "base64 0.13.1", - "base64-url", + "base64 0.21.2", "bytes", "futures", "http", "itoa 1.0.8", "memchr", "nkeys", - "nuid", + "nuid 0.3.2", "once_cell", "rand", "regex", "ring", "rustls-native-certs", "rustls-pemfile", + "rustls-webpki 0.101.2", "serde", "serde_json", "serde_nanos", @@ -119,21 +118,11 @@ dependencies = [ "time 0.3.22", "tokio", "tokio-retry", + "tokio-rustls 0.24.1", "tracing", "url", ] -[[package]] -name = "async-nats-tokio-rustls-deps" -version = "0.24.0-ALPHA.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cdefe54cd7867d937c0a507d2a3a830af410044282cd3e4002b5b7860e1892e" -dependencies = [ - "rustls 0.21.2", - "tokio", - "webpki 0.22.0", -] - [[package]] name = "async-trait" version = "0.1.70" @@ -264,15 +253,6 @@ version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" -[[package]] -name = "base64-url" -version = "1.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a99c239d0c7e77c85dddfa9cebce48704b3c49550fcd3b84dd637e4484899f" -dependencies = [ - "base64 0.13.1", -] - [[package]] name = "base64ct" version = "1.1.1" @@ -337,6 +317,9 @@ name = "bytes" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +dependencies = [ + "serde", +] [[package]] name = "cc" @@ -810,11 +793,11 @@ dependencies = [ "signal-hook", "signal-hook-tokio", "sqlx", - "svc-agent", + "svc-agent 0.20.0", "svc-authn", "svc-authz", "svc-conference-events", - "svc-error", + "svc-error 0.5.0", "svc-nats-client", "svc-utils", "tokio", @@ -1552,12 +1535,13 @@ dependencies = [ [[package]] name = "nkeys" -version = "0.2.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e66a7cd1358277b2a6f77078e70aea7315ff2f20db969cc61153103ec162594" +checksum = "3e9261eb915c785ea65708bc45ef43507ea46914e1a73f1412d1a38aba967c8e" dependencies = [ "byteorder", "data-encoding", + "ed25519", "ed25519-dalek", "getrandom", "log", @@ -1601,6 +1585,16 @@ dependencies = [ "rand", ] +[[package]] +name = "nuid" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b61b1710432e483e6a67b20b6c60c6afe0e2fad67aabba3bdb912f3f70ff6ae" +dependencies = [ + "once_cell", + "rand", +] + [[package]] name = "num-bigint" version = "0.2.6" @@ -2247,8 +2241,8 @@ dependencies = [ "pollster", "thiserror", "tokio", - "tokio-rustls", - "webpki 0.21.4", + "tokio-rustls 0.22.0", + "webpki", ] [[package]] @@ -2397,7 +2391,7 @@ dependencies = [ "log", "ring", "sct 0.6.1", - "webpki 0.21.4", + "webpki", ] [[package]] @@ -2408,7 +2402,7 @@ checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f" dependencies = [ "log", "ring", - "rustls-webpki", + "rustls-webpki 0.100.1", "sct 0.7.0", ] @@ -2443,6 +2437,16 @@ dependencies = [ "untrusted", ] +[[package]] +name = "rustls-webpki" +version = "0.101.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "513722fd73ad80a71f72b61009ea1b584bcfa1483ca93949c8f290298837fa59" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.13" @@ -3082,6 +3086,25 @@ dependencies = [ "uuid", ] +[[package]] +name = "svc-agent" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef9c610b65f24bab61b52f5a7264983d0e014858e8496282aec7d688baf7869" +dependencies = [ + "async-channel", + "base64 0.21.2", + "chrono", + "http", + "log", + "rumqttc", + "serde", + "serde_json", + "svc-authn", + "tokio", + "uuid", +] + [[package]] name = "svc-authn" version = "0.8.0" @@ -3144,27 +3167,61 @@ dependencies = [ "serde", "serde_derive", "sqlx", - "svc-agent", + "svc-agent 0.20.0", "svc-authn", "svc-authz", ] +[[package]] +name = "svc-error" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad220c6bc89bc2e7b8af01db6dcfa4a513e18d78e7cf2f778e623ac22577eadf" +dependencies = [ + "anyhow", + "crossbeam-channel", + "http", + "once_cell", + "sentry", + "sentry-anyhow", + "serde", + "serde_derive", +] + +[[package]] +name = "svc-events" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ad84bd15a598b693df7dd08ca832c3414d59d6847f134f479ff547264669735" +dependencies = [ + "serde", + "serde_json", + "svc-agent 0.21.0", + "svc-authn", + "thiserror", + "uuid", +] + [[package]] name = "svc-nats-client" -version = "0.2.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab57232e87e0c5c4d1ae2b810ffc971cdefd2cdf011d7c2a678cdc40a1a20c51" +checksum = "cf7705838936003cae1b79e726be255ea9702b8aad516dec9c998c7c93ef6f8d" dependencies = [ "anyhow", "async-nats", "async-trait", "futures", + "futures-util", "humantime-serde", + "nuid 0.4.1", "reqwest", "serde", - "svc-agent", - "svc-error", + "svc-agent 0.21.0", + "svc-error 0.6.0", + "svc-events", "thiserror", + "tokio", "tracing", "uuid", ] @@ -3181,9 +3238,9 @@ dependencies = [ "hyper", "once_cell", "prometheus", - "svc-agent", + "svc-agent 0.20.0", "svc-authn", - "svc-error", + "svc-error 0.5.0", "tokio", "tower", "tower-http", @@ -3382,7 +3439,17 @@ checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ "rustls 0.19.1", "tokio", - "webpki 0.21.4", + "webpki", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.2", + "tokio", ] [[package]] @@ -3799,16 +3866,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "whoami" version = "1.4.1" diff --git a/Cargo.toml b/Cargo.toml index ded65060..a6a15a83 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,7 +39,7 @@ svc-authn = { version = "0.8", features = ["jose", "sqlx"] } svc-authz = { version = "0.12" } svc-error = { version = "0.5", features = ["sqlx", "svc-agent", "svc-authn", "svc-authz", "sentry-extension"] } svc-utils = { version = "0.7", features = ["authn-extractor", "cors-middleware", "log-middleware", "metrics-middleware"] } -svc-nats-client = { version = "0.2" } +svc-nats-client = { version = "0.8" } svc-conference-events = { version = "0.2" } tokio = { version = "1.28", features = ["full"] } tower = "0.4"