lib/ureq
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Offer separate error during handshakes. (#331)

Browse Source 
It's useful to know that an error was specific to the TLS handshake,
versus the TCP connect, or a later stage of a request.
This commit is contained in:
Jacob Hoffman-Andrews
2021-02-21 14:26:25 -08:00
committed by GitHub
parent 6f86ee7f93 413e8bf4aa
commit b80f12e384
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/stream.rs
View File

@@ -330,6 +330,7 @@ fn configure_certs(config: &mut rustls::ClientConfig) {
#[cfg(feature = "tls")] #[cfg(feature = "tls")]
pub(crate) fn connect_https(unit: &Unit, hostname: &str) -> Result<Stream, Error> { pub(crate) fn connect_https(unit: &Unit, hostname: &str) -> Result<Stream, Error> {
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use rustls::Session;
use std::sync::Arc; use std::sync::Arc;
static TLS_CONF: Lazy<Arc<rustls::ClientConfig>> = Lazy::new(|| { static TLS_CONF: Lazy<Arc<rustls::ClientConfig>> = Lazy::new(|| {
@@ -349,10 +350,14 @@ pub(crate) fn connect_https(unit: &Unit, hostname: &str) -> Result<Stream, Error
.as_ref() .as_ref()
.map(|c| &c.0) .map(|c| &c.0)
.unwrap_or(&*TLS_CONF); .unwrap_or(&*TLS_CONF);
let sess = rustls::ClientSession::new(&tls_conf, sni); let mut sock = connect_host(unit, hostname, port)?;
let mut sess = rustls::ClientSession::new(&tls_conf, sni);
let sock = connect_host(unit, hostname, port)?;
sess.complete_io(&mut sock).map_err(|err| {
ErrorKind::ConnectionFailed
.msg("error during TLS handshake. Sometimes this means the host doesn't support any of the same ciphersuites as rustls, or doesn't support TLS 1.2 and above")
.src(err)
})?;
let stream = rustls::StreamOwned::new(sess, sock); let stream = rustls::StreamOwned::new(sess, sock);
Ok(Stream::from_tls_stream(stream)) Ok(Stream::from_tls_stream(stream))