Merge pull request #229 from dandi/gh-62

Timeout outgoing non-S3 requests after 10 seconds

CHANGELOG.md

@@ -5,6 +5,7 @@ In Development
 - Rate limit incoming requests
 - Handling of incoming requests now times out after 25 seconds
 - Increased MSRV to 1.81
+- Outgoing requests to servers other than S3 now time out after 10 seconds
 
 v0.5.0 (2024-11-18)
 -------------------

src/dav/mod.rs

@@ -436,6 +436,10 @@ pub(crate) enum ErrorClass {
     /// error or invalid response
     BadGateway,
 
+    /// The error was ultimately caused by a request to an upstream server
+    /// timing out
+    GatewayTimeout,
+
     /// The error was ultimately caused by something going wrong in `dandidav`
     Internal,
 }
@@ -446,6 +450,7 @@ impl ErrorClass {
         match self {
             ErrorClass::NotFound => StatusCode::NOT_FOUND,
             ErrorClass::BadGateway => StatusCode::BAD_GATEWAY,
+            ErrorClass::GatewayTimeout => StatusCode::GATEWAY_TIMEOUT,
             ErrorClass::Internal => StatusCode::INTERNAL_SERVER_ERROR,
         }
     }

src/httputil.rs

@@ -32,6 +32,7 @@ impl Client {
         let client = reqwest_middleware::ClientBuilder::new(
             reqwest::ClientBuilder::new()
                 .user_agent(USER_AGENT)
+                .timeout(std::time::Duration::from_secs(10))
                 .build()?,
         )
         .with(SimpleReqwestLogger)
@@ -184,6 +185,10 @@ impl HttpError {
     pub(crate) fn class(&self) -> ErrorClass {
         match self {
             HttpError::NotFound { .. } => ErrorClass::NotFound,
+            HttpError::Send { source, .. } if source.is_timeout() => ErrorClass::GatewayTimeout,
+            HttpError::Deserialize { source, .. } if source.is_timeout() => {
+                ErrorClass::GatewayTimeout
+            }
             _ => ErrorClass::BadGateway,
         }
     }