RUST-1220 Bump outdated dependencies #596
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,24 @@ | ||
| use std::{ | ||
| convert::TryFrom, | ||
| fs::File, | ||
| io::{BufReader, Seek, SeekFrom}, | ||
| pin::Pin, | ||
| sync::Arc, | ||
| task::{Context, Poll}, | ||
| time::SystemTime, | ||
| }; | ||
|
|
||
| use futures_io::{AsyncRead, AsyncWrite}; | ||
| use rustls::{ | ||
| client::{ClientConfig, ServerCertVerified, ServerCertVerifier, ServerName}, | ||
| Certificate, | ||
| Error as TlsError, | ||
| OwnedTrustAnchor, | ||
| RootCertStore, | ||
| }; | ||
| use rustls_pemfile::{certs, read_one, Item}; | ||
| use tokio::io::AsyncWrite as TokioAsyncWrite; | ||
| use tokio_rustls::TlsConnector; | ||
| use webpki_roots::TLS_SERVER_ROOTS; | ||
|
|
||
| use crate::{ | ||
|
|
@@ -39,7 +39,7 @@ impl AsyncTlsStream { | |
| tcp_stream: AsyncTcpStream, | ||
| cfg: TlsOptions, | ||
| ) -> Result<Self> { | ||
| let name = ServerName::try_from(host).map_err(|e| ErrorKind::DnsResolve { | ||
| message: format!("could not resolve {:?}: {}", host, e), | ||
| })?; | ||
| let mut tls_config = make_rustls_config(cfg)?; | ||
|
|
@@ -82,39 +82,38 @@ impl AsyncWrite for AsyncTlsStream { | |
|
|
||
| /// Converts `TlsOptions` into a rustls::ClientConfig. | ||
| fn make_rustls_config(cfg: TlsOptions) -> Result<rustls::ClientConfig> { | ||
| let mut store = RootCertStore::empty(); | ||
| if let Some(path) = cfg.ca_file_path { | ||
| let ders = certs(&mut BufReader::new(File::open(&path)?)).map_err(|_| { | ||
| ErrorKind::InvalidTlsConfig { | ||
| message: format!( | ||
| "Unable to parse PEM-encoded root certificate from {}", | ||
| path.display() | ||
| ), | ||
| } | ||
| })?; | ||
| store.add_parsable_certificates(&ders); | ||
| } else { | ||
| let trust_anchors = TLS_SERVER_ROOTS.0.iter().map(|ta| { | ||
| OwnedTrustAnchor::from_subject_spki_name_constraints( | ||
| ta.subject, | ||
| ta.spki, | ||
| ta.name_constraints, | ||
| ) | ||
| }); | ||
| store.add_server_trust_anchors(trust_anchors); | ||
| } | ||
|
|
||
| let mut config = if let Some(path) = cfg.cert_key_file_path { | ||
| let mut file = BufReader::new(File::open(&path)?); | ||
| let certs = match certs(&mut file) { | ||
| Ok(certs) => certs.into_iter().map(Certificate).collect(), | ||
| Err(error) => { | ||
| return Err(ErrorKind::InvalidTlsConfig { | ||
| message: format!( | ||
| "Unable to parse PEM-encoded client certificate from {}: {}", | ||
| path.display(), | ||
| error, | ||
| ), | ||
| } | ||
| .into()) | ||
|
|
@@ -146,11 +145,24 @@ fn make_rustls_config(cfg: TlsOptions) -> Result<rustls::ClientConfig> { | |
| } | ||
| }; | ||
|
|
||
| ClientConfig::builder() | ||
|
There was a problem hiding this comment.
|
||
| .with_safe_defaults() | ||
| .with_root_certificates(store) | ||
| .with_single_cert(certs, key) | ||
| .map_err(|error| ErrorKind::InvalidTlsConfig { | ||
| message: error.to_string(), | ||
| })? | ||
| } else { | ||
| ClientConfig::builder() | ||
| .with_safe_defaults() | ||
| .with_root_certificates(store) | ||
| .with_no_client_auth() | ||
| }; | ||
|
|
||
| if let Some(true) = cfg.allow_invalid_certificates { | ||
| config | ||
| .dangerous() | ||
| .set_certificate_verifier(Arc::new(NoCertVerifier {})); | ||
| } | ||
|
|
||
| Ok(config) | ||
|
|
@@ -161,11 +173,13 @@ struct NoCertVerifier {} | |
| impl ServerCertVerifier for NoCertVerifier { | ||
| fn verify_server_cert( | ||
| &self, | ||
| _: &Certificate, | ||
| _: &[Certificate], | ||
| _: &ServerName, | ||
| _: &mut dyn Iterator<Item = &[u8]>, | ||
| _: &[u8], | ||
| _: SystemTime, | ||
| ) -> std::result::Result<ServerCertVerified, TlsError> { | ||
| Ok(ServerCertVerified::assertion()) | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I ended up needing to bump these rather than waiting for #591 because the older versions were incompatible with the new version of
async-std-resolver.