Merge branch 'release/0.7.5'

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rustus"
-version = "0.7.4"
+version = "0.7.5"
 edition = "2021"
 description = "TUS protocol implementation written in Rust."
 keywords = ["tus", "server", "actix-web"]

docs/configuration.md

@@ -44,6 +44,7 @@ Also you can disable access log for `/health` endpoint, by using `--disable-heal
         --cors "my.*.domain.com,your.*.domain.com" \
         --disable-health-access-log \
         --allow-empty
+        --max-file-size 10000000
     ```
 
 === "ENV"
@@ -58,6 +59,7 @@ Also you can disable access log for `/health` endpoint, by using `--disable-heal
     export RUSTUS_CORS="my.*.domain.com,your.*.domain.com"
     export RUSTUS_DISABLE_HEALTH_ACCESS_LOG="true"
     export RUSTUS_ALLOW_EMPTY="true"
+    export RUSTUS_MAX_FILE_SIZE="10000000"
 
     rustus
     ```

src/config.rs

@@ -393,6 +393,12 @@ pub struct RustusConf {
     #[arg(long, env = "RUSTUS_REMOVE_PARTS")]
     pub remove_parts: bool,
 
+    /// Maximum size of file that can be uploaded.
+    ///
+    /// If not set, file size is unlimited.
+    #[arg(long, env = "RUSTUS_MAX_FILE_SIZE")]
+    pub max_file_size: Option<usize>,
+
     #[command(flatten)]
     pub storage_opts: StorageOptions,
 

src/main.rs

@@ -96,7 +96,7 @@ fn create_cors(origins: Vec<String>, additional_headers: Vec<String>) -> Cors {
             "X-Request-ID",
             "X-HTTP-Method-Override",
         ])
-        .allowed_headers(additional_headers.into_iter())
+        .allowed_headers(additional_headers)
         .expose_headers(vec![
             "Location",
             "Tus-Version",

src/notifiers/models/message_format.rs

@@ -83,7 +83,7 @@ impl From<&FileInfo> for TusdFileInfo {
 /// arrays.
 fn headers_to_value_map(headers: &HeaderMap, use_arrays: bool) -> HashMap<String, Value> {
     let mut headers_map = HashMap::new();
-    for (name, value) in headers.iter() {
+    for (name, value) in headers {
         if let Ok(header_val) = value.to_str().map(String::from) {
             if use_arrays {
                 headers_map.insert(

src/protocol/creation/routes.rs

@@ -112,6 +112,13 @@ pub async fn create_file(
         return Ok(HttpResponse::BadRequest().body("Upload-Length header is required"));
     }
 
+    if state.config.max_file_size.is_some() && state.config.max_file_size < length {
+        return Ok(HttpResponse::BadRequest().body(format!(
+            "Upload-Length should be less than or equal to {}",
+            state.config.max_file_size.unwrap()
+        )));
+    }
+
     let meta = get_metadata(&request);
 
     let file_id = uuid::Uuid::new_v4().to_string();
@@ -561,4 +568,17 @@ mod tests {
         let resp = call_service(&mut rustus, request).await;
         assert_eq!(resp.status(), StatusCode::BAD_REQUEST);
     }
+
+    #[actix_rt::test]
+    async fn max_file_size_exceeded() {
+        let mut state = State::test_new().await;
+        state.config.max_file_size = Some(1000);
+        let mut rustus = get_service(state.clone()).await;
+        let request = TestRequest::post()
+            .uri(state.config.test_url().as_str())
+            .insert_header(("Upload-Length", 1001))
+            .to_request();
+        let resp = call_service(&mut rustus, request).await;
+        assert_eq!(resp.status(), StatusCode::BAD_REQUEST);
+    }
 }