Add connection timeout

Author: marlonbaeten

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "bag_address_lookup"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2024"
 default-run = "bag-service"
 license = "MIT OR Apache-2.0"
@@ -23,5 +23,5 @@ create = ["zip", "quick-xml"]
 flate2 = { version = "1.1.8", optional = true }
 quick-xml = { version = "0.39.0", optional = true }
 serde_json = "1.0.149"
-tokio = { version = "1.49.0", features = ["rt-multi-thread", "macros", "net", "io-util", "signal"] }
+tokio = { version = "1.49.0", features = ["rt-multi-thread", "macros", "net", "io-util", "signal", "time"] }
 zip = { version = "8.5.0", optional = true }

Cargo.toml

@@ -4,7 +4,10 @@ use std::{
     time::Instant,
 };
 
-use crate::{Database, log_with_elapsed, parsing::ParsedData, parsing::municipalities};
+use crate::{
+    Database, log_with_elapsed,
+    parsing::{ParsedData, municipalities},
+};
 
 static DOWNLOAD_URL: &str =
     "https://service.pdok.nl/kadaster/adressen/atom/v1_0/downloads/lvbag-extract-nl.zip";

src/create.rs

@@ -1,11 +1,19 @@
 use serde_json::json;
-use std::{error::Error, future::Future, sync::Arc, time::Instant};
+use std::{
+    error::Error,
+    future::Future,
+    sync::Arc,
+    time::{Duration, Instant},
+};
 
 use tokio::{
     io::{AsyncReadExt, AsyncWriteExt},
     net::TcpListener,
 };
 
+/// Maximum time allowed for handling a single connection (read + process + write).
+const CONNECTION_TIMEOUT: Duration = Duration::from_secs(5);
+
 use crate::database::DatabaseHandle;
 
 mod localities_list;
@@ -68,14 +76,31 @@ where
                 let db = database.clone();
                 tokio::spawn(async move {
                     let mut stream = stream;
-                    if let Err(err) = handle_connection(&mut stream, db).await {
-                        let _ = write_response(
-                            &mut stream,
-                            500,
-                            &json_error(&err.to_string()),
-                            None,
-                        )
-                        .await;
+                    match tokio::time::timeout(
+                        CONNECTION_TIMEOUT,
+                        handle_connection(&mut stream, db),
+                    )
+                    .await
+                    {
+                        Ok(Err(err)) => {
+                            let _ = write_response(
+                                &mut stream,
+                                500,
+                                &json_error(&err.to_string()),
+                                None,
+                            )
+                            .await;
+                        }
+                        Err(_elapsed) => {
+                            let _ = write_response(
+                                &mut stream,
+                                408,
+                                &json_error("request timeout"),
+                                None,
+                            )
+                            .await;
+                        }
+                        Ok(Ok(())) => {}
                     }
                 });
             }
@@ -186,6 +211,7 @@ async fn write_response(
         400 => "Bad Request",
         404 => "Not Found",
         405 => "Method Not Allowed",
+        408 => "Request Timeout",
         _ => "Internal Server Error",
     };
 

src/service/mod.rs

@@ -1,7 +1,9 @@
 use std::{collections::HashMap, error::Error};
 
-use crate::parsing::{MunicipalityRelation, municipalities::Municipality};
-use crate::{Address, Locality, NumberRange, PublicSpace, encode_pc};
+use crate::{
+    Address, Locality, NumberRange, PublicSpace, encode_pc,
+    parsing::{MunicipalityRelation, municipalities::Municipality},
+};
 
 pub struct LocalityMap {
     pub locality_names: Vec<String>,