From 98ec2c5a903881d5a4a364ce32b121b0714627c0 Mon Sep 17 00:00:00 2001
From: "Aode (lion)" <asonix@asonix.dog>
Date: Sun, 29 Aug 2021 11:51:56 -0500
Subject: [PATCH] Magick on tmp files, allow tmp files in policy

---
 Cargo.lock                                    |  2 +-
 Cargo.toml                                    |  2 +-
 .../config-Q16HDRI/policy.xml                 | 20 -------------------
 .../config-Q16HDRI/policy.xml                 |  4 ++--
 src/main.rs                                   |  7 ++++++-
 5 files changed, 10 insertions(+), 25 deletions(-)
 delete mode 100644 docker/dev/root/usr/local/lib/ImageMagick-7.1.0/config-Q16HDRI/policy.xml

diff --git a/Cargo.lock b/Cargo.lock
index b44d326..ee99d91 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -995,7 +995,7 @@ dependencies = [
 
 [[package]]
 name = "pict-rs"
-version = "0.3.0-alpha.15"
+version = "0.3.0-alpha.16"
 dependencies = [
  "actix-form-data",
  "actix-fs",
diff --git a/Cargo.toml b/Cargo.toml
index f782aa7..60b93b4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "pict-rs"
 description = "A simple image hosting service"
-version = "0.3.0-alpha.15"
+version = "0.3.0-alpha.16"
 authors = ["asonix <asonix@asonix.dog>"]
 license = "AGPL-3.0"
 readme = "README.md"
diff --git a/docker/dev/root/usr/local/lib/ImageMagick-7.1.0/config-Q16HDRI/policy.xml b/docker/dev/root/usr/local/lib/ImageMagick-7.1.0/config-Q16HDRI/policy.xml
deleted file mode 100644
index 12719e7..0000000
--- a/docker/dev/root/usr/local/lib/ImageMagick-7.1.0/config-Q16HDRI/policy.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<policymap>
-    <policy domain="resource" name="memory" value="256MiB" />
-    <policy domain="resource" name="list-length" value="32" />
-    <policy domain="resource" name="width" value="10KP" />
-    <policy domain="resource" name="height" value="10KP" />
-    <policy domain="resource" name="map" value="512MiB" />
-    <policy domain="resource" name="area" value="16KP" />
-    <policy domain="resource" name="disk" value="1GiB" />
-    <policy domain="resource" name="file" value="768" />
-    <policy domain="resource" name="thread" value="2" />
-    <policy domain="coder" rights="none" pattern="*" />
-    <policy domain="coder" rights="read | write" pattern="{GIF,JPEG,PNG,WEBP}" />
-    <policy domain="filter" rights="none" pattern="*" />
-    <policy domain="path" rights="none" pattern="@*" />
-    <policy domain="delegate" rights="none" pattern="*" />
-    <policy domain="module" rights="none" pattern="*" />
-    <policy domain="module" rights="read | write" pattern="{GIF,JPEG,PNG,WEBP}" />
-        <!-- indirect reads not permitted -->
-    <policy domain="system" name="precision" value="6" />
-</policymap>
diff --git a/docker/prod/root/usr/lib/ImageMagick-7.0.11/config-Q16HDRI/policy.xml b/docker/prod/root/usr/lib/ImageMagick-7.0.11/config-Q16HDRI/policy.xml
index 12719e7..ced2aff 100644
--- a/docker/prod/root/usr/lib/ImageMagick-7.0.11/config-Q16HDRI/policy.xml
+++ b/docker/prod/root/usr/lib/ImageMagick-7.0.11/config-Q16HDRI/policy.xml
@@ -9,12 +9,12 @@
     <policy domain="resource" name="file" value="768" />
     <policy domain="resource" name="thread" value="2" />
     <policy domain="coder" rights="none" pattern="*" />
-    <policy domain="coder" rights="read | write" pattern="{GIF,JPEG,PNG,WEBP}" />
+    <policy domain="coder" rights="read | write" pattern="{GIF,JPEG,PNG,WEBP,MP4,TMP}" />
     <policy domain="filter" rights="none" pattern="*" />
     <policy domain="path" rights="none" pattern="@*" />
     <policy domain="delegate" rights="none" pattern="*" />
     <policy domain="module" rights="none" pattern="*" />
-    <policy domain="module" rights="read | write" pattern="{GIF,JPEG,PNG,WEBP}" />
+    <policy domain="module" rights="read | write" pattern="{GIF,JPEG,PNG,WEBP,MP4,TMP}" />
         <!-- indirect reads not permitted -->
     <policy domain="system" name="precision" value="6" />
 </policymap>
diff --git a/src/main.rs b/src/main.rs
index ff026e8..9721a6d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -400,7 +400,12 @@ async fn process(
         safe_create_parent(&thumbnail_path).await?;
 
         // apply chain to the provided image
-        magick::process_image(&original_path, &thumbnail_path, thumbnail_args, format).await?;
+        let dest_file = tmp_file();
+        let orig_file = tmp_file();
+        actix_fs::copy(original_path, orig_file.clone()).await?;
+        magick::process_image(&orig_file, &dest_file, thumbnail_args, format).await?;
+        actix_fs::remove_file(orig_file).await?;
+        actix_fs::rename(dest_file, thumbnail_path.clone()).await?;
 
         let details = if let Some(details) = details {
             details