From 0f710f27124283fa554203781a14fd0a8e6ae900 Mon Sep 17 00:00:00 2001 From: Katalina Okano Date: Tue, 13 Dec 2022 01:07:15 -0500 Subject: [PATCH] tokio machine broke --- Cargo.lock | 105 ++++++++++++++++++++++++++++++++-- services/api/Cargo.toml | 4 +- services/tasks/Cargo.toml | 4 +- services/websocket/Cargo.toml | 6 +- 4 files changed, 106 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5347d90..03fb555 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1023,7 +1023,7 @@ dependencies = [ "log", "memchr", "mime", - "spin", + "spin 0.9.4", "version_check", ] @@ -1368,6 +1368,42 @@ dependencies = [ "winreg", ] +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted", + "web-sys", + "winapi", +] + +[[package]] +name = "rustls" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" +dependencies = [ + "log", + "ring", + "sct", + "webpki", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" +dependencies = [ + "base64", +] + [[package]] name = "rustversion" version = "1.0.9" @@ -1402,6 +1438,16 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "security-framework" version = "2.7.0" @@ -1535,6 +1581,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + [[package]] name = "spin" version = "0.9.4" @@ -1598,6 +1650,8 @@ dependencies = [ "paste", "percent-encoding", "rand", + "rustls", + "rustls-pemfile", "serde", "serde_json", "sha1", @@ -1609,6 +1663,7 @@ dependencies = [ "thiserror", "tokio-stream", "url", + "webpki-roots", "whoami", ] @@ -1636,10 +1691,9 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24c5b2d25fa654cc5f841750b8e1cdedbe21189bf9a9382ee90bfa9dd3562396" dependencies = [ - "native-tls", "once_cell", "tokio", - "tokio-native-tls", + "tokio-rustls", ] [[package]] @@ -1805,6 +1859,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.23.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +dependencies = [ + "rustls", + "tokio", + "webpki", +] + [[package]] name = "tokio-stream" version = "0.1.11" @@ -1824,10 +1889,12 @@ checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd" dependencies = [ "futures-util", "log", - "native-tls", + "rustls", "tokio", - "tokio-native-tls", + "tokio-rustls", "tungstenite", + "webpki", + "webpki-roots", ] [[package]] @@ -1939,12 +2006,13 @@ dependencies = [ "http", "httparse", "log", - "native-tls", "rand", + "rustls", "sha1", "thiserror", "url", "utf-8", + "webpki", ] [[package]] @@ -1998,6 +2066,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + [[package]] name = "url" version = "2.3.1" @@ -2125,6 +2199,25 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki-roots" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +dependencies = [ + "webpki", +] + [[package]] name = "websocket" version = "0.1.0" diff --git a/services/api/Cargo.toml b/services/api/Cargo.toml index 3c4309e..f6fa88a 100644 --- a/services/api/Cargo.toml +++ b/services/api/Cargo.toml @@ -10,8 +10,8 @@ serde_json = "1.0.89" serde = "1.0.149" async-graphql = { version = "5.0.3", features = ["chrono"] } axum = "0.6.1" -sqlx = { version = "0.6.2", default_features = false, features = [ "runtime-tokio-native-tls", "postgres", "chrono" ] } -tokio = { version = "1.23.0", features = ["macros"] } +sqlx = { version = "0.6.2", default_features = false, features = [ "runtime-tokio-rustls", "postgres", "chrono" ] } +tokio = { version = "1.23.0", features = ["macros", "rt-multi-thread"] } tower-http = { version = "0.3.5", features = ["cors"] } lazy_static = "1.4.0" reqwest = "0.11.13" diff --git a/services/tasks/Cargo.toml b/services/tasks/Cargo.toml index e649c32..203ad2a 100644 --- a/services/tasks/Cargo.toml +++ b/services/tasks/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tokio = { version = "1.23.0", features = ["macros"] } -sqlx = { version = "0.6.2", default_features = false, features = [ "runtime-tokio-native-tls" , "postgres" ] } +tokio = { version = "1.23.0", features = ["macros", "rt-multi-thread"] } +sqlx = { version = "0.6.2", default_features = false, features = [ "runtime-tokio-rustls" , "postgres" ] } lazy_static = "1.4.0" async_once = "0.2.6" \ No newline at end of file diff --git a/services/websocket/Cargo.toml b/services/websocket/Cargo.toml index d9f9832..1366c30 100644 --- a/services/websocket/Cargo.toml +++ b/services/websocket/Cargo.toml @@ -7,11 +7,11 @@ edition = "2021" [dependencies] lazy_static = "1.4.0" -tokio-tungstenite = { version = "0.18.0", features=["native-tls"] } +tokio-tungstenite = { version = "0.18.0", features=["rustls-tls-webpki-roots"] } serde = { version = "1.0.149", features = ["derive"] } serde_json = "1.0.89" -tokio = { version = "1.23.0", features = ["macros"] } -sqlx = { version = "0.6.2", default_features = false, features = [ "runtime-tokio-native-tls" , "postgres" ] } +tokio = { version = "1.23.0", features = ["macros", "rt-multi-thread"] } +sqlx = { version = "0.6.2", default_features = false, features = [ "runtime-tokio-rustls" , "postgres" ] } url = "2.3.1" futures-util = "0.3.25" futures = "0.3.25"