xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add TLS server roots from webpki

Browse source
This commit is contained in:
Paul Fariello 2021-02-15 20:45:58 +01:00 • committed by Astro
commit 8d3c7a3bd6
2 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tokio-xmpp/Cargo.toml
View file

@ -28,12 +28,13 @@ trust-dns-resolver = "0.20"
xml5ever = "0.16" xml5ever = "0.16"
xmpp-parsers = "0.18" xmpp-parsers = "0.18"
webpki = { version = "0.21", optional = true } webpki = { version = "0.21", optional = true }
webpki-roots = { version = "0.21", optional = true }
[build-dependencies] [build-dependencies]
rustc_version = "0.3" rustc_version = "0.3"
[features] [features]
default = ["tls-native"] default = ["tls-native"]
tls-rust = ["tokio-rustls", "webpki"] tls-rust = ["tokio-rustls", "webpki", "webpki-roots"]
tls-native = ["tokio-native-tls", "native-tls"] tls-native = ["tokio-native-tls", "native-tls"]
serde = ["xmpp-parsers/serde"] serde = ["xmpp-parsers/serde"]

30
tokio-xmpp/src/starttls.rs
View file

@ -1,17 +1,21 @@
use futures::{sink::SinkExt, stream::StreamExt}; use futures::{sink::SinkExt, stream::StreamExt};
#[cfg(feature = "tls-rust")] #[cfg(feature = "tls-rust")]
use idna; use {
idna,
std::sync::Arc,
tokio_rustls::{client::TlsStream, rustls::ClientConfig, TlsConnector},
webpki::DNSNameRef,
webpki_roots,
};
#[cfg(feature = "tls-native")] #[cfg(feature = "tls-native")]
use native_tls::TlsConnector as NativeTlsConnector; use {
#[cfg(feature = "tls-rust")] native_tls::TlsConnector as NativeTlsConnector,
use std::sync::Arc; tokio_native_tls::{TlsConnector, TlsStream},
};
use tokio::io::{AsyncRead, AsyncWrite}; use tokio::io::{AsyncRead, AsyncWrite};
#[cfg(feature = "tls-native")]
use tokio_native_tls::{TlsConnector, TlsStream};
#[cfg(feature = "tls-rust")]
use tokio_rustls::{client::TlsStream, rustls::ClientConfig, TlsConnector};
#[cfg(feature = "tls-rust")]
use webpki::DNSNameRef;
use xmpp_parsers::{ns, Element}; use xmpp_parsers::{ns, Element};
use crate::xmpp_codec::Packet; use crate::xmpp_codec::Packet;
@ -38,7 +42,11 @@ async fn get_tls_stream<S: AsyncRead + AsyncWrite + Unpin>(
let ascii_domain = idna::domain_to_ascii(domain).map_err(|_| Error::Idna)?; let ascii_domain = idna::domain_to_ascii(domain).map_err(|_| Error::Idna)?;
let domain = DNSNameRef::try_from_ascii_str(&ascii_domain).unwrap(); let domain = DNSNameRef::try_from_ascii_str(&ascii_domain).unwrap();
let stream = xmpp_stream.into_inner(); let stream = xmpp_stream.into_inner();
let tls_stream = TlsConnector::from(Arc::new(ClientConfig::new())) let mut config = ClientConfig::new();
config
.root_store
.add_server_trust_anchors(&webpki_roots::TLS_SERVER_ROOTS);
let tls_stream = TlsConnector::from(Arc::new(config))
.connect(domain, stream) .connect(domain, stream)
.await?; .await?;
Ok(tls_stream) Ok(tls_stream)