diff --git a/Cargo.lock b/Cargo.lock index e6bbf70c9d..451d5bc0bb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -897,12 +897,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - [[package]] name = "findshlibs" version = "0.10.2" @@ -931,21 +925,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "form_urlencoded" version = "1.2.1" @@ -1311,19 +1290,6 @@ dependencies = [ "tokio-rustls", ] -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - [[package]] name = "iana-time-zone" version = "0.1.59" @@ -1678,24 +1644,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "nom" version = "5.1.3" @@ -1769,32 +1717,6 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -[[package]] -name = "openssl" -version = "0.10.62" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" -dependencies = [ - "bitflags 2.4.2", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "openssl-probe" version = "0.1.5" @@ -2116,12 +2038,10 @@ dependencies = [ "http-body", "hyper", "hyper-rustls", - "hyper-tls", "ipnet", "js-sys", "log", "mime", - "native-tls", "once_cell", "percent-encoding 2.3.1", "pin-project-lite", @@ -2132,7 +2052,6 @@ dependencies = [ "serde_urlencoded", "system-configuration", "tokio", - "tokio-native-tls", "tokio-rustls", "tower-service", "url 2.5.0", @@ -2283,29 +2202,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "security-framework" -version = "2.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "semver" version = "1.0.21" @@ -2320,16 +2216,11 @@ checksum = "6ce4b57f1b521f674df7a1d200be8ff5d74e3712020ee25b553146657b5377d5" dependencies = [ "curl", "httpdate", - "native-tls", - "reqwest", "sentry-backtrace", "sentry-contexts", "sentry-core", "sentry-debug-images", - "sentry-panic", "sentry-tracing", - "tokio", - "ureq", ] [[package]] @@ -2382,16 +2273,6 @@ dependencies = [ "sentry-core", ] -[[package]] -name = "sentry-panic" -version = "0.31.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74fbf1c163f8b6a9d05912e1b272afa27c652e8b47ea60cb9a57ad5e481eea99" -dependencies = [ - "sentry-backtrace", - "sentry-core", -] - [[package]] name = "sentry-tracing" version = "0.31.8" @@ -2704,7 +2585,6 @@ dependencies = [ "chrono", "docopt", "dyn-clone", - "env_logger 0.10.2", "futures 0.3.30", "hawk", "hex", @@ -2714,7 +2594,6 @@ dependencies = [ "mime", "rand", "regex", - "reqwest", "sentry", "sentry-backtrace", "serde 1.0.195", @@ -2924,19 +2803,6 @@ version = "0.12.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" -[[package]] -name = "tempfile" -version = "3.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall", - "rustix", - "windows-sys 0.52.0", -] - [[package]] name = "term" version = "0.7.0" @@ -3126,7 +2992,6 @@ dependencies = [ "bytes", "libc", "mio", - "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", @@ -3146,16 +3011,6 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.24.1" @@ -3285,19 +3140,6 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" -[[package]] -name = "ureq" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" -dependencies = [ - "base64", - "log", - "native-tls", - "once_cell", - "url 2.5.0", -] - [[package]] name = "url" version = "1.7.2" diff --git a/Cargo.toml b/Cargo.toml index 44107ceeec..c05a36d2ec 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,8 +46,8 @@ lazy_static = "1.4" protobuf = "=2.25.2" # pin to 2.25.2 to prevent side updating rand = "0.8" regex = "1.4" -reqwest = "0.11" -sentry = { version = "0.31", features = ["curl"] } +reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"]} +sentry = { version = "0.31", default-features = false, features = ["curl", "backtrace", "contexts", "debug-images"] } sentry-backtrace = "0.31" serde = "1.0" serde_derive = "1.0" diff --git a/syncserver/Cargo.toml b/syncserver/Cargo.toml index 28623de282..57c1aaf147 100644 --- a/syncserver/Cargo.toml +++ b/syncserver/Cargo.toml @@ -13,7 +13,6 @@ base64.workspace = true cadence.workspace = true chrono.workspace = true docopt.workspace = true -env_logger.workspace = true futures.workspace = true hex.workspace = true lazy_static.workspace = true @@ -43,10 +42,6 @@ dyn-clone = "1.0.4" hostname = "0.3.1" hawk = "5.0" mime = "0.3" -reqwest = { workspace = true, features = [ - "json", - "rustls-tls", -] } # 0.11 requires tokio 1.34 # pin to 0.19: https://github.com/getsentry/sentry-rust/issues/277 syncserver-common = { path = "../syncserver-common" } syncserver-db-common = { path = "../syncserver-db-common" } diff --git a/tokenserver-auth/Cargo.toml b/tokenserver-auth/Cargo.toml index 5286fede6f..1f1c8160f2 100644 --- a/tokenserver-auth/Cargo.toml +++ b/tokenserver-auth/Cargo.toml @@ -22,7 +22,7 @@ slog-scope.workspace = true async-trait = "0.1.40" dyn-clone = "1.0.4" -reqwest = { workspace = true, features = ["json", "rustls-tls"] } +reqwest = { workspace = true, features = ["json"] } ring = "0.17" syncserver-common = { path = "../syncserver-common" } tokenserver-common = { path = "../tokenserver-common" }