fix: prevent using non ascii character in filename

crates/server/Cargo.toml

@@ -48,6 +48,8 @@ aws-smithy-async = { version = "0.43.0", features = ["rt-tokio"] }
 image = { version = "0.24.2" }
 openssl = { version = "0.10.40", features = ["vendored"] }
 openssl-probe = "0.1.5"
+deunicode = { version = "1.3.1" }
+lazy_static = { version = "1.4.0" }
 
 [dev-dependencies]
 portpicker = "0.1.1"

crates/server/src/main.rs

@@ -23,7 +23,9 @@ async fn main() -> io::Result<()> {
     .await
     .build()?;
 
-  server.run_until_stopped().await?;
+  server.run_until_stopped().await.ok();
+
+  opentelemetry::global::shutdown_tracer_provider();
 
   Ok(())
 }

crates/server/src/server.rs

@@ -74,6 +74,7 @@ impl Server {
 
 impl ActiveServer {
   pub async fn run_until_stopped(self) -> std::io::Result<()> {
-    self.server.await
+    let res = self.server.await;
+    res
   }
 }

crates/server/src/services/image/routes.rs

@@ -10,6 +10,7 @@ use actix_web::{delete, get, post, web, Error as ActixError, HttpResponse};
 use aws_sdk_s3::model::ObjectCannedAcl::PublicRead;
 use aws_sdk_s3::types::ByteStream;
 use aws_smithy_http::body::SdkBody;
+use deunicode::deunicode;
 use entity::image::{Column, Entity, LazyImageLink, Model};
 use futures::future::ready;
 use futures::{StreamExt, TryFutureExt};
@@ -90,13 +91,26 @@ async fn compress_and_upload(
     image_output
   };
 
+  let file_stem = p_filename
+    .file_stem()
+    .and_then(OsStr::to_str)
+    .map(|v| {
+      // Cleanup filename
+      deunicode(v)
+        .chars()
+        .filter(|c| c.is_ascii())
+        .map(|c| match c {
+          ' ' => '_',
+          _ => c,
+        })
+        .collect::<String>()
+    })
+    .unwrap_or("unknown".to_string());
+
   let key = format!(
     "{}__{}{}.{}",
     id,
-    p_filename
-      .file_stem()
-      .and_then(OsStr::to_str)
-      .unwrap_or("unknown"),
+    file_stem,
     if lazy { "__lazy" } else { "" },
     "jpeg"
   );