From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 25 Sep 2024 09:39:48 +0000 (+0200)
Subject: Only serve a small set of supported image format statically
X-Git-Tag: 6.1.0_Beta_2~27
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2f33949fd27cb8052e4118054494bfa9a442d890;p=GitHub%2FWoltLab%2FWCF.git

Only serve a small set of supported image format statically
---

diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.1.0_beta_2_migrateStaticFiles.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.1.0_beta_2_migrateStaticFiles.php
new file mode 100644
index 0000000000..aada69bc90
--- /dev/null
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.1.0_beta_2_migrateStaticFiles.php
@@ -0,0 +1,80 @@
+<?php
+
+/**
+ * Migrates some previously static files to the private storage.
+ *
+ * @author Alexander Ebert
+ * @copyright 2001-2024 WoltLab GmbH
+ * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.1
+ */
+
+use wcf\data\file\FileEditor;
+use wcf\data\file\FileList;
+use wcf\system\WCF;
+use wcf\util\FileUtil;
+
+$moveTypes = [
+    'avif' => 'image/avif',
+    'mp3' => 'audio/mpeg',
+    'mp4' => 'video/mp4',
+    'pdf' => 'application/pdf',
+    'tiff' => 'image/tiff',
+    'txt' => 'text/plain',
+    'webm' => 'video/webm',
+];
+
+$fileList = new FileList();
+$fileList->getConditionBuilder()->add("file.mimeType IN (?)", [\array_values($moveTypes)]);
+$fileList->getConditionBuilder()->add("file.fileExtension <> ?", ["bin"]);
+$fileList->readObjects();
+
+$sql = "UPDATE  wcf1_file
+        SET     fileExtension = ?
+        WHERE   fileID = ?";
+$statement = WCF::getDB()->prepare($sql);
+
+$defunctFileIDs = [];
+foreach ($fileList->getObjects() as $file) {
+    $folderA = \substr($file->fileHash, 0, 2);
+    $folderB = \substr($file->fileHash, 2, 2);
+
+    $path = \WCF_DIR . \sprintf(
+        '_data/private/files/%s/%s/',
+        $folderA,
+        $folderB,
+    );
+
+    if (!\is_dir($path)) {
+        \mkdir($path, recursive: true);
+        FileUtil::makeWritable($path);
+    }
+
+    $filename = \sprintf(
+        '%d-%s.bin',
+        $file->fileID,
+        $file->fileHash,
+    );
+
+    $newPathname = $path . $filename;
+
+    $sourceFile = $file->getPathname();
+    if (\file_exists($sourceFile)) {
+        \rename(
+            $sourceFile,
+            $newPathname,
+        );
+    } else if (!\file_exists($newPathname)) {
+        $defunctFileIDs[] = $file->fileID;
+        continue;
+    }
+
+    $statement->execute([
+        'bin',
+        $file->fileID,
+    ]);
+}
+
+if ($defunctFileIDs !== []) {
+    FileEditor::deleteAll($defunctFileIDs);
+}
diff --git a/wcfsetup/install/files/lib/data/file/File.class.php b/wcfsetup/install/files/lib/data/file/File.class.php
index f5b873f271..44e5e38281 100644
--- a/wcfsetup/install/files/lib/data/file/File.class.php
+++ b/wcfsetup/install/files/lib/data/file/File.class.php
@@ -39,17 +39,10 @@ class File extends DatabaseObject implements ILinkableObject
      * @var array<string, string>
      */
     public const SAFE_FILE_EXTENSIONS = [
-        'avif' => 'image/avif',
         'gif' => 'image/gif',
         'jpg' => 'image/jpeg',
         'jpeg' => 'image/jpeg',
-        'mp3' => 'audio/mpeg',
-        'mp4' => 'video/mp4',
-        'pdf' => 'application/pdf',
         'png' => 'image/png',
-        'tiff' => 'image/tiff',
-        'txt' => 'text/plain',
-        'webm' => 'video/webm',
         'webp' => 'image/webp',
     ];