Merge pull request #7390 from christianbeeznest/GH-7345-2

Dropbox: Fix dropbox download for non-ASCII filenames - refs #7345

Author: christianbeeznest

src/CoreBundle/Controller/DropboxController.php

@@ -473,9 +473,15 @@ public function download(int $id, Request $r, ResourceFileHelper $resourceFileHe
             fclose($stream);
         });
 
+        $downloadName = str_replace(["\r", "\n", "\0"], '', $downloadName);
+        $downloadName = trim($downloadName);
+
+        $fallbackName = $this->buildAsciiFilenameFallback($downloadName);
+
         $disposition = $response->headers->makeDisposition(
             ResponseHeaderBag::DISPOSITION_ATTACHMENT,
-            $downloadName
+            $downloadName,
+            $fallbackName
         );
 
         $response->headers->set('Content-Type', $mime);
@@ -743,4 +749,37 @@ private function userFullName(int $userId): string
 
         return $this->userNameCache[$userId] = $name;
     }
+
+    private function buildAsciiFilenameFallback(string $filename): string
+    {
+        // Prevent header injection / invalid control chars
+        $filename = str_replace(["\r", "\n", "\0"], '', $filename);
+        $filename = trim($filename);
+
+        $ext = (string) pathinfo($filename, PATHINFO_EXTENSION);
+        $base = (string) pathinfo($filename, PATHINFO_FILENAME);
+
+        // Slugify base name (should become ASCII with the default Symfony slugger)
+        $baseAscii = (string) $this->slugger->slug($base, '_');
+        $baseAscii = strtolower($baseAscii);
+
+        // Force strict ASCII-only fallback
+        $baseAscii = preg_replace('/[^A-Za-z0-9._-]+/', '_', $baseAscii) ?? '';
+        $baseAscii = preg_replace('/_+/', '_', $baseAscii) ?? '';
+        $baseAscii = trim($baseAscii, "._-");
+
+        if ('' === $baseAscii) {
+            $baseAscii = 'download';
+        }
+
+        if ('' !== $ext) {
+            $ext = strtolower($ext);
+            $ext = preg_replace('/[^A-Za-z0-9]+/', '', $ext) ?? '';
+            if ('' !== $ext) {
+                return $baseAscii.'.'.$ext;
+            }
+        }
+
+        return $baseAscii;
+    }
 }