maq/sn0int
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix incomplete osx 10.13 dns bugfix

Browse Source
This commit is contained in:
kpcyrd
2020-03-23 19:01:15 +01:00
parent 5ff78297e4
commit b519619324
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.lock generated
View File

@@ -316,7 +316,7 @@ dependencies = [
[[package]]
name = "chrootable-https"
version = "0.15.0"
version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3096,7 +3096,7 @@ dependencies = [
"bytesize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"caps 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
"chrootable-https 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
"chrootable-https 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
"colored 1.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam-channel 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"ctrlc 3.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3200,7 +3200,7 @@ dependencies = [
"bufstream 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
"chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
"chrootable-https 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
"chrootable-https 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
"ct-logs 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"der-parser 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4258,7 +4258,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum cexpr 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fce5b5fb86b0c57c20c834c1b412fd09c77c8a59b9473f86272709e78874cd1d"
"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
"checksum chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2"
"checksum chrootable-https 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18eacf94631dd1cf83fafedab599b7f5cbf8715d31c2d5d84f4255c002a5152a"
"checksum chrootable-https 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e32a3007fb5dc65e9c373e4bbcf6bf36d7b2a9185e21f35c3660508baacffd8b"
"checksum clang-sys 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)" = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853"
"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"

2
Cargo.toml
View File

@@ -41,7 +41,7 @@ dirs = "2.0"
url = "2.0"
percent-encoding = "2.1"
#chrootable-https = { path = "../chrootable-https" }
chrootable-https = "0.15"
chrootable-https = "0.15.2"
base64 = "0.12"
data-encoding = "2.1.2"
serde_urlencoded = "0.6"

3
sn0int-std/Cargo.toml
View File

@@ -24,7 +24,8 @@ serde_urlencoded = "0.6"
webpki = "0.21"
webpki-roots = "0.19.0"
ct-logs = "0.6"
chrootable-https = "0.15"
#chrootable-https = { path = "../../chrootable-https" }
chrootable-https = "0.15.2"
http = "0.2"
bufstream = "0.1.4"
pem = "0.7"

2
sn0int-std/src/psl.rs
View File

@@ -60,7 +60,7 @@ impl PslReader {
}
pub fn download(path: &Path, url: &str) -> Result<()> {
let client = Client::with_system_resolver()?;
let client = Client::with_system_resolver_v4()?;
let resp = client.get(url)
.wait_for_response()
.context("http request failed")?;

3
src/api.rs
View File

@@ -25,8 +25,7 @@ impl Client {
let client = if let Some(proxy) = config.network.proxy {
chrootable_https::Client::with_socks5(proxy)
} else {
chrootable_https::Client::with_system_resolver()
.context("Failed to load dns configuration")?
chrootable_https::Client::with_system_resolver_v4()?
};
Ok(Client {