diff --git a/Cargo.lock b/Cargo.lock index 6b5e3deb..6ccdff47 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -303,9 +303,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.7.1" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9df67f7bf9ef8498769f994239c45613ef0c5899415fb58e9add412d2c1a538" +checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c" [[package]] name = "byte-tools" @@ -1026,9 +1026,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c06815895acec637cd6ed6e9662c935b866d20a106f8361892893a7d9234964" +checksum = "7fd819562fcebdac5afc5c113c3ec36f902840b70fd4fc458799c8ce4607ae55" dependencies = [ "bytes", "fnv", @@ -1045,9 +1045,9 @@ dependencies = [ [[package]] name = "half" -version = "1.8.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac5956d4e63858efaec57e0d6c1c2f6a41e1487f830314a324ccd7e2223a7ca0" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "hashbrown" @@ -1083,18 +1083,18 @@ dependencies = [ [[package]] name = "headers" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b7591fb62902706ae8e7aaff416b1b0fa2c0fd0878b46dc13baa3712d8a855" +checksum = "a4c4eb0471fcb85846d8b0690695ef354f9afb11cb03cac2e1d7c9253351afb0" dependencies = [ "base64 0.13.0", "bitflags", "bytes", "headers-core", "http", + "httpdate", "mime", "sha-1 0.9.8", - "time 0.1.44", ] [[package]] @@ -1153,9 +1153,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5" +checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" dependencies = [ "bytes", "http", @@ -1182,9 +1182,9 @@ checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026" [[package]] name = "hyper" -version = "0.14.13" +version = "0.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15d1cfb9e4f68655fa04c01f59edb405b6074a0f7118ea881e5026e4a1cd8593" +checksum = "2b91bb1f221b6ea1f1e4371216b70f40748774c2fb5971b450c07773fb92d26b" dependencies = [ "bytes", "futures-channel", @@ -1356,8 +1356,9 @@ dependencies = [ [[package]] name = "jwt-compact" -version = "0.4.0" -source = "git+https://github.com/slowli/jwt-compact.git?rev=7a6dee6824c1d4e7c7f81019c9a968e5c9e44923#7a6dee6824c1d4e7c7f81019c9a968e5c9e44923" +version = "0.5.0-beta.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8744ba39fb09cfe9ce0666650e0e338ed1a031809b10362a544ef05588c2380b" dependencies = [ "anyhow", "base64ct", @@ -1407,9 +1408,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.104" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2f96d100e1cf1929e7719b7edb3b90ab5298072638fccd77be9ce942ecdfce" +checksum = "869d572136620d55835903746bcb5cdc54cb2851fd0aeec53220b4bb65ef3013" [[package]] name = "libm" @@ -1583,9 +1584,9 @@ dependencies = [ [[package]] name = "matchers" -version = "0.0.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ "regex-automata", ] @@ -2223,9 +2224,9 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ca011bd0129ff4ae15cd04c4eef202cadf6c51c21e47aba319b4e0501db741" +checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" [[package]] name = "proc-macro-error" @@ -2494,9 +2495,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51c732d463dd300362ffb44b7b125f299c23d2990411a4253824630ebc7467fb" +checksum = "66d2927ca2f685faf0fc620ac4834690d29e7abb153add10f5812eef20b5e280" dependencies = [ "base64 0.13.0", "bytes", @@ -2788,9 +2789,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062b87e45d8f26714eacfaef0ed9a583e2bfd50ebd96bdd3c200733bd5758e2c" +checksum = "ad6056b4cb69b6e43e3a0f055def223380baecc99da683884f205bf347f7c4b3" dependencies = [ "chrono", "hex", @@ -2801,9 +2802,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c1fcca18d55d1763e1c16873c4bde0ac3ef75179a28c7b372917e0494625be" +checksum = "12e47be9471c72889ebafb5e14d5ff930d89ae7a67bbdb5f8abb564f845a927e" dependencies = [ "darling", "proc-macro2", @@ -2887,9 +2888,9 @@ dependencies = [ [[package]] name = "signature" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19772be3c4dd2ceaacf03cb41d5885f2a02c4d8804884918e3a258480803335" +checksum = "f2807892cfa58e081aa1f1111391c7a0649d4fa127a4ffbe34bcbfb35a1171a4" dependencies = [ "digest 0.9.0", "rand_core 0.6.3", @@ -3490,9 +3491,9 @@ dependencies = [ [[package]] name = "tower" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d15a6b60cdff0cb039d81d3b37f8bc3d7e53dca09069aae3ef2502ca4834fe30" +checksum = "c00e500fff5fa1131c866b246041a6bf96da9c965f8fe4128cb1421f23e93c00" dependencies = [ "futures-core", "futures-util", @@ -3603,9 +3604,9 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "599f388ecb26b28d9c1b2e4437ae019a7b336018b45ed911458cd9ebf91129f6" +checksum = "3ffbf13a0f8b054a4e59df3a173b818e9c6177c02789871f2073977fd0062076" dependencies = [ "opentelemetry", "tracing", @@ -3614,36 +3615,22 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "tracing-serde" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b" -dependencies = [ - "serde", - "tracing-core", -] - [[package]] name = "tracing-subscriber" -version = "0.2.25" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" +checksum = "80a4ddde70311d8da398062ecf6fc2c309337de6b0f77d6c27aff8d53f6fca52" dependencies = [ "ansi_term", - "chrono", "lazy_static", "matchers", "regex", - "serde", - "serde_json", "sharded-slab", "smallvec", "thread_local", "tracing", "tracing-core", "tracing-log", - "tracing-serde", ] [[package]] diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 11bbcbdf..17c76018 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -12,18 +12,18 @@ anyhow = "1.0.44" clap = "3.0.0-beta.5" dotenv = "0.15.0" schemars = { version = "0.8.6", features = ["url", "chrono"] } -tower = { version = "0.4.9", features = ["full"] } +tower = { version = "0.4.10", features = ["full"] } tower-http = { version = "0.1.1", features = ["full"] } -hyper = { version = "0.14.13", features = ["full"] } +hyper = { version = "0.14.14", features = ["full"] } serde_yaml = "0.8.21" warp = "0.3.1" url = "2.2.2" argon2 = { version = "0.3.1", features = ["password-hash"] } -reqwest = { version = "0.11.5", features = ["rustls-tls"], default-features = false, optional = true } +reqwest = { version = "0.11.6", features = ["rustls-tls"], default-features = false, optional = true } tracing = "0.1.29" -tracing-subscriber = "0.2.25" -tracing-opentelemetry = "0.15.0" +tracing-subscriber = { version = "0.3.1", features = ["env-filter"] } +tracing-opentelemetry = "0.16.0" opentelemetry = { version = "0.16.0", features = ["trace", "metrics", "rt-tokio"] } opentelemetry-http = "0.5.0" opentelemetry-semantic-conventions = "0.8.0" diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml index 78a52f8d..baa8636e 100644 --- a/crates/config/Cargo.toml +++ b/crates/config/Cargo.toml @@ -19,7 +19,7 @@ chrono = { version = "0.4.19", features = ["serde"] } url = { version = "2.2.2", features = ["serde"] } serde = { version = "1.0.130", features = ["derive"] } -serde_with = { version = "1.10.0", features = ["hex", "chrono"] } +serde_with = { version = "1.11.0", features = ["hex", "chrono"] } serde_json = "1.0.68" sqlx = { version = "0.5.9", features = ["runtime-tokio-rustls", "postgres"] } @@ -28,11 +28,6 @@ rsa = "0.5.0" k256 = "0.9.6" pkcs8 = { version = "0.7.6", features = ["pem"] } elliptic-curve = { version = "0.10.6", features = ["pem"] } +jwt-compact = { version = "0.5.0-beta.1", features = ["with_rsa", "k256"] } indoc = "1.0.3" - -[dependencies.jwt-compact] -# Waiting on the next release because of the bump of the `rsa` dependency -git = "https://github.com/slowli/jwt-compact.git" -rev = "7a6dee6824c1d4e7c7f81019c9a968e5c9e44923" -features = ["rsa", "k256"] diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 9696136b..0635aa01 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -22,14 +22,14 @@ anyhow = "1.0.44" # Web server warp = "0.3.1" -hyper = { version = "0.14.13", features = ["full"] } +hyper = { version = "0.14.14", features = ["full"] } # Database access sqlx = { version = "0.5.9", features = ["runtime-tokio-rustls", "postgres", "migrate", "chrono", "offline"] } # Various structure (de)serialization serde = { version = "1.0.130", features = ["derive"] } -serde_with = { version = "1.10.0", features = ["hex", "chrono"] } +serde_with = { version = "1.11.0", features = ["hex", "chrono"] } serde_json = "1.0.68" serde_urlencoded = "0.7.0" @@ -45,6 +45,7 @@ elliptic-curve = { version = "0.10.6", features = ["pem"] } chacha20poly1305 = { version = "0.9.0", features = ["std"] } sha2 = "0.9.8" crc = "2.0.0" +jwt-compact = { version = "0.5.0-beta.1", features = ["with_rsa", "k256"] } # Various data types and utilities data-encoding = "2.3.2" @@ -54,7 +55,7 @@ itertools = "0.10.1" mime = "0.3.16" rand = "0.8.4" bincode = "1.3.3" -headers = "0.3.4" +headers = "0.3.5" cookie = "0.15.1" once_cell = "1.8.0" @@ -63,11 +64,5 @@ mas-config = { path = "../config" } mas-data-model = { path = "../data-model" } mas-templates = { path = "../templates" } -[dependencies.jwt-compact] -# Waiting on the next release because of the bump of the `rsa` dependency -git = "https://github.com/slowli/jwt-compact.git" -rev = "7a6dee6824c1d4e7c7f81019c9a968e5c9e44923" -features = ["rsa", "k256"] - [dev-dependencies] indoc = "1.0.3" diff --git a/crates/oauth2-types/Cargo.toml b/crates/oauth2-types/Cargo.toml index cd877971..185e3f2d 100644 --- a/crates/oauth2-types/Cargo.toml +++ b/crates/oauth2-types/Cargo.toml @@ -13,7 +13,7 @@ language-tags = { version = "0.3.2", features = ["serde"] } url = { version = "2.2.2", features = ["serde"] } parse-display = "0.5.3" indoc = "1.0.3" -serde_with = { version = "1.10.0", features = ["chrono"] } +serde_with = { version = "1.11.0", features = ["chrono"] } sqlx = { version = "0.5.9", default-features = false, optional = true } chrono = "0.4.19" sha2 = "0.9.8"