From 23e6657208ceaa32fdfc94b3b7e8bfb9fee371bd Mon Sep 17 00:00:00 2001
From: "Aode (Lion)" <asonix@asonix.dog>
Date: Sun, 26 Sep 2021 11:02:19 -0500
Subject: [PATCH] Re-enable skipping validation on import, strip when
 converting to prescribed format

---
 src/magick.rs         |  1 +
 src/upload_manager.rs |  2 ++
 src/validate.rs       | 44 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+)

diff --git a/src/magick.rs b/src/magick.rs
index ebf0d48..65ab524 100644
--- a/src/magick.rs
+++ b/src/magick.rs
@@ -54,6 +54,7 @@ pub(crate) fn convert_bytes_read(
         &[
             "convert",
             "-",
+            "-strip",
             format!("{}:-", format.to_magick_format()).as_str(),
         ],
     )?;
diff --git a/src/upload_manager.rs b/src/upload_manager.rs
index 6cab900..0f827ca 100644
--- a/src/upload_manager.rs
+++ b/src/upload_manager.rs
@@ -703,6 +703,7 @@ impl UploadManagerSession {
         let (content_type, validated_reader) = crate::validate::validate_image_bytes(
             bytes_mut.freeze(),
             self.manager.inner.format.clone(),
+            validate,
         )
         .await?;
 
@@ -741,6 +742,7 @@ impl UploadManagerSession {
         let (content_type, validated_reader) = crate::validate::validate_image_bytes(
             bytes_mut.freeze(),
             self.manager.inner.format.clone(),
+            true,
         )
         .await?;
 
diff --git a/src/validate.rs b/src/validate.rs
index d8c6d24..ee13d83 100644
--- a/src/validate.rs
+++ b/src/validate.rs
@@ -11,13 +11,57 @@ pub(crate) fn video_mp4() -> mime::Mime {
     "video/mp4".parse().unwrap()
 }
 
+struct UnvalidatedBytes {
+    bytes: Bytes,
+    written: usize,
+}
+
+impl UnvalidatedBytes {
+    fn new(bytes: Bytes) -> Self {
+        UnvalidatedBytes { bytes, written: 0 }
+    }
+
+    fn boxed(self) -> Box<dyn AsyncRead + Unpin> {
+        Box::new(self)
+    }
+}
+
+impl AsyncRead for UnvalidatedBytes {
+    fn poll_read(
+        mut self: std::pin::Pin<&mut Self>,
+        _cx: &mut std::task::Context<'_>,
+        buf: &mut tokio::io::ReadBuf<'_>,
+    ) -> std::task::Poll<std::io::Result<()>> {
+        let bytes_to_write = (self.bytes.len() - self.written).min(buf.remaining());
+        if bytes_to_write > 0 {
+            let end = self.written + bytes_to_write;
+            buf.put_slice(&self.bytes[self.written..end]);
+            self.written = end;
+        }
+        std::task::Poll::Ready(Ok(()))
+    }
+}
+
 #[instrument(name = "Validate image", skip(bytes))]
 pub(crate) async fn validate_image_bytes(
     bytes: Bytes,
     prescribed_format: Option<Format>,
+    validate: bool,
 ) -> Result<(mime::Mime, Box<dyn AsyncRead + Unpin>), Error> {
     let input_type = crate::magick::input_type_bytes(bytes.clone()).await?;
 
+    if !validate {
+        let mime_type = match input_type {
+            ValidInputType::Gif => video_mp4(),
+            ValidInputType::Mp4 => mime::IMAGE_GIF,
+            ValidInputType::Jpeg => mime::IMAGE_JPEG,
+            ValidInputType::Png => mime::IMAGE_PNG,
+            ValidInputType::Webp => image_webp(),
+        };
+
+        return Ok((mime_type, UnvalidatedBytes::new(bytes).boxed()));
+    }
+
     match (prescribed_format, input_type) {
         (_, ValidInputType::Gif) => Ok((
             video_mp4(),