config/server: Change max_upload_size to u32

A higher value isn't possible anyway due to the way the publish endpoint was designed...

Author: Turbo87

src/config/server.rs

@@ -41,7 +41,7 @@ pub struct Server {
     pub session_key: cookie::Key,
     pub gh_client_id: ClientId,
     pub gh_client_secret: ClientSecret,
-    pub max_upload_size: u64,
+    pub max_upload_size: u32,
     pub max_unpack_size: u64,
     pub max_dependencies: usize,
     pub max_features: usize,

src/controllers/krate/publish.rs

@@ -152,7 +152,7 @@ pub async fn publish(app: AppState, req: Parts, body: Body) -> AppResult<Json<Go
         app.config.max_unpack_size,
     );
 
-    let tarball_bytes = read_tarball_bytes(&mut reader, maximums.max_upload_size as u32).await?;
+    let tarball_bytes = read_tarball_bytes(&mut reader, maximums.max_upload_size).await?;
     let content_length = tarball_bytes.len() as u64;
 
     let pkg_name = format!("{}-{}", &*metadata.name, &version_string);

src/tests/krate/publish/max_size.rs

@@ -12,7 +12,7 @@ async fn tarball_between_default_axum_limit_and_max_upload_size() {
     let (app, _, _, token) = TestApp::full()
         .with_config(|config| {
             config.max_upload_size = max_upload_size;
-            config.max_unpack_size = max_upload_size;
+            config.max_unpack_size = max_upload_size as u64;
         })
         .with_token()
         .await;
@@ -65,7 +65,7 @@ async fn tarball_bigger_than_max_upload_size() {
     let (app, _, _, token) = TestApp::full()
         .with_config(|config| {
             config.max_upload_size = max_upload_size;
-            config.max_unpack_size = max_upload_size;
+            config.max_unpack_size = max_upload_size as u64;
         })
         .with_token()
         .await;

src/util.rs

@@ -15,18 +15,19 @@ pub mod tracing;
 
 #[derive(Debug, Copy, Clone)]
 pub struct Maximums {
-    pub max_upload_size: u64,
+    pub max_upload_size: u32,
     pub max_unpack_size: u64,
 }
 
 impl Maximums {
     pub fn new(
         krate_max_upload: Option<i32>,
-        app_max_upload: u64,
+        app_max_upload: u32,
         app_max_unpack: u64,
     ) -> Maximums {
-        let max_upload_size = krate_max_upload.map(|m| m as u64).unwrap_or(app_max_upload);
-        let max_unpack_size = cmp::max(app_max_unpack, max_upload_size);
+        let krate_max_upload = krate_max_upload.and_then(|m| u32::try_from(m).ok());
+        let max_upload_size = krate_max_upload.unwrap_or(app_max_upload);
+        let max_unpack_size = cmp::max(app_max_unpack, max_upload_size as u64);
         Maximums {
             max_upload_size,
             max_unpack_size,