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

Nits

Browse source
This commit is contained in:
Frank Denis 2025-02-20 20:32:42 +01:00
parent 40b0b02972
commit 9e4a931bce
4 changed files with 37 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

61
src/config.rs
View file

@ -240,39 +240,42 @@ pub fn parse_opts(globals: &mut Globals) {
.or_else(|| globals.tls_cert_path.clone()); .or_else(|| globals.tls_cert_path.clone());
} }
if let Some(hostname) = matches.get_one::<String>("hostname") { match matches.get_one::<String>("hostname") {
let mut builder = Some(hostname) => {
dnsstamps::DoHBuilder::new(hostname.to_string(), globals.path.to_string()); let mut builder =
if let Some(public_address) = matches.get_one::<String>("public_address") { dnsstamps::DoHBuilder::new(hostname.to_string(), globals.path.to_string());
builder = builder.with_address(public_address.to_string()); if let Some(public_address) = matches.get_one::<String>("public_address") {
} builder = builder.with_address(public_address.to_string());
if let Some(public_port) = matches.get_one::<String>("public_port") { }
let public_port = public_port.parse().expect("Invalid public port"); if let Some(public_port) = matches.get_one::<String>("public_port") {
builder = builder.with_port(public_port); let public_port = public_port.parse().expect("Invalid public port");
} builder = builder.with_port(public_port);
println!( }
"Test DNS stamp to reach [{}] over DoH: [{}]\n", println!(
hostname, "Test DNS stamp to reach [{}] over DoH: [{}]\n",
builder.serialize().unwrap() hostname,
); builder.serialize().unwrap()
);
let mut builder = let mut builder =
dnsstamps::ODoHTargetBuilder::new(hostname.to_string(), globals.path.to_string()); dnsstamps::ODoHTargetBuilder::new(hostname.to_string(), globals.path.to_string());
if let Some(public_port) = matches.get_one::<String>("public_port") { if let Some(public_port) = matches.get_one::<String>("public_port") {
let public_port = public_port.parse().expect("Invalid public port"); let public_port = public_port.parse().expect("Invalid public port");
builder = builder.with_port(public_port); builder = builder.with_port(public_port);
} }
println!( println!(
"Test DNS stamp to reach [{}] over Oblivious DoH: [{}]\n", "Test DNS stamp to reach [{}] over Oblivious DoH: [{}]\n",
hostname, hostname,
builder.serialize().unwrap() builder.serialize().unwrap()
); );
println!("Check out https://dnscrypt.info/stamps/ to compute the actual stamps.\n") println!("Check out https://dnscrypt.info/stamps/ to compute the actual stamps.\n")
} else { }
println!( _ => {
println!(
"Please provide a fully qualified hostname (-H <hostname> command-line option) to get \ "Please provide a fully qualified hostname (-H <hostname> command-line option) to get \
test DNS stamps for your server.\n" test DNS stamps for your server.\n"
); );
}
} }
} }

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

@ -257,10 +257,7 @@ impl DoH {
content_types: &[&'static str], content_types: &[&'static str],
) -> Option<&'static str> { ) -> Option<&'static str> {
let accept = headers.get(hyper::header::ACCEPT); let accept = headers.get(hyper::header::ACCEPT);
let accept = match accept { let accept = accept?;
None => return None,
Some(accept) => accept,
};
for part in accept.to_str().unwrap_or("").split(',').map(|s| s.trim()) { for part in accept.to_str().unwrap_or("").split(',').map(|s| s.trim()) {
if let Some(found) = part if let Some(found) = part
.split(';') .split(';')

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

@ -77,7 +77,7 @@ impl ODoHPublicKey {
impl ODoHQueryContext { impl ODoHQueryContext {
pub fn encrypt_response(self, response_body: Vec<u8>) -> Result<Vec<u8>, DoHError> { pub fn encrypt_response(self, response_body: Vec<u8>) -> Result<Vec<u8>, DoHError> {
let response_nonce = rand::thread_rng().gen::<ResponseNonce>(); let response_nonce = rand::thread_rng().r#gen::<ResponseNonce>();
let response_body_ = ObliviousDoHMessagePlaintext::new(response_body, 0); let response_body_ = ObliviousDoHMessagePlaintext::new(response_body, 0);
let encrypted_response = odoh_rs::encrypt_response( let encrypted_response = odoh_rs::encrypt_response(
&self.query, &self.query,

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

@ -87,12 +87,9 @@ where
let server_config_builder = ServerConfig::builder() let server_config_builder = ServerConfig::builder()
.with_safe_defaults() .with_safe_defaults()
.with_no_client_auth(); .with_no_client_auth();
if let Ok(found_config) = match server_config_builder.with_single_cert(certs.clone(), certs_key) {
server_config_builder.with_single_cert(certs.clone(), certs_key) Ok(found_config) => Some(found_config),
{ _ => None,
Some(found_config)
} else {
None
} }
}) })
.ok_or_else(|| { .ok_or_else(|| {