Fixes incorrect loader fields (#849)

* loader_fields fix

* tested, fixed

* added direct file check for invalid file_parts

* search fixes

* removed printlns

* Adds check for loaders

* removes println

src/routes/v2/project_creation.rs

@@ -146,7 +146,7 @@ pub async fn project_create(
     let payload = v2_reroute::alter_actix_multipart(
         payload,
         req.headers().clone(),
-        |legacy_create: ProjectCreateData| async move {
+        |legacy_create: ProjectCreateData, _| async move {
             // Side types will be applied to each version
             let client_side = legacy_create.client_side;
             let server_side = legacy_create.server_side;

src/routes/v2/version_creation.rs

@@ -9,8 +9,10 @@ use crate::models::projects::{
 use crate::models::v2::projects::LegacyVersion;
 use crate::queue::session::AuthQueue;
 use crate::routes::v3::project_creation::CreateError;
+use crate::routes::v3::version_creation;
 use crate::routes::{v2_reroute, v3};
 use actix_multipart::Multipart;
+use actix_web::http::header::ContentDisposition;
 use actix_web::web::Data;
 use actix_web::{post, web, HttpRequest, HttpResponse};
 use serde::{Deserialize, Serialize};
@@ -89,7 +91,7 @@ pub async fn version_create(
     let payload = v2_reroute::alter_actix_multipart(
         payload,
         req.headers().clone(),
-        |legacy_create: InitialVersionData| {
+        |legacy_create: InitialVersionData, content_dispositions: Vec<ContentDisposition>| {
             let client = client.clone();
             let redis = redis.clone();
             async move {
@@ -176,6 +178,19 @@ pub async fn version_create(
                     }
                 }
 
+                // Similarly, check actual content disposition for mrpacks, in case file_parts is wrong
+                for content_disposition in content_dispositions {
+                    // Uses version_create functions to get the file name and extension
+                    let (_, file_extension) = version_creation::get_name_ext(&content_disposition)?;
+                    crate::util::ext::project_file_type(file_extension)
+                        .ok_or_else(|| CreateError::InvalidFileType(file_extension.to_string()))?;
+
+                    if file_extension == "mrpack" {
+                        project_type = Some("modpack");
+                        break;
+                    }
+                }
+
                 // Modpacks now use the "mrpack" loader, and loaders are converted to loader fields.
                 // Setting of 'project_type' directly is removed, it's loader-based now.
                 if project_type == Some("modpack") {

src/routes/v2_reroute.rs

@@ -5,7 +5,7 @@ use super::ApiError;
 use crate::models::v2::projects::LegacySideType;
 use crate::util::actix::{generate_multipart, MultipartSegment, MultipartSegmentData};
 use actix_multipart::Multipart;
-use actix_web::http::header::{HeaderMap, TryIntoHeaderPair};
+use actix_web::http::header::{ContentDisposition, HeaderMap, TryIntoHeaderPair};
 use actix_web::HttpResponse;
 use futures::{stream, Future, StreamExt};
 use serde_json::{json, Value};
@@ -43,10 +43,15 @@ pub fn flatten_404_error(res: ApiError) -> Result<HttpResponse, ApiError> {
     }
 }
 
+// Allows internal modification of an actix multipart file
+// Expected:
+// 1. A json segment
+// 2. Any number of other binary segments
+// 'closure' is called with the json value, and the content disposition of the other segments
 pub async fn alter_actix_multipart<T, U, Fut>(
     mut multipart: Multipart,
     mut headers: HeaderMap,
-    mut closure: impl FnMut(T) -> Fut,
+    mut closure: impl FnMut(T, Vec<ContentDisposition>) -> Fut,
 ) -> Result<Multipart, CreateError>
 where
     T: serde::de::DeserializeOwned,
@@ -55,6 +60,10 @@ where
 {
     let mut segments: Vec<MultipartSegment> = Vec::new();
 
+    let mut json = None;
+    let mut json_segment = None;
+    let mut content_dispositions = Vec::new();
+
     if let Some(field) = multipart.next().await {
         let mut field = field?;
         let content_disposition = field.content_disposition().clone();
@@ -71,16 +80,15 @@ where
 
         {
             let json_value: T = serde_json::from_slice(&buffer)?;
-            let json_value: U = closure(json_value).await?;
-            buffer = serde_json::to_vec(&json_value)?;
+            json = Some(json_value);
         }
 
-        segments.push(MultipartSegment {
+        json_segment = Some(MultipartSegment {
             name: field_name.to_string(),
             filename: field_filename.map(|s| s.to_string()),
             content_type: field_content_type,
-            data: MultipartSegmentData::Binary(buffer),
-        })
+            data: MultipartSegmentData::Binary(vec![]), // Initialize to empty, will be finished after
+        });
     }
 
     while let Some(field) = multipart.next().await {
@@ -97,6 +105,7 @@ where
             buffer.extend_from_slice(&data);
         }
 
+        content_dispositions.push(content_disposition.clone());
         segments.push(MultipartSegment {
             name: field_name.to_string(),
             filename: field_filename.map(|s| s.to_string()),
@@ -105,6 +114,24 @@ where
         })
     }
 
+    // Finishes the json segment, with aggregated content dispositions
+    {
+        let json_value = json.ok_or(CreateError::InvalidInput(
+            "No json segment found in multipart.".to_string(),
+        ))?;
+        let mut json_segment = json_segment.ok_or(CreateError::InvalidInput(
+            "No json segment found in multipart.".to_string(),
+        ))?;
+
+        // Call closure, with the json value and names of the other segments
+        let json_value: U = closure(json_value, content_dispositions).await?;
+        let buffer = serde_json::to_vec(&json_value)?;
+        json_segment.data = MultipartSegmentData::Binary(buffer);
+
+        // Insert the json segment at the beginning
+        segments.insert(0, json_segment);
+    }
+
     let (boundary, payload) = generate_multipart(segments);
 
     match (