diff --git a/Cargo.lock b/Cargo.lock index b84ffcaf..36207359 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1243,19 +1243,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58549f1842da3080ce63002102d5bc954c7bc843d4f47818e642abdc36253552" dependencies = [ "chrono", - "chrono-tz-build 0.0.2", - "phf 0.10.1", -] - -[[package]] -name = "chrono-tz" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9cc2b23599e6d7479755f3594285efb3f74a1bdca7a7374948bc831e23a552" -dependencies = [ - "chrono", - "chrono-tz-build 0.1.0", - "phf 0.11.1", + "chrono-tz-build", + "phf", ] [[package]] @@ -1265,19 +1254,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db058d493fb2f65f41861bfed7e3fe6335264a9f0f92710cab5bdf01fef09069" dependencies = [ "parse-zoneinfo", - "phf 0.10.1", - "phf_codegen 0.10.0", -] - -[[package]] -name = "chrono-tz-build" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9998fb9f7e9b2111641485bf8beb32f92945f97f92a3d061f744cfef335f751" -dependencies = [ - "parse-zoneinfo", - "phf 0.11.1", - "phf_codegen 0.11.1", + "phf", + "phf_codegen", ] [[package]] @@ -1302,9 +1280,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.3" +version = "4.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8f255e4b8027970e78db75e78831229c9815fdbfa67eb1a1b777a62e24b4a0" +checksum = "80672091db20273a15cf9fdd4e47ed43b5091ec9841bf4c6145c9dfbbcae09ed" dependencies = [ "clap_builder", "clap_derive", @@ -1313,9 +1291,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.3" +version = "4.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd4f3c17c83b0ba34ffbc4f8bbd74f079413f747f84a6f89292f138057e36ab" +checksum = "c1458a1df40e1e2afebb7ab60ce55c1fa8f431146205aa5f4887e0b111c27636" dependencies = [ "anstream", "anstyle", @@ -3941,7 +3919,7 @@ dependencies = [ "base64 0.21.2", "cc", "chrono", - "chrono-tz 0.8.2", + "chrono-tz", "chronoutil", "digest", "duration-str", @@ -4397,16 +4375,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" dependencies = [ - "phf_shared 0.10.0", -] - -[[package]] -name = "phf" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" -dependencies = [ - "phf_shared 0.11.1", + "phf_shared", ] [[package]] @@ -4415,18 +4384,8 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", -] - -[[package]] -name = "phf_codegen" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" -dependencies = [ - "phf_generator 0.11.1", - "phf_shared 0.11.1", + "phf_generator", + "phf_shared", ] [[package]] @@ -4435,17 +4394,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" dependencies = [ - "phf_shared 0.10.0", - "rand 0.8.5", -] - -[[package]] -name = "phf_generator" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" -dependencies = [ - "phf_shared 0.11.1", + "phf_shared", "rand 0.8.5", ] @@ -4459,15 +4408,6 @@ dependencies = [ "uncased", ] -[[package]] -name = "phf_shared" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" -dependencies = [ - "siphasher", -] - [[package]] name = "pin-project" version = "1.1.0" @@ -5111,9 +5051,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -5277,9 +5217,9 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "sentry" -version = "0.31.3" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de31c6e03322af2175d3c850c5b5e11efcadc01948cd1fb7b5ad0a7c7b6c7ff2" +checksum = "01b0ad16faa5d12372f914ed40d00bda21a6d1bdcc99264c5e5e1c9495cf3654" dependencies = [ "sentry-backtrace", "sentry-contexts", @@ -5291,9 +5231,9 @@ dependencies = [ [[package]] name = "sentry-backtrace" -version = "0.31.3" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "264e3ad27da3d1ad81b499dbcceae0a50e0e6ffc4b65b93f47d5180d46827644" +checksum = "11f2ee8f147bb5f22ac59b5c35754a759b9a6f6722402e2a14750b2a63fc59bd" dependencies = [ "backtrace", "once_cell", @@ -5303,9 +5243,9 @@ dependencies = [ [[package]] name = "sentry-contexts" -version = "0.31.3" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7144590f7950647e4df5bd95f234c3aa29124729c54bd2457e1224d701d1a91c" +checksum = "dcd133362c745151eeba0ac61e3ba8350f034e9fe7509877d08059fe1d7720c6" dependencies = [ "hostname", "libc", @@ -5317,9 +5257,9 @@ dependencies = [ [[package]] name = "sentry-core" -version = "0.31.3" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35614ecf115f55d93583baa02a85cb63acb6567cf91b17690d1147bac1739ca4" +checksum = "7163491708804a74446642ff2c80b3acd668d4b9e9f497f85621f3d250fd012b" dependencies = [ "once_cell", "rand 0.8.5", @@ -5330,9 +5270,9 @@ dependencies = [ [[package]] name = "sentry-panic" -version = "0.31.3" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a941028a24baf0a5a994d8a39670cecc72a61971bb0155f771537447a46211a" +checksum = "c4dfe8371c9b2e126a8b64f6fefa54cef716ff2a50e63b5558a48b899265bccd" dependencies = [ "sentry-backtrace", "sentry-core", @@ -5340,9 +5280,9 @@ dependencies = [ [[package]] name = "sentry-tower" -version = "0.31.3" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08b268d4a40bb501e7c744c71a62744e81523a2d20e6a749e26aa4fbff6edae2" +checksum = "01c59d3325570b637cc844fef4e7cd9b3f997ffe4e5e83d5ccb85759c9df3bf2" dependencies = [ "http", "pin-project", @@ -5354,9 +5294,9 @@ dependencies = [ [[package]] name = "sentry-tracing" -version = "0.31.3" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eec56ebafd7cfc1175bccdf277be582ccc3308b8c353dca5831261a967a6e28c" +checksum = "5aca8b88978677a27ee1a91beafe4052306c474c06f582321fde72d2e2cc2f7f" dependencies = [ "sentry-backtrace", "sentry-core", @@ -5366,9 +5306,9 @@ dependencies = [ [[package]] name = "sentry-types" -version = "0.31.3" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c56f616602a3b282bf4b4e8e5b4d10bcf9412a987df91c592b95a1f6ef1ee43" +checksum = "9e7a88e0c1922d19b3efee12a8215f6a8a806e442e665ada71cc222cab72985f" dependencies = [ "debugid", "getrandom 0.2.10", @@ -5427,9 +5367,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" dependencies = [ "itoa", "ryu", @@ -5522,9 +5462,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", @@ -5909,7 +5849,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5ab29bb4f3e256ae6ad5c3e2775aa1f8829f2c0c101fc407bfd3a6df15c60c5" dependencies = [ "chrono", - "chrono-tz 0.6.1", + "chrono-tz", "globwalk", "humansize", "lazy_static", @@ -6234,12 +6174,12 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1d42a9b3f3ec46ba828e8d376aec14592ea199f70a06a548587ecd1c4ab658" +checksum = "a8bd22a874a2d0b70452d5597b12c537331d49060824a95f49f108994f94aa4c" dependencies = [ "async-compression", - "bitflags 1.3.2", + "bitflags 2.3.2", "bytes 1.4.0", "futures-core", "futures-util", diff --git a/crates/axum-utils/Cargo.toml b/crates/axum-utils/Cargo.toml index 6fdd3941..296579f4 100644 --- a/crates/axum-utils/Cargo.toml +++ b/crates/axum-utils/Cargo.toml @@ -17,11 +17,11 @@ http = "0.2.9" http-body = "0.4.5" mime = "0.3.17" rand = "0.8.5" -sentry = { version = "0.31.3", default-features = false } +sentry = { version = "0.31.5", default-features = false } serde = "1.0.164" serde_with = "3.0.0" serde_urlencoded = "0.7.1" -serde_json = "1.0.96" +serde_json = "1.0.97" thiserror = "1.0.40" tokio = "1.28.2" tower = { version = "0.4.13", features = ["util"] } diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 8eafd8d2..63e38d4c 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -11,7 +11,7 @@ anyhow = "1.0.71" atty = "0.2.14" axum = "0.6.18" camino = "1.1.4" -clap = { version = "4.3.3", features = ["derive"] } +clap = { version = "4.3.4", features = ["derive"] } dotenv = "0.15.0" httpdate = "1.0.2" hyper = { version = "0.14.26", features = ["full"] } @@ -20,12 +20,12 @@ listenfd = "1.0.1" rand = "0.8.5" rand_chacha = "0.3.1" rustls = "0.21.2" -serde_json = "1.0.96" +serde_json = "1.0.97" serde_yaml = "0.9.21" sqlx = { version = "0.6.3", features = ["runtime-tokio-rustls", "postgres"] } tokio = { version = "1.28.2", features = ["full"] } tower = { version = "0.4.13", features = ["full"] } -tower-http = { version = "0.4.0", features = ["fs", "compression-full"] } +tower-http = { version = "0.4.1", features = ["fs", "compression-full"] } url = "2.4.0" watchman_client = "0.8.0" zeroize = "1.6.0" @@ -42,9 +42,9 @@ opentelemetry-zipkin = { version = "0.17.0", features = ["opentelemetry-http"], opentelemetry-http = { version = "0.8.0", features = ["tokio", "hyper"], optional = true } opentelemetry-prometheus = { version = "0.12.0", optional = true } prometheus = { version = "0.13.3", optional = true } -sentry = { version = "0.31.3", default-features = false, features = ["backtrace", "contexts", "panic", "tower"] } -sentry-tracing = "0.31.3" -sentry-tower = { version = "0.31.3", features = ["http"] } +sentry = { version = "0.31.5", default-features = false, features = ["backtrace", "contexts", "panic", "tower"] } +sentry-tracing = "0.31.5" +sentry-tower = { version = "0.31.5", features = ["http"] } mas-config = { path = "../config" } mas-data-model = { path = "../data-model" } diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml index a2b0649a..cd659431 100644 --- a/crates/config/Cargo.toml +++ b/crates/config/Cargo.toml @@ -22,7 +22,7 @@ url = { version = "2.4.0", features = ["serde"] } serde = { version = "1.0.164", features = ["derive"] } serde_with = { version = "3.0.0", features = ["hex", "chrono"] } -serde_json = "1.0.96" +serde_json = "1.0.97" pem-rfc7468 = "0.7.0" rustls-pemfile = "1.0.2" diff --git a/crates/handlers/Cargo.toml b/crates/handlers/Cargo.toml index c8449389..7f29c4b3 100644 --- a/crates/handlers/Cargo.toml +++ b/crates/handlers/Cargo.toml @@ -16,12 +16,12 @@ tracing = "0.1.37" # Error management thiserror = "1.0.40" anyhow = "1.0.71" -sentry = { version = "0.31.3", default-features = false } +sentry = { version = "0.31.5", default-features = false } # Web server hyper = { version = "0.14.26", features = ["full"] } tower = "0.4.13" -tower-http = { version = "0.4.0", features = ["cors"] } +tower-http = { version = "0.4.1", features = ["cors"] } axum = "0.6.18" axum-macros = "0.3.7" axum-extra = { version = "0.7.4", features = ["cookie-private"] } @@ -37,7 +37,7 @@ sqlx = { version = "0.6.3", features = ["runtime-tokio-rustls", "postgres"] } # Various structure (de)serialization serde = { version = "1.0.164", features = ["derive"] } serde_with = { version = "3.0.0", features = ["hex", "chrono"] } -serde_json = "1.0.96" +serde_json = "1.0.97" serde_urlencoded = "0.7.1" # Password hashing diff --git a/crates/http/Cargo.toml b/crates/http/Cargo.toml index 63dfc4f0..e5b26ea3 100644 --- a/crates/http/Cargo.toml +++ b/crates/http/Cargo.toml @@ -19,14 +19,14 @@ hyper-rustls = { version = "0.24.0", features = ["http1", "http2"], default-feat once_cell = "1.18.0" opentelemetry = "0.19.0" rustls = { version = "0.21.2", optional = true } -rustls-native-certs = { version = "0.6.2", optional = true } +rustls-native-certs = { version = "0.6.3", optional = true } serde = "1.0.164" -serde_json = "1.0.96" +serde_json = "1.0.97" serde_urlencoded = "0.7.1" thiserror = "1.0.40" tokio = { version = "1.28.2", features = ["sync", "parking_lot"], optional = true } tower = { version = "0.4.13", features = [] } -tower-http = { version = "0.4.0", features = ["cors"] } +tower-http = { version = "0.4.1", features = ["cors"] } tracing = "0.1.37" tracing-opentelemetry = "0.19.0" webpki = { version = "0.22.0", optional = true } diff --git a/crates/jose/Cargo.toml b/crates/jose/Cargo.toml index 01f696b3..eda9cffc 100644 --- a/crates/jose/Cargo.toml +++ b/crates/jose/Cargo.toml @@ -21,9 +21,9 @@ rsa = "0.9.2" schemars = "0.8.12" sec1 = "0.7.2" serde = { version = "1.0.164", features = ["derive"] } -serde_json = "1.0.96" +serde_json = "1.0.97" serde_with = { version = "3.0.0", features = ["base64"] } -sha2 = { version = "0.10.6", features = ["oid"] } +sha2 = { version = "0.10.7", features = ["oid"] } signature = "2.1.0" thiserror = "1.0.40" tracing = "0.1.37" diff --git a/crates/listener/Cargo.toml b/crates/listener/Cargo.toml index ae5cac21..8d75ebeb 100644 --- a/crates/listener/Cargo.toml +++ b/crates/listener/Cargo.toml @@ -14,7 +14,7 @@ pin-project-lite = "0.2.9" thiserror = "1.0.40" tokio = { version = "1.28.2", features = ["net", "rt", "macros", "signal", "time"] } tokio-rustls = "0.24.1" -tower-http = { version = "0.4.0", features = ["add-extension"] } +tower-http = { version = "0.4.1", features = ["add-extension"] } tower-service = "0.3.2" tracing = "0.1.37" libc = "0.2.146" diff --git a/crates/oauth2-types/Cargo.toml b/crates/oauth2-types/Cargo.toml index 822fd224..f1a45948 100644 --- a/crates/oauth2-types/Cargo.toml +++ b/crates/oauth2-types/Cargo.toml @@ -8,14 +8,14 @@ license = "Apache-2.0" [dependencies] http = "0.2.9" serde = "1.0.164" -serde_json = "1.0.96" +serde_json = "1.0.97" language-tags = { version = "0.3.2", features = ["serde"] } url = { version = "2.4.0", features = ["serde"] } parse-display = "0.8.1" indoc = "2.0.1" serde_with = { version = "3.0.0", features = ["chrono"] } chrono = "0.4.26" -sha2 = "0.10.6" +sha2 = "0.10.7" data-encoding = "2.4.0" thiserror = "1.0.40" diff --git a/crates/oidc-client/Cargo.toml b/crates/oidc-client/Cargo.toml index 1e9e91b2..be88bcb1 100644 --- a/crates/oidc-client/Cargo.toml +++ b/crates/oidc-client/Cargo.toml @@ -31,7 +31,7 @@ once_cell = "1.18.0" mime = "0.3.17" rand = "0.8.5" serde = { version = "1.0.164", features = ["derive"] } -serde_json = "1.0.96" +serde_json = "1.0.97" serde_urlencoded = "0.7.1" serde_with = "3.0.0" thiserror = "1.0.40" @@ -59,7 +59,7 @@ version = "0.14.26" features = ["client", "http1", "http2", "stream", "runtime" ] optional = true [dependencies.tower-http] -version = "0.4.0" +version = "0.4.1" features = ["follow-redirect", "decompression-full", "set-header", "timeout"] optional = true diff --git a/crates/policy/Cargo.toml b/crates/policy/Cargo.toml index bc3e6ca0..7623f345 100644 --- a/crates/policy/Cargo.toml +++ b/crates/policy/Cargo.toml @@ -9,7 +9,7 @@ license = "Apache-2.0" anyhow = "1.0.71" opa-wasm = { git = "https://github.com/matrix-org/rust-opa-wasm.git" } serde = { version = "1.0.164", features = ["derive"] } -serde_json = "1.0.96" +serde_json = "1.0.97" thiserror = "1.0.40" tokio = { version = "1.28.2", features = ["io-util"] } tracing = "0.1.37" diff --git a/crates/spa/Cargo.toml b/crates/spa/Cargo.toml index 2e1f663f..66108134 100644 --- a/crates/spa/Cargo.toml +++ b/crates/spa/Cargo.toml @@ -7,13 +7,13 @@ license = "Apache-2.0" [dependencies] serde = { version = "1.0.164", features = ["derive"] } -serde_json = "1.0.96" +serde_json = "1.0.97" thiserror = "1.0.40" camino = { version = "1.1.4", features = ["serde1"] } headers = "0.3.8" http = "0.2.9" tower-service = "0.3.2" -tower-http = { version = "0.4.0", features = ["fs"] } +tower-http = { version = "0.4.1", features = ["fs"] } tokio = { version = "1.28.2", features = ["fs"] } [[bin]] diff --git a/crates/storage-pg/Cargo.toml b/crates/storage-pg/Cargo.toml index 2a6fb040..1790189d 100644 --- a/crates/storage-pg/Cargo.toml +++ b/crates/storage-pg/Cargo.toml @@ -10,7 +10,7 @@ async-trait = "0.1.68" sqlx = { version = "0.6.3", features = ["runtime-tokio-rustls", "postgres", "migrate", "chrono", "offline", "json", "uuid"] } chrono = { version = "0.4.26", features = ["serde"] } serde = { version = "1.0.164", features = ["derive"] } -serde_json = "1.0.96" +serde_json = "1.0.97" thiserror = "1.0.40" tracing = "0.1.37" futures-util = "0.3.28" diff --git a/crates/storage/Cargo.toml b/crates/storage/Cargo.toml index b44e6d7e..b56ccc4f 100644 --- a/crates/storage/Cargo.toml +++ b/crates/storage/Cargo.toml @@ -15,7 +15,7 @@ apalis-core = { version = "0.4.2", features = ["tokio-comp"] } opentelemetry = "0.19.0" rand_core = "0.6.4" serde = "1.0.164" -serde_json = "1.0.96" +serde_json = "1.0.97" tracing = "0.1.37" tracing-opentelemetry = "0.19.0" url = "2.4.0" diff --git a/crates/templates/Cargo.toml b/crates/templates/Cargo.toml index fb970644..1d156010 100644 --- a/crates/templates/Cargo.toml +++ b/crates/templates/Cargo.toml @@ -14,7 +14,7 @@ thiserror = "1.0.40" tera = "1.19.0" serde = { version = "1.0.164", features = ["derive"] } -serde_json = "1.0.96" +serde_json = "1.0.97" serde_urlencoded = "0.7.1" camino = "1.1.4"