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

Port to rust-stable

Browse source
This commit is contained in:
Frank Denis 2018-02-12 01:25:36 +01:00
parent bb916d3135
commit 832f65ee75
1 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/main.rs
View file

@ -1,5 +1,3 @@
#![feature(proc_macro, conservative_impl_trait, generators, conservative_impl_trait,
universal_impl_trait, nll)]
#![cfg_attr(feature = "clippy", feature(plugin))] #![cfg_attr(feature = "clippy", feature(plugin))]
#![cfg_attr(feature = "clippy", plugin(clippy))] #![cfg_attr(feature = "clippy", plugin(clippy))]
@ -89,16 +87,16 @@ impl Service for DoH {
impl DoH { impl DoH {
fn handle_client(&self, req: Request) -> Box<Future<Item = Response, Error = hyper::Error>> { fn handle_client(&self, req: Request) -> Box<Future<Item = Response, Error = hyper::Error>> {
let mut response = Response::new(); let mut response = Response::new();
match (req.method(), req.path()) { if req.path() != self.path {
(&Method::Post, path) => { response.set_status(StatusCode::NotFound);
if path != self.path { return Box::new(future::ok(response));
response.set_status(StatusCode::NotFound); }
return Box::new(future::ok(response)); match *req.method() {
} Method::Post => {
let fut = self.read_body_and_proxy(req.body()); let fut = self.read_body_and_proxy(req.body());
return Box::new(fut.map_err(|_| hyper::Error::Incomplete)); return Box::new(fut.map_err(|_| hyper::Error::Incomplete));
} }
(&Method::Get, "/dns-query") => { Method::Get => {
let query = req.query().unwrap_or(""); let query = req.query().unwrap_or("");
let mut question_str = None; let mut question_str = None;
for parts in query.split('&') { for parts in query.split('&') {
@ -122,13 +120,13 @@ impl DoH {
return Box::new(fut.map_err(|_| hyper::Error::Incomplete)); return Box::new(fut.map_err(|_| hyper::Error::Incomplete));
} }
_ => { _ => {
response.set_status(StatusCode::NotAcceptable); response.set_status(StatusCode::MethodNotAllowed);
} }
}; };
Box::new(future::ok(response)) Box::new(future::ok(response))
} }
fn proxy(query: Vec<u8>) -> impl Future<Item = Response, Error = ()> { fn proxy(query: Vec<u8>) -> Box<Future<Item = Response, Error = ()>> {
let local_addr = LOCAL_BIND_ADDRESS.parse().unwrap(); let local_addr = LOCAL_BIND_ADDRESS.parse().unwrap();
let socket = UdpSocket::bind(&local_addr).unwrap(); let socket = UdpSocket::bind(&local_addr).unwrap();
let remote_addr: SocketAddr = SERVER_ADDRESS.parse().unwrap(); let remote_addr: SocketAddr = SERVER_ADDRESS.parse().unwrap();
@ -159,10 +157,10 @@ impl DoH {
.with_header(CacheControl(vec![CacheDirective::MaxAge(ttl)])); .with_header(CacheControl(vec![CacheDirective::MaxAge(ttl)]));
future::ok(response) future::ok(response)
}); });
fut Box::new(fut)
} }
fn read_body_and_proxy(&self, body: Body) -> impl Future<Item = Response, Error = ()> { fn read_body_and_proxy(&self, body: Body) -> Box<Future<Item = Response, Error = ()>> {
let mut sum_size = 0; let mut sum_size = 0;
let fut = body.and_then(move |chunk| { let fut = body.and_then(move |chunk| {
sum_size += chunk.len(); sum_size += chunk.len();
@ -180,7 +178,7 @@ impl DoH {
} }
Box::new(Self::proxy(query)) Box::new(Self::proxy(query))
}); });
fut Box::new(fut)
} }
} }