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

Update base64, accept padding on decoding

Browse source
This commit is contained in:
Frank Denis 2023-02-19 21:02:28 +01:00
parent 1c5c83803a
commit c54b3303fc
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,7 @@ use std::pin::Pin;
use std::sync::Arc; use std::sync::Arc;
use std::time::Duration; use std::time::Duration;
use base64::engine::Engine;
use byteorder::{BigEndian, ByteOrder}; use byteorder::{BigEndian, ByteOrder};
use futures::prelude::*; use futures::prelude::*;
use futures::task::{Context, Poll}; use futures::task::{Context, Poll};
@ -29,10 +30,12 @@ pub mod reexports {
pub use tokio; pub use tokio;
} }
const BASE64_URL_SAFE_NO_PAD: base64::engine::fast_portable::FastPortable = const BASE64_URL_SAFE_NO_PAD: base64::engine::GeneralPurpose =
base64::engine::fast_portable::FastPortable::from( base64::engine::general_purpose::GeneralPurpose::new(
&base64::alphabet::URL_SAFE, &base64::alphabet::URL_SAFE,
base64::engine::fast_portable::NO_PAD, base64::engine::general_purpose::GeneralPurposeConfig::new()
.with_encode_padding(false)
.with_decode_padding_mode(base64::engine::DecodePaddingMode::Indifferent),
); );
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
@ -167,9 +170,9 @@ impl DoH {
return None; return None;
} }
} }
let query = match question_str.and_then(|question_str| { let query = match question_str
base64::decode_engine(question_str, &BASE64_URL_SAFE_NO_PAD).ok() .and_then(|question_str| BASE64_URL_SAFE_NO_PAD.decode(question_str).ok())
}) { {
Some(query) => query, Some(query) => query,
_ => return None, _ => return None,
}; };