min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6 from gabi-250/ipv6-hosts 

Ensure the host can be parsed as an IPv6 address.
This commit is contained in:
Ivan Nikulin 2021-01-20 11:26:25 +00:00 committed by GitHub
parent a6fbc0fed2 12d6a27104
commit 3364ecc2e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boring/src/ssl/connector.rs
View File

@ -40,7 +40,7 @@ fn ctx(method: SslMethod) -> Result<SslContextBuilder, ErrorStack> {
// This is quite a useful optimization for saving memory, but historically
// caused CVEs in OpenSSL pre-1.0.1h, according to
// https://bugs.python.org/issue25672
if version::number() >= 0x1_00_01_08_0 {
if version::number() >= 0x1000_1080 {
mode |= SslMode::RELEASE_BUFFERS;
}

17
hyper-boring/src/lib.rs
View File

@ -21,6 +21,7 @@ use std::fmt::Debug;
use std::future::Future;
use std::io;
use std::mem::MaybeUninit;
use std::net;
use std::pin::Pin;
use std::sync::Arc;
use std::task::{Context, Poll};
@ -228,7 +229,21 @@ where
None => return Ok(MaybeHttpsStream::Http(conn)),
};
let host = uri.host().ok_or("URI missing host")?;
let mut host = uri.host().ok_or("URI missing host")?;
// If `host` is an IPv6 address, we must strip away the square brackets that surround
// it (otherwise, boring will fail to parse the host as an IP address, eventually
// causing the handshake to fail due a hostname verification error).
if !host.is_empty() {
let last = host.len() - 1;
let mut chars = host.chars();
if let (Some('['), Some(']')) = (chars.next(), chars.last()) {
if host[1..last].parse::<net::Ipv6Addr>().is_ok() {
host = &host[1..last];
}
}
}
let config = inner.setup_ssl(&uri, host)?;
let stream = tokio_boring::connect(config, host, conn).await?;