chore: massage dependencies and features to remove openssl/native-tls (#2859)

Co-authored-by: Geometrically <18202329+Geometrically@users.noreply.github.com>
Co-authored-by: Prospector <6166773+Prospector@users.noreply.github.com>
This commit is contained in:
Conrad Ludgate
2024-11-03 09:48:35 +00:00
committed by GitHub
parent 81d921d625
commit 2d95ff0830
4 changed files with 319 additions and 224 deletions

456
Cargo.lock generated
View File

@@ -667,7 +667,7 @@ dependencies = [
"tokio 1.40.0", "tokio 1.40.0",
"tokio-rustls 0.26.0", "tokio-rustls 0.26.0",
"tungstenite", "tungstenite",
"webpki-roots", "webpki-roots 0.26.6",
] ]
[[package]] [[package]]
@@ -732,24 +732,12 @@ checksum = "1fcf00bc6d5abb29b5f97e3c61a90b6d3caa12f3faf897d4a3e3607c050a35a7"
dependencies = [ dependencies = [
"http 0.2.12", "http 0.2.12",
"log", "log",
"native-tls", "rustls 0.20.9",
"serde",
"serde_json",
"url",
]
[[package]]
name = "attohttpc"
version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f77d243921b0979fbbd728dd2d5162e68ac8252976797c24eb5b3a6af9090dc"
dependencies = [
"http 0.2.12",
"log",
"native-tls",
"serde", "serde",
"serde_json", "serde_json",
"url", "url",
"webpki",
"webpki-roots 0.22.6",
] ]
[[package]] [[package]]
@@ -764,7 +752,7 @@ version = "0.34.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3776743bb68d4ad02ba30ba8f64373f1be4e082fe47651767171ce75bb2f6cf5" checksum = "3776743bb68d4ad02ba30ba8f64373f1be4e082fe47651767171ce75bb2f6cf5"
dependencies = [ dependencies = [
"attohttpc 0.22.0", "attohttpc",
"dirs 4.0.0", "dirs 4.0.0",
"log", "log",
"quick-xml 0.26.0", "quick-xml 0.26.0",
@@ -776,20 +764,30 @@ dependencies = [
] ]
[[package]] [[package]]
name = "aws-creds" name = "aws-lc-rs"
version = "0.36.0" version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "390ad3b77f3e21e01a4a0355865853b681daf1988510b0b15e31c0c4ae7eb0f6" checksum = "2f95446d919226d587817a7d21379e6eb099b97b45110a7f272a444ca5c54070"
dependencies = [ dependencies = [
"attohttpc 0.26.1", "aws-lc-sys",
"home", "mirai-annotations",
"log", "paste",
"quick-xml 0.30.0", "zeroize",
"rust-ini 0.19.0", ]
"serde",
"thiserror", [[package]]
"time", name = "aws-lc-sys"
"url", version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3ddc4a5b231dd6958b140ff3151b6412b3f4321fab354f399eec8f14b06df62"
dependencies = [
"bindgen",
"cc",
"cmake",
"dunce",
"fs_extra",
"libc",
"paste",
] ]
[[package]] [[package]]
@@ -861,6 +859,29 @@ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "bindgen"
version = "0.69.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
dependencies = [
"bitflags 2.6.0",
"cexpr",
"clang-sys",
"itertools 0.10.5",
"lazy_static",
"lazycell",
"log",
"prettyplease",
"proc-macro2",
"quote",
"regex",
"rustc-hash 1.1.0",
"shlex",
"syn 2.0.79",
"which",
]
[[package]] [[package]]
name = "bit-set" name = "bit-set"
version = "0.5.3" version = "0.5.3"
@@ -1214,6 +1235,15 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
[[package]]
name = "cexpr"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
dependencies = [
"nom",
]
[[package]] [[package]]
name = "cfb" name = "cfb"
version = "0.7.3" version = "0.7.3"
@@ -1289,19 +1319,41 @@ dependencies = [
] ]
[[package]] [[package]]
name = "clickhouse" name = "cityhash-rs"
version = "0.11.6" version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a0875e527e299fc5f4faba42870bf199a39ab0bb2dbba1b8aef0a2151451130f" checksum = "93a719913643003b84bd13022b4b7e703c09342cd03b679c4641c7d2e50dc34d"
[[package]]
name = "clang-sys"
version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
dependencies = [
"glob",
"libc",
"libloading 0.8.5",
]
[[package]]
name = "clickhouse"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2135bb9638e8c8c1e3d794f242099e57987059ba52e7e3de597e1d99b2c4a5a3"
dependencies = [ dependencies = [
"bstr", "bstr",
"bytes 1.7.2", "bytes 1.7.2",
"cityhash-rs",
"clickhouse-derive", "clickhouse-derive",
"clickhouse-rs-cityhash-sys",
"futures 0.3.30", "futures 0.3.30",
"hyper 0.14.31", "futures-channel",
"hyper-tls 0.5.0", "http-body-util",
"lz4", "hyper 1.4.1",
"hyper-rustls 0.27.3",
"hyper-util",
"lz4_flex",
"replace_with",
"rustls 0.23.13",
"sealed", "sealed",
"serde", "serde",
"static_assertions", "static_assertions",
@@ -1314,23 +1366,14 @@ dependencies = [
[[package]] [[package]]
name = "clickhouse-derive" name = "clickhouse-derive"
version = "0.1.1" version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18af5425854858c507eec70f7deb4d5d8cec4216fcb086283a78872387281ea5" checksum = "d70f3e2893f7d3e017eeacdc9a708fbc29a10488e3ebca21f9df6a5d2b616dbb"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"serde_derive_internals 0.26.0", "serde_derive_internals",
"syn 1.0.109", "syn 2.0.79",
]
[[package]]
name = "clickhouse-rs-cityhash-sys"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4baf9d4700a28d6cb600e17ed6ae2b43298a5245f1f76b4eab63027ebfd592b9"
dependencies = [
"cc",
] ]
[[package]] [[package]]
@@ -1342,6 +1385,15 @@ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
] ]
[[package]]
name = "cmake"
version = "0.1.51"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a"
dependencies = [
"cc",
]
[[package]] [[package]]
name = "cocoa" name = "cocoa"
version = "0.25.0" version = "0.25.0"
@@ -1868,7 +1920,7 @@ dependencies = [
"itertools 0.13.0", "itertools 0.13.0",
"lazy_static", "lazy_static",
"reqwest 0.12.7", "reqwest 0.12.7",
"rust-s3 0.34.0", "rust-s3",
"semver 1.0.23", "semver 1.0.23",
"serde", "serde",
"serde-xml-rs", "serde-xml-rs",
@@ -2708,6 +2760,12 @@ dependencies = [
"percent-encoding", "percent-encoding",
] ]
[[package]]
name = "fs_extra"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
[[package]] [[package]]
name = "fsevent-sys" name = "fsevent-sys"
version = "4.1.0" version = "4.1.0"
@@ -3292,12 +3350,6 @@ dependencies = [
"ahash 0.7.8", "ahash 0.7.8",
] ]
[[package]]
name = "hashbrown"
version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
[[package]] [[package]]
name = "hashbrown" name = "hashbrown"
version = "0.14.5" version = "0.14.5"
@@ -3317,15 +3369,6 @@ dependencies = [
"hashbrown 0.14.5", "hashbrown 0.14.5",
] ]
[[package]]
name = "heck"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
dependencies = [
"unicode-segmentation",
]
[[package]] [[package]]
name = "heck" name = "heck"
version = "0.4.1" version = "0.4.1"
@@ -3574,7 +3617,7 @@ dependencies = [
"hyper 0.14.31", "hyper 0.14.31",
"log", "log",
"rustls 0.21.12", "rustls 0.21.12",
"rustls-native-certs", "rustls-native-certs 0.6.3",
"tokio 1.40.0", "tokio 1.40.0",
"tokio-rustls 0.24.1", "tokio-rustls 0.24.1",
] ]
@@ -3589,25 +3632,14 @@ dependencies = [
"http 1.1.0", "http 1.1.0",
"hyper 1.4.1", "hyper 1.4.1",
"hyper-util", "hyper-util",
"log",
"rustls 0.23.13", "rustls 0.23.13",
"rustls-native-certs 0.8.0",
"rustls-pki-types", "rustls-pki-types",
"tokio 1.40.0", "tokio 1.40.0",
"tokio-rustls 0.26.0", "tokio-rustls 0.26.0",
"tower-service", "tower-service",
"webpki-roots", "webpki-roots 0.26.6",
]
[[package]]
name = "hyper-tls"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
dependencies = [
"bytes 1.7.2",
"hyper 0.14.31",
"native-tls",
"tokio 1.40.0",
"tokio-native-tls",
] ]
[[package]] [[package]]
@@ -4316,8 +4348,8 @@ dependencies = [
"governor", "governor",
"hex", "hex",
"hmac 0.11.0", "hmac 0.11.0",
"hyper 0.14.31", "hyper-rustls 0.27.3",
"hyper-tls 0.5.0", "hyper-util",
"image 0.24.9", "image 0.24.9",
"itertools 0.12.1", "itertools 0.12.1",
"jemallocator", "jemallocator",
@@ -4333,7 +4365,7 @@ dependencies = [
"redis", "redis",
"regex", "regex",
"reqwest 0.11.27", "reqwest 0.11.27",
"rust-s3 0.33.0", "rust-s3",
"rust_decimal", "rust_decimal",
"rust_iso3166", "rust_iso3166",
"rusty-money", "rusty-money",
@@ -4379,6 +4411,12 @@ dependencies = [
"spin 0.9.8", "spin 0.9.8",
] ]
[[package]]
name = "lazycell"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]] [[package]]
name = "lebe" name = "lebe"
version = "0.5.2" version = "0.5.2"
@@ -4387,27 +4425,33 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
[[package]] [[package]]
name = "lettre" name = "lettre"
version = "0.11.9" version = "0.11.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69f204773bab09b150320ea1c83db41dc6ee606a4bc36dc1f43005fe7b58ce06" checksum = "0161e452348e399deb685ba05e55ee116cae9410f4f51fe42d597361444521d9"
dependencies = [ dependencies = [
"async-trait",
"base64 0.22.1", "base64 0.22.1",
"chumsky", "chumsky",
"email-encoding", "email-encoding",
"email_address", "email_address",
"fastrand 2.1.1", "fastrand 2.1.1",
"futures-io",
"futures-util", "futures-util",
"hostname", "hostname",
"httpdate", "httpdate",
"idna 1.0.2", "idna 1.0.2",
"mime", "mime",
"native-tls",
"nom", "nom",
"percent-encoding", "percent-encoding",
"quoted_printable", "quoted_printable",
"rustls 0.23.13",
"rustls-pemfile 2.1.3",
"rustls-pki-types",
"socket2", "socket2",
"tokio 1.40.0", "tokio 1.40.0",
"tokio-rustls 0.26.0",
"url", "url",
"webpki-roots 0.26.6",
] ]
[[package]] [[package]]
@@ -4430,7 +4474,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf" checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf"
dependencies = [ dependencies = [
"gtk-sys", "gtk-sys",
"libloading", "libloading 0.7.4",
"once_cell", "once_cell",
] ]
@@ -4460,6 +4504,16 @@ dependencies = [
"winapi 0.3.9", "winapi 0.3.9",
] ]
[[package]]
name = "libloading"
version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
dependencies = [
"cfg-if 1.0.0",
"windows-targets 0.48.5",
]
[[package]] [[package]]
name = "libm" name = "libm"
version = "0.2.8" version = "0.2.8"
@@ -4590,23 +4644,10 @@ dependencies = [
] ]
[[package]] [[package]]
name = "lz4" name = "lz4_flex"
version = "1.28.0" version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d1febb2b4a79ddd1980eede06a8f7902197960aa0383ffcfdd62fe723036725" checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5"
dependencies = [
"lz4-sys",
]
[[package]]
name = "lz4-sys"
version = "1.11.1+lz4-1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6"
dependencies = [
"cc",
"libc",
]
[[package]] [[package]]
name = "lzma-sys" name = "lzma-sys"
@@ -4894,6 +4935,12 @@ dependencies = [
"ws2_32-sys", "ws2_32-sys",
] ]
[[package]]
name = "mirai-annotations"
version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1"
[[package]] [[package]]
name = "muda" name = "muda"
version = "0.15.1" version = "0.15.1"
@@ -5467,16 +5514,6 @@ dependencies = [
"hashbrown 0.12.3", "hashbrown 0.12.3",
] ]
[[package]]
name = "ordered-multimap"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e"
dependencies = [
"dlv-list 0.5.2",
"hashbrown 0.13.2",
]
[[package]] [[package]]
name = "ordered-multimap" name = "ordered-multimap"
version = "0.7.3" version = "0.7.3"
@@ -5992,6 +6029,16 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
[[package]]
name = "prettyplease"
version = "0.2.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
dependencies = [
"proc-macro2",
"syn 2.0.79",
]
[[package]] [[package]]
name = "prettytable-rs" name = "prettytable-rs"
version = "0.10.0" version = "0.10.0"
@@ -6190,16 +6237,6 @@ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "quick-xml"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956"
dependencies = [
"memchr",
"serde",
]
[[package]] [[package]]
name = "quick-xml" name = "quick-xml"
version = "0.31.0" version = "0.31.0"
@@ -6228,7 +6265,7 @@ dependencies = [
"pin-project-lite", "pin-project-lite",
"quinn-proto", "quinn-proto",
"quinn-udp", "quinn-udp",
"rustc-hash", "rustc-hash 2.0.0",
"rustls 0.23.13", "rustls 0.23.13",
"socket2", "socket2",
"thiserror", "thiserror",
@@ -6245,7 +6282,7 @@ dependencies = [
"bytes 1.7.2", "bytes 1.7.2",
"rand 0.8.5", "rand 0.8.5",
"ring 0.17.8", "ring 0.17.8",
"rustc-hash", "rustc-hash 2.0.0",
"rustls 0.23.13", "rustls 0.23.13",
"slab", "slab",
"thiserror", "thiserror",
@@ -6542,6 +6579,12 @@ dependencies = [
"bytecheck", "bytecheck",
] ]
[[package]]
name = "replace_with"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3a8614ee435691de62bcffcf4a66d91b3594bf1428a5722e79103249a095690"
[[package]] [[package]]
name = "reqwest" name = "reqwest"
version = "0.11.27" version = "0.11.27"
@@ -6557,16 +6600,17 @@ dependencies = [
"http 0.2.12", "http 0.2.12",
"http-body 0.4.6", "http-body 0.4.6",
"hyper 0.14.31", "hyper 0.14.31",
"hyper-tls 0.5.0", "hyper-rustls 0.24.2",
"ipnet", "ipnet",
"js-sys", "js-sys",
"log", "log",
"mime", "mime",
"mime_guess", "mime_guess",
"native-tls",
"once_cell", "once_cell",
"percent-encoding", "percent-encoding",
"pin-project-lite", "pin-project-lite",
"rustls 0.21.12",
"rustls-native-certs 0.6.3",
"rustls-pemfile 1.0.4", "rustls-pemfile 1.0.4",
"serde", "serde",
"serde_json", "serde_json",
@@ -6574,7 +6618,7 @@ dependencies = [
"sync_wrapper 0.1.2", "sync_wrapper 0.1.2",
"system-configuration 0.5.1", "system-configuration 0.5.1",
"tokio 1.40.0", "tokio 1.40.0",
"tokio-native-tls", "tokio-rustls 0.24.1",
"tokio-util", "tokio-util",
"tower-service", "tower-service",
"url", "url",
@@ -6582,6 +6626,7 @@ dependencies = [
"wasm-bindgen-futures", "wasm-bindgen-futures",
"wasm-streams", "wasm-streams",
"web-sys", "web-sys",
"webpki-roots 0.25.4",
"winreg 0.50.0", "winreg 0.50.0",
] ]
@@ -6604,7 +6649,7 @@ dependencies = [
"http-body-util", "http-body-util",
"hyper 1.4.1", "hyper 1.4.1",
"hyper-rustls 0.27.3", "hyper-rustls 0.27.3",
"hyper-tls 0.6.0", "hyper-tls",
"hyper-util", "hyper-util",
"ipnet", "ipnet",
"js-sys", "js-sys",
@@ -6616,6 +6661,7 @@ dependencies = [
"pin-project-lite", "pin-project-lite",
"quinn", "quinn",
"rustls 0.23.13", "rustls 0.23.13",
"rustls-native-certs 0.7.3",
"rustls-pemfile 2.1.3", "rustls-pemfile 2.1.3",
"rustls-pki-types", "rustls-pki-types",
"serde", "serde",
@@ -6633,7 +6679,7 @@ dependencies = [
"wasm-bindgen-futures", "wasm-bindgen-futures",
"wasm-streams", "wasm-streams",
"web-sys", "web-sys",
"webpki-roots", "webpki-roots 0.26.6",
"windows-registry", "windows-registry",
] ]
@@ -6775,16 +6821,6 @@ dependencies = [
"ordered-multimap 0.4.3", "ordered-multimap 0.4.3",
] ]
[[package]]
name = "rust-ini"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091"
dependencies = [
"cfg-if 1.0.0",
"ordered-multimap 0.6.0",
]
[[package]] [[package]]
name = "rust-ini" name = "rust-ini"
version = "0.21.1" version = "0.21.1"
@@ -6803,7 +6839,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b2ac5ff6acfbe74226fa701b5ef793aaa054055c13ebb7060ad36942956e027" checksum = "1b2ac5ff6acfbe74226fa701b5ef793aaa054055c13ebb7060ad36942956e027"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"aws-creds 0.34.1", "aws-creds",
"aws-region", "aws-region",
"base64 0.13.1", "base64 0.13.1",
"bytes 1.7.2", "bytes 1.7.2",
@@ -6829,43 +6865,6 @@ dependencies = [
"url", "url",
] ]
[[package]]
name = "rust-s3"
version = "0.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6679da8efaf4c6f0c161de0961dfe95fb6e9049c398d6fbdada2639f053aedb"
dependencies = [
"async-trait",
"aws-creds 0.36.0",
"aws-region",
"base64 0.21.7",
"bytes 1.7.2",
"cfg-if 1.0.0",
"futures 0.3.30",
"hex",
"hmac 0.12.1",
"http 0.2.12",
"hyper 0.14.31",
"hyper-tls 0.5.0",
"log",
"maybe-async",
"md5",
"minidom",
"native-tls",
"percent-encoding",
"quick-xml 0.30.0",
"serde",
"serde_derive",
"serde_json",
"sha2 0.10.8",
"thiserror",
"time",
"tokio 1.40.0",
"tokio-native-tls",
"tokio-stream",
"url",
]
[[package]] [[package]]
name = "rust_decimal" name = "rust_decimal"
version = "1.36.0" version = "1.36.0"
@@ -6910,6 +6909,12 @@ version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
[[package]]
name = "rustc-hash"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]] [[package]]
name = "rustc-hash" name = "rustc-hash"
version = "2.0.0" version = "2.0.0"
@@ -6947,6 +6952,18 @@ dependencies = [
"windows-sys 0.52.0", "windows-sys 0.52.0",
] ]
[[package]]
name = "rustls"
version = "0.20.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99"
dependencies = [
"log",
"ring 0.16.20",
"sct",
"webpki",
]
[[package]] [[package]]
name = "rustls" name = "rustls"
version = "0.21.12" version = "0.21.12"
@@ -6965,6 +6982,8 @@ version = "0.23.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
dependencies = [ dependencies = [
"aws-lc-rs",
"log",
"once_cell", "once_cell",
"ring 0.17.8", "ring 0.17.8",
"rustls-pki-types", "rustls-pki-types",
@@ -6985,6 +7004,32 @@ dependencies = [
"security-framework", "security-framework",
] ]
[[package]]
name = "rustls-native-certs"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5"
dependencies = [
"openssl-probe",
"rustls-pemfile 2.1.3",
"rustls-pki-types",
"schannel",
"security-framework",
]
[[package]]
name = "rustls-native-certs"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a"
dependencies = [
"openssl-probe",
"rustls-pemfile 2.1.3",
"rustls-pki-types",
"schannel",
"security-framework",
]
[[package]] [[package]]
name = "rustls-pemfile" name = "rustls-pemfile"
version = "1.0.4" version = "1.0.4"
@@ -7026,6 +7071,7 @@ version = "0.102.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
dependencies = [ dependencies = [
"aws-lc-rs",
"ring 0.17.8", "ring 0.17.8",
"rustls-pki-types", "rustls-pki-types",
"untrusted 0.9.0", "untrusted 0.9.0",
@@ -7120,7 +7166,7 @@ checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"serde_derive_internals 0.29.1", "serde_derive_internals",
"syn 2.0.79", "syn 2.0.79",
] ]
@@ -7148,14 +7194,13 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
[[package]] [[package]]
name = "sealed" name = "sealed"
version = "0.4.0" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b5e421024b5e5edfbaa8e60ecf90bda9dbffc602dbb230e6028763f85f0c68c" checksum = "22f968c5ea23d555e670b449c1c5e7b2fc399fdaec1d304a17cd48e288abc107"
dependencies = [ dependencies = [
"heck 0.3.3",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 1.0.109", "syn 2.0.79",
] ]
[[package]] [[package]]
@@ -7246,8 +7291,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00421ed8fa0c995f07cde48ba6c89e80f2b312f74ff637326f392fbfd23abe02" checksum = "00421ed8fa0c995f07cde48ba6c89e80f2b312f74ff637326f392fbfd23abe02"
dependencies = [ dependencies = [
"httpdate", "httpdate",
"native-tls",
"reqwest 0.12.7", "reqwest 0.12.7",
"rustls 0.21.12",
"sentry-backtrace", "sentry-backtrace",
"sentry-contexts", "sentry-contexts",
"sentry-core", "sentry-core",
@@ -7256,6 +7301,7 @@ dependencies = [
"sentry-tracing", "sentry-tracing",
"tokio 1.40.0", "tokio 1.40.0",
"ureq", "ureq",
"webpki-roots 0.25.4",
] ]
[[package]] [[package]]
@@ -7401,17 +7447,6 @@ dependencies = [
"syn 2.0.79", "syn 2.0.79",
] ]
[[package]]
name = "serde_derive_internals"
version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
]
[[package]] [[package]]
name = "serde_derive_internals" name = "serde_derive_internals"
version = "0.29.1" version = "0.29.1"
@@ -7927,7 +7962,7 @@ dependencies = [
"tokio-stream", "tokio-stream",
"tracing", "tracing",
"url", "url",
"webpki-roots", "webpki-roots 0.26.6",
] ]
[[package]] [[package]]
@@ -9707,9 +9742,11 @@ checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a"
dependencies = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"log", "log",
"native-tls",
"once_cell", "once_cell",
"rustls 0.23.13",
"rustls-pki-types",
"url", "url",
"webpki-roots 0.26.6",
] ]
[[package]] [[package]]
@@ -10093,6 +10130,31 @@ dependencies = [
"libwebp-sys", "libwebp-sys",
] ]
[[package]]
name = "webpki"
version = "0.22.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53"
dependencies = [
"ring 0.17.8",
"untrusted 0.9.0",
]
[[package]]
name = "webpki-roots"
version = "0.22.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
dependencies = [
"webpki",
]
[[package]]
name = "webpki-roots"
version = "0.25.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
[[package]] [[package]]
name = "webpki-roots" name = "webpki-roots"
version = "0.26.6" version = "0.26.6"

View File

@@ -16,18 +16,27 @@ serde_json = "1.0"
serde-xml-rs = "0.6.0" serde-xml-rs = "0.6.0"
lazy_static = "1.4.0" lazy_static = "1.4.0"
thiserror = "1.0" thiserror = "1.0"
reqwest = { version = "0.12.5", features = ["stream", "json", "rustls-tls"] } reqwest = { version = "0.12.5", default-features = false, features = [
"stream",
"json",
"rustls-tls-native-roots",
] }
async_zip = { version = "0.0.17", features = ["full"] } async_zip = { version = "0.0.17", features = ["full"] }
semver = "1.0" semver = "1.0"
chrono = { version = "0.4", features = ["serde"] } chrono = { version = "0.4", features = ["serde"] }
bytes = "1.6.0" bytes = "1.6.0"
rust-s3 = "0.34.0" rust-s3 = { version = "0.33.0", default-features = false, features = [
"fail-on-err",
"tags",
"tokio-rustls-tls",
"reqwest",
] }
dashmap = "5.5.3" dashmap = "5.5.3"
sha1_smol = { version = "1.0.0", features = ["std"] } sha1_smol = { version = "1.0.0", features = ["std"] }
indexmap = { version = "2.2.6", features = ["serde"]} indexmap = { version = "2.2.6", features = ["serde"] }
itertools = "0.13.0" itertools = "0.13.0"
tracing-error = "0.2.0" tracing-error = "0.2.0"
tracing = "0.1" tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] } tracing-subscriber = { version = "0.3", features = ["env-filter"] }
tracing-futures = { version = "0.2.5", features = ["futures", "tokio"] } tracing-futures = { version = "0.2.5", features = ["futures", "tokio"] }

View File

@@ -17,7 +17,7 @@ actix-multipart = "0.6.1"
actix-cors = "0.7.0" actix-cors = "0.7.0"
actix-ws = "0.2.5" actix-ws = "0.2.5"
actix-files = "0.6.5" actix-files = "0.6.5"
actix-web-prom = { version = "0.8.0", features = ["process"]} actix-web-prom = { version = "0.8.0", features = ["process"] }
governor = "0.6.3" governor = "0.6.3"
tokio = { version = "1.35.1", features = ["sync"] } tokio = { version = "1.35.1", features = ["sync"] }
@@ -31,10 +31,19 @@ dashmap = "5.4.0"
lazy_static = "1.4.0" lazy_static = "1.4.0"
meilisearch-sdk = "0.24.3" meilisearch-sdk = "0.24.3"
rust-s3 = "0.33.0" rust-s3 = { version = "0.33.0", default-features = false, features = [
reqwest = { version = "0.11.18", features = ["json", "multipart"] } "fail-on-err",
hyper = { version = "0.14", features = ["full"] } "tags",
hyper-tls = "0.5.0" "tokio-rustls-tls",
"reqwest",
] }
reqwest = { version = "0.11.18", default-features = false, features = [
"json",
"multipart",
"rustls-tls-native-roots",
] }
hyper-rustls = "0.27.3"
hyper-util = "0.1.9"
serde_json = "1.0" serde_json = "1.0"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
@@ -88,16 +97,27 @@ rust_decimal = { version = "1.33.1", features = [
"serde-with-float", "serde-with-float",
"serde-with-str", "serde-with-str",
] } ] }
redis = { version = "0.27.5", features = ["tokio-comp", "ahash", "r2d2"]} redis = { version = "0.27.5", features = ["tokio-comp", "ahash", "r2d2"] }
deadpool-redis = "0.18.0" deadpool-redis = "0.18.0"
clickhouse = { version = "0.11.2", features = ["uuid", "time"] } clickhouse = { version = "0.13.1", features = [
"uuid",
"time",
"rustls-tls-native-roots",
] }
uuid = { version = "1.2.2", features = ["v4", "fast-rng", "serde"] } uuid = { version = "1.2.2", features = ["v4", "fast-rng", "serde"] }
maxminddb = "0.24.0" maxminddb = "0.24.0"
flate2 = "1.0.25" flate2 = "1.0.25"
tar = "0.4.38" tar = "0.4.38"
sentry = { version = "0.32.1" } sentry = { version = "0.32.1", default-features = false, features = [
"backtrace",
"contexts",
"debug-images",
"panic",
"rustls",
"reqwest",
] }
sentry-actix = "0.32.1" sentry-actix = "0.32.1"
image = "0.24.6" image = "0.24.6"
@@ -106,12 +126,18 @@ webp = "0.3.0"
woothee = "0.13.0" woothee = "0.13.0"
lettre = "0.11.3" lettre = { version = "0.11.10", default-features = false, features = [
"builder",
"hostname",
"pool",
"smtp-transport",
"tokio1-rustls-tls",
] }
derive-new = "0.6.0" derive-new = "0.6.0"
rust_iso3166 = "0.1.11" rust_iso3166 = "0.1.11"
jemallocator = {version = "0.5.4", optional = true} jemallocator = { version = "0.5.4", optional = true }
async-stripe = { version = "0.37.3", features = ["runtime-tokio-hyper-rustls"] } async-stripe = { version = "0.37.3", features = ["runtime-tokio-hyper-rustls"] }
rusty-money = "0.4.1" rusty-money = "0.4.1"
@@ -121,4 +147,4 @@ json-patch = "*"
actix-http = "3.4.0" actix-http = "3.4.0"
[features] [features]
jemalloc = ["jemallocator"] jemalloc = ["jemallocator"]

View File

@@ -1,6 +1,3 @@
use hyper::client::HttpConnector;
use hyper_tls::{native_tls, HttpsConnector};
mod fetch; mod fetch;
pub use fetch::*; pub use fetch::*;
@@ -14,15 +11,16 @@ pub async fn init_client_with_database(
database: &str, database: &str,
) -> clickhouse::error::Result<clickhouse::Client> { ) -> clickhouse::error::Result<clickhouse::Client> {
let client = { let client = {
let mut http_connector = HttpConnector::new(); let tls_connector = hyper_rustls::HttpsConnectorBuilder::new()
http_connector.enforce_http(false); // allow https URLs .with_native_roots()
.expect("no native root CA certificates found")
let tls_connector = .https_only()
native_tls::TlsConnector::builder().build().unwrap().into(); .enable_http1()
let https_connector = .build();
HttpsConnector::from((http_connector, tls_connector)); let hyper_client = hyper_util::client::legacy::Client::builder(
let hyper_client = hyper_util::rt::TokioExecutor::new(),
hyper::client::Client::builder().build(https_connector); )
.build(tls_connector);
clickhouse::Client::with_http_client(hyper_client) clickhouse::Client::with_http_client(hyper_client)
.with_url(dotenvy::var("CLICKHOUSE_URL").unwrap()) .with_url(dotenvy::var("CLICKHOUSE_URL").unwrap())