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

Enforce a timeout on recv()

Browse source
This commit is contained in:
Frank Denis 2019-12-24 13:09:05 +01:00
parent 595f809432
commit 9e5db2a218
2 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@ pub enum DoHError {
InvalidData, InvalidData,
TooLarge, TooLarge,
UpstreamIssue, UpstreamIssue,
UpstreamTimeout,
Hyper(hyper::Error), Hyper(hyper::Error),
Io(io::Error), Io(io::Error),
} }
@ -25,6 +26,7 @@ impl std::error::Error for DoHError {
DoHError::InvalidData => "Invalid data", DoHError::InvalidData => "Invalid data",
DoHError::TooLarge => "Too large", DoHError::TooLarge => "Too large",
DoHError::UpstreamIssue => "Upstream error", DoHError::UpstreamIssue => "Upstream error",
DoHError::UpstreamTimeout => "Upstream timeout",
DoHError::Hyper(_) => self.description(), DoHError::Hyper(_) => self.description(),
DoHError::Io(_) => self.description(), DoHError::Io(_) => self.description(),
} }
@ -38,6 +40,7 @@ impl From<DoHError> for StatusCode {
DoHError::InvalidData => StatusCode::BAD_REQUEST, DoHError::InvalidData => StatusCode::BAD_REQUEST,
DoHError::TooLarge => StatusCode::PAYLOAD_TOO_LARGE, DoHError::TooLarge => StatusCode::PAYLOAD_TOO_LARGE,
DoHError::UpstreamIssue => StatusCode::BAD_GATEWAY, DoHError::UpstreamIssue => StatusCode::BAD_GATEWAY,
DoHError::UpstreamTimeout => StatusCode::BAD_GATEWAY,
DoHError::Hyper(_) => StatusCode::SERVICE_UNAVAILABLE, DoHError::Hyper(_) => StatusCode::SERVICE_UNAVAILABLE,
DoHError::Io(_) => StatusCode::INTERNAL_SERVER_ERROR, DoHError::Io(_) => StatusCode::INTERNAL_SERVER_ERROR,
} }

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

@ -19,6 +19,7 @@ use hyper::server::conn::Http;
use hyper::{Body, Method, Request, Response, StatusCode}; use hyper::{Body, Method, Request, Response, StatusCode};
use std::pin::Pin; use std::pin::Pin;
use std::sync::Arc; use std::sync::Arc;
use std::time::Duration;
use tokio::io::{AsyncRead, AsyncWrite}; use tokio::io::{AsyncRead, AsyncWrite};
use tokio::net::{TcpListener, UdpSocket}; use tokio::net::{TcpListener, UdpSocket};
use tokio::runtime; use tokio::runtime;
@ -182,8 +183,20 @@ impl DoH {
.map_err(DoHError::Io) .map_err(DoHError::Io)
.await?; .await?;
let mut packet = vec![0; MAX_DNS_RESPONSE_LEN]; let mut packet = vec![0; MAX_DNS_RESPONSE_LEN];
let (len, response_server_address) = let socket_timeout = self
socket.recv_from(&mut packet).map_err(DoHError::Io).await?; .globals
.timeout
.checked_sub(Duration::from_secs(1))
.unwrap_or(self.globals.timeout);
let timeout_res = tokio::time::timeout(
socket_timeout,
socket.recv_from(&mut packet).map_err(DoHError::Io),
)
.await;
let (len, response_server_address) = match timeout_res {
Err(_) => return Err(DoHError::UpstreamTimeout),
Ok(recv_res) => recv_res?,
};
if len < MIN_DNS_PACKET_LEN || expected_server_address != response_server_address { if len < MIN_DNS_PACKET_LEN || expected_server_address != response_server_address {
return Err(DoHError::UpstreamIssue); return Err(DoHError::UpstreamIssue);
} }