From c3c9b5dcd2980181eccaf860aaba6efe309fa5ca Mon Sep 17 00:00:00 2001 From: Greg Heartsfield Date: Mon, 4 Sep 2023 07:53:58 -0500 Subject: [PATCH] improvement: remove openssl dependency --- Cargo.lock | 152 ++++++++++++++++-------------------------- Cargo.toml | 2 +- src/nip05.rs | 9 ++- src/payment/lnbits.rs | 8 ++- 4 files changed, 73 insertions(+), 98 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6a0cb85a..4c092fa3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -950,21 +950,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.0" @@ -1347,28 +1332,31 @@ dependencies = [ ] [[package]] -name = "hyper-timeout" -version = "0.4.1" +name = "hyper-rustls" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" dependencies = [ + "futures-util", + "http", "hyper", - "pin-project-lite", + "log", + "rustls 0.21.7", + "rustls-native-certs", "tokio", - "tokio-io-timeout", + "tokio-rustls 0.24.1", ] [[package]] -name = "hyper-tls" -version = "0.5.0" +name = "hyper-timeout" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "bytes", "hyper", - "native-tls", + "pin-project-lite", "tokio", - "tokio-native-tls", + "tokio-io-timeout", ] [[package]] @@ -1660,24 +1648,6 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" -[[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 = "no-std-compat" version = "0.4.1" @@ -1741,7 +1711,7 @@ dependencies = [ "hex", "http", "hyper", - "hyper-tls", + "hyper-rustls", "indicatif", "lazy_static", "log", @@ -1892,50 +1862,12 @@ version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" -[[package]] -name = "openssl" -version = "0.10.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" -dependencies = [ - "bitflags 2.4.0", - "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.31", -] - [[package]] name = "openssl-probe" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "openssl-sys" -version = "0.9.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "option-ext" version = "0.2.0" @@ -2634,6 +2566,30 @@ dependencies = [ "webpki", ] +[[package]] +name = "rustls" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + [[package]] name = "rustls-pemfile" version = "1.0.3" @@ -2643,6 +2599,16 @@ dependencies = [ "base64 0.21.3", ] +[[package]] +name = "rustls-webpki" +version = "0.101.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -2936,7 +2902,7 @@ dependencies = [ "paste", "percent-encoding", "rand 0.8.5", - "rustls", + "rustls 0.20.9", "rustls-pemfile", "serde", "serde_json", @@ -2980,7 +2946,7 @@ checksum = "804d3f245f894e61b1e6263c84b23ca675d96753b5abfd5cc8597d86806e8024" dependencies = [ "once_cell", "tokio", - "tokio-rustls", + "tokio-rustls 0.23.4", ] [[package]] @@ -3191,24 +3157,24 @@ dependencies = [ ] [[package]] -name = "tokio-native-tls" -version = "0.3.1" +name = "tokio-rustls" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "native-tls", + "rustls 0.20.9", "tokio", + "webpki", ] [[package]] name = "tokio-rustls" -version = "0.23.4" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.7", "tokio", - "webpki", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 28cc501b..ff72b41b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,7 +39,7 @@ lazy_static = "1.4" governor = "0.4" nonzero_ext = "0.3" hyper = { version="0.14", features=["client", "server","http1","http2","tcp"] } -hyper-tls = "0.5" +hyper-rustls = { version = "0.24" } http = { version = "0.2" } parse_duration = "2" rand = "0.8" diff --git a/src/nip05.rs b/src/nip05.rs index 414db3a4..7fa60dad 100644 --- a/src/nip05.rs +++ b/src/nip05.rs @@ -11,7 +11,7 @@ use crate::repo::NostrRepo; use hyper::body::HttpBody; use hyper::client::connect::HttpConnector; use hyper::Client; -use hyper_tls::HttpsConnector; +use hyper_rustls::HttpsConnector; use std::sync::Arc; use std::time::Duration; use std::time::Instant; @@ -133,7 +133,12 @@ impl Verifier { ) -> Result { info!("creating NIP-05 verifier"); // setup hyper client - let https = HttpsConnector::new(); + let https = hyper_rustls::HttpsConnectorBuilder::new() + .with_native_roots() + .https_or_http() + .enable_http1() + .build(); + let client = Client::builder().build::<_, hyper::Body>(https); // After all accounts have been re-verified, don't check again diff --git a/src/payment/lnbits.rs b/src/payment/lnbits.rs index 98632430..a5c15d79 100644 --- a/src/payment/lnbits.rs +++ b/src/payment/lnbits.rs @@ -2,7 +2,7 @@ use http::Uri; use hyper::client::connect::HttpConnector; use hyper::Client; -use hyper_tls::HttpsConnector; +use hyper_rustls::HttpsConnector; use nostr::Keys; use serde::{Deserialize, Serialize}; use serde_json::Value; @@ -72,7 +72,11 @@ pub struct LNBitsPaymentProcessor { impl LNBitsPaymentProcessor { pub fn new(settings: &Settings) -> Self { // setup hyper client - let https = HttpsConnector::new(); + let https = hyper_rustls::HttpsConnectorBuilder::new() + .with_native_roots() + .https_only() + .enable_http1() + .build(); let client = Client::builder().build::<_, hyper::Body>(https); Self {