mirrors/doh-server
1
0
Fork 0
mirror of https://github.com/DNSCrypt/doh-server.git synced 2025-04-04 21:47:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Update deps

Browse source
This commit is contained in:
Frank Denis 2022-12-25 11:23:13 +01:00
parent 06a3fa0499
commit c82fb339ed
5 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libdoh/Cargo.toml
View file

@ -15,16 +15,16 @@ default = ["tls"]
tls = ["tokio-rustls"] tls = ["tokio-rustls"]
[dependencies] [dependencies]
anyhow = "1.0.65" anyhow = "1.0.68"
arc-swap = "1.5.1" arc-swap = "1.5.1"
base64 = "0.13.0" base64 = "0.20.0"
byteorder = "1.4.3" byteorder = "1.4.3"
bytes = "1.2.1" bytes = "1.3.0"
futures = "0.3.24" futures = "0.3.25"
hyper = { version = "0.14.20", default-features = false, features = ["server", "http1", "http2", "stream"] } hyper = { version = "0.14.23", default-features = false, features = ["server", "http1", "http2", "stream"] }
odoh-rs = "1.0.0" odoh-rs = "1.0.0"
rand = "0.8.5" rand = "0.8.5"
tokio = { version = "1.21.2", features = ["net", "rt-multi-thread", "time", "sync"] } tokio = { version = "1.23.0", features = ["net", "rt-multi-thread", "time", "sync"] }
tokio-rustls = { version = "0.23.4", features = ["early-data"], optional = true } tokio-rustls = { version = "0.23.4", features = ["early-data"], optional = true }
rustls-pemfile = "1.0.1" rustls-pemfile = "1.0.1"

6
src/libdoh/src/errors.rs
View file

@ -27,9 +27,9 @@ impl std::fmt::Display for DoHError {
DoHError::UpstreamIssue => write!(fmt, "Upstream error"), DoHError::UpstreamIssue => write!(fmt, "Upstream error"),
DoHError::UpstreamTimeout => write!(fmt, "Upstream timeout"), DoHError::UpstreamTimeout => write!(fmt, "Upstream timeout"),
DoHError::StaleKey => write!(fmt, "Stale key material"), DoHError::StaleKey => write!(fmt, "Stale key material"),
DoHError::Hyper(e) => write!(fmt, "HTTP error: {}", e), DoHError::Hyper(e) => write!(fmt, "HTTP error: {e}"),
DoHError::Io(e) => write!(fmt, "IO error: {}", e), DoHError::Io(e) => write!(fmt, "IO error: {e}"),
DoHError::ODoHConfigError(e) => write!(fmt, "ODoH config error: {}", e), DoHError::ODoHConfigError(e) => write!(fmt, "ODoH config error: {e}"),
DoHError::TooManyTcpSessions => write!(fmt, "Too many TCP sessions"), DoHError::TooManyTcpSessions => write!(fmt, "Too many TCP sessions"),
} }
} }

15
src/libdoh/src/lib.rs
View file

@ -29,6 +29,12 @@ pub mod reexports {
pub use tokio; pub use tokio;
} }
const BASE64_URL_SAFE_NO_PAD: base64::engine::fast_portable::FastPortable =
base64::engine::fast_portable::FastPortable::from(
&base64::alphabet::URL_SAFE,
base64::engine::fast_portable::NO_PAD,
);
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
struct DnsResponse { struct DnsResponse {
packet: Vec<u8>, packet: Vec<u8>,
@ -162,7 +168,7 @@ impl DoH {
} }
} }
let query = match question_str.and_then(|question_str| { let query = match question_str.and_then(|question_str| {
base64::decode_config(question_str, base64::URL_SAFE_NO_PAD).ok() base64::decode_engine(question_str, &BASE64_URL_SAFE_NO_PAD).ok()
}) { }) {
Some(query) => query, Some(query) => query,
_ => return None, _ => return None,
@ -427,8 +433,7 @@ impl DoH {
.header( .header(
hyper::header::CACHE_CONTROL, hyper::header::CACHE_CONTROL,
format!( format!(
"max-age={}, stale-if-error={}, stale-while-revalidate={}", "max-age={ttl}, stale-if-error={STALE_IF_ERROR_SECS}, stale-while-revalidate={STALE_WHILE_REVALIDATE_SECS}"
ttl, STALE_IF_ERROR_SECS, STALE_WHILE_REVALIDATE_SECS
) )
.as_str(), .as_str(),
); );
@ -495,9 +500,9 @@ impl DoH {
self.globals.tls_cert_path.is_some() && self.globals.tls_cert_key_path.is_some(); self.globals.tls_cert_path.is_some() && self.globals.tls_cert_key_path.is_some();
} }
if tls_enabled { if tls_enabled {
println!("Listening on https://{}{}", listen_address, path); println!("Listening on https://{listen_address}{path}");
} else { } else {
println!("Listening on http://{}{}", listen_address, path); println!("Listening on http://{listen_address}{path}");
} }
let mut server = Http::new(); let mut server = Http::new();

2
src/libdoh/src/odoh.rs
View file

@ -115,7 +115,7 @@ impl ODoHRotator {
Ok(key) => { Ok(key) => {
current_key.store(Arc::new(key)); current_key.store(Arc::new(key));
} }
Err(e) => eprintln!("ODoH key rotation error: {}", e), Err(e) => eprintln!("ODoH key rotation error: {e}"),
}; };
} }
}); });

8
src/libdoh/src/tls.rs
View file

@ -30,8 +30,7 @@ where
io::Error::new( io::Error::new(
e.kind(), e.kind(),
format!( format!(
"Unable to load the certificates [{}]: {}", "Unable to load the certificates [{certs_path_str}]: {e}"
certs_path_str, e
), ),
) )
})?); })?);
@ -54,8 +53,7 @@ where
io::Error::new( io::Error::new(
e.kind(), e.kind(),
format!( format!(
"Unable to load the certificate keys [{}]: {}", "Unable to load the certificate keys [{certs_keys_path_str}]: {e}"
certs_keys_path_str, e
), ),
) )
})? })?
@ -163,7 +161,7 @@ impl DoH {
break; break;
} }
} }
Err(e) => eprintln!("TLS certificates error: {}", e), Err(e) => eprintln!("TLS certificates error: {e}"),
} }
tokio::time::sleep(Duration::from_secs(CERTS_WATCH_DELAY_SECS.into())).await; tokio::time::sleep(Duration::from_secs(CERTS_WATCH_DELAY_SECS.into())).await;
} }