enhancement(http): HTTP parser decodes base64 encoded content in mult…

…ipart
buggregator · Jun 7, 2024 · db60976 · db60976
1 parent 382fea1
commit db60976
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/Traffic/Parser/Http.php b/src/Traffic/Parser/Http.php
@@ -108,9 +108,15 @@ public static function parseMultipartBody(StreamInterface $stream, string $bound
                 $findBoundary = "\r\n--{$boundary}";
 
                 if ($part instanceof File) {
-                    $fileStream = StreamHelper::createFileStream();
-                    $fileSize = StreamHelper::writeStreamUntil($stream, $fileStream, $findBoundary);
-                    $part->setStream($fileStream, $fileSize);
+                    $writeFilters = [];
+                    if ($part->hasHeader('Content-Transfer-Encoding')) {
+                        $encoding = $part->getHeaderLine('Content-Transfer-Encoding');
+                        $encoding === 'base64' and $writeFilters[] = \Buggregator\Trap\Support\Stream\Base64DecodeFilter::FILTER_NAME;
+                    }
+
+                    $fileStream = StreamHelper::createFileStream(writeFilters: $writeFilters);
+                    StreamHelper::writeStreamUntil($stream, $fileStream, $findBoundary);
+                    $part->setStream($fileStream);
                 } elseif ($part instanceof Field) {
                     $endOfContent = StreamHelper::strpos($stream, $findBoundary);
                     $endOfContent !== false or throw new \RuntimeException('Missing end of content');