From 1237f0a6d6fd56e0739da93ddc49ab9e50ce9941 Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Wed, 4 May 2022 14:45:59 +0300
Subject: [PATCH] Added support for `multipart/form-data` content type in PUT
 and PATCH requests

---
 CHANGELOG.md                                  |   7 +
 system/src/Grav/Common/Grav.php               |   5 +
 .../RequestHandler/Middlewares/Exceptions.php |   4 +-
 .../Middlewares/MultipartRequestSupport.php   | 122 ++++++++++++++++++
 .../Traits/RequestHandlerTrait.php            |   4 +-
 5 files changed, 137 insertions(+), 5 deletions(-)
 create mode 100644 system/src/Grav/Framework/RequestHandler/Middlewares/MultipartRequestSupport.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04b07a81e..4fdcb1501 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v1.NEXT
+## mm/dd/2022
+
+1. [](#new)
+   * Added support for `multipart/form-data` content type in PUT and PATCH requests
+   * Added support for flex object relationships
+
 # v1.7.33
 ## 04/25/2022
 
diff --git a/system/src/Grav/Common/Grav.php b/system/src/Grav/Common/Grav.php
index 7e3dcaff8..d2fce7351 100644
--- a/system/src/Grav/Common/Grav.php
+++ b/system/src/Grav/Common/Grav.php
@@ -48,6 +48,7 @@ use Grav\Common\Service\TaskServiceProvider;
 use Grav\Common\Twig\Twig;
 use Grav\Framework\DI\Container;
 use Grav\Framework\Psr7\Response;
+use Grav\Framework\RequestHandler\Middlewares\MultipartRequestSupport;
 use Grav\Framework\RequestHandler\RequestHandler;
 use Grav\Framework\Route\Route;
 use Grav\Framework\Session\Messages;
@@ -117,6 +118,7 @@ class Grav extends Container
      * @var array All middleware processors that are processed in $this->process()
      */
     protected $middleware = [
+        'multipartRequestSupport',
         'initializeProcessor',
         'pluginsProcessor',
         'themesProcessor',
@@ -259,6 +261,9 @@ class Grav extends Container
 
         $container = new Container(
             [
+                'multipartRequestSupport' => function () {
+                    return new MultipartRequestSupport();
+                },
                 'initializeProcessor' => function () {
                     return new InitializeProcessor($this);
                 },
diff --git a/system/src/Grav/Framework/RequestHandler/Middlewares/Exceptions.php b/system/src/Grav/Framework/RequestHandler/Middlewares/Exceptions.php
index 36ef3a53f..6c961d216 100644
--- a/system/src/Grav/Framework/RequestHandler/Middlewares/Exceptions.php
+++ b/system/src/Grav/Framework/RequestHandler/Middlewares/Exceptions.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * @package    Grav\Framework\RequestHandler
@@ -7,8 +7,6 @@
  * @license    MIT License; see LICENSE file for details.
  */
 
-declare(strict_types=1);
-
 namespace Grav\Framework\RequestHandler\Middlewares;
 
 use Grav\Common\Data\ValidationException;
diff --git a/system/src/Grav/Framework/RequestHandler/Middlewares/MultipartRequestSupport.php b/system/src/Grav/Framework/RequestHandler/Middlewares/MultipartRequestSupport.php
new file mode 100644
index 000000000..8629352c5
--- /dev/null
+++ b/system/src/Grav/Framework/RequestHandler/Middlewares/MultipartRequestSupport.php
@@ -0,0 +1,122 @@
+<?php declare(strict_types=1);
+
+/**
+ * @package    Grav\Framework\RequestHandler
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\RequestHandler\Middlewares;
+
+use Grav\Framework\Psr7\UploadedFile;
+use Nyholm\Psr7\Stream;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\UploadedFileInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use function array_slice;
+use function count;
+use function in_array;
+use function is_array;
+use function strlen;
+
+/**
+ * Multipart request support for PUT and PATCH.
+ */
+class MultipartRequestSupport implements MiddlewareInterface
+{
+    /**
+     * @param ServerRequestInterface $request
+     * @param RequestHandlerInterface $handler
+     * @return ResponseInterface
+     */
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        $contentType = $request->getHeaderLine('content-type');
+        $method = $request->getMethod();
+        if (!str_starts_with($contentType, 'multipart/form-data') || !in_array($method, ['PUT', 'PATH'], true)) {
+            return $handler->handle($request);
+        }
+
+        $boundary = explode('; boundary=', $contentType, 2)[1] ?? '';
+        $parts = explode("--{$boundary}", $request->getBody()->getContents());
+        $parts = array_slice($parts, 1, count($parts) - 2);
+
+        $params = [];
+        $files = [];
+        foreach ($parts as $part) {
+            $this->processPart($params, $files, $part);
+        }
+
+        return $handler->handle($request->withParsedBody($params)->withUploadedFiles($files));
+    }
+
+    /**
+     * @param array $params
+     * @param array $files
+     * @param string $part
+     * @return void
+     */
+    protected function processPart(array &$params, array &$files, string $part): void
+    {
+        $part = ltrim($part, "\r\n");
+        [$rawHeaders, $body] = explode("\r\n\r\n", $part, 2);
+
+        // Parse headers.
+        $rawHeaders = explode("\r\n", $rawHeaders);
+        $headers = array_reduce(
+            $rawHeaders,
+            static function (array $headers, $header) {
+                [$name, $value] = explode(':', $header);
+                $headers[strtolower($name)] = ltrim($value, ' ');
+
+                return $headers;
+            },
+            []
+        );
+
+        if (!isset($headers['content-disposition'])) {
+            return;
+        }
+
+        // Parse content disposition header.
+        $contentDisposition = $headers['content-disposition'];
+        preg_match('/^(.+); *name="([^"]+)"(; *filename="([^"]+)")?/', $contentDisposition, $matches);
+        $name = $matches[2];
+        $filename = $matches[4] ?? null;
+
+        if ($filename !== null) {
+            $stream = Stream::create($body);
+            $this->addFile($files, $name, new UploadedFile($stream, strlen($body), UPLOAD_ERR_OK, $filename, $headers['content-type'] ?? null));
+        } elseif (strpos($contentDisposition, 'filename') !== false) {
+            // Not uploaded file.
+            $this->addFile($files, $name, new UploadedFile(null, 0, UPLOAD_ERR_NO_FILE));
+        } else {
+            // Regular field.
+            $params[$name] = substr($body, 0, -2);
+        }
+    }
+
+    /**
+     * @param array $files
+     * @param string $name
+     * @param UploadedFileInterface $file
+     * @return void
+     */
+    protected function addFile(array &$files, string $name, UploadedFileInterface $file): void
+    {
+        if (strpos($name, '[]') === strlen($name) - 2) {
+            $name = substr($name, 0, -2);
+
+            if (isset($files[$name]) && is_array($files[$name])) {
+                $files[$name][] = $file;
+            } else {
+                $files[$name] = [$file];
+            }
+        } else {
+            $files[$name] = $file;
+        }
+    }
+}
diff --git a/system/src/Grav/Framework/RequestHandler/Traits/RequestHandlerTrait.php b/system/src/Grav/Framework/RequestHandler/Traits/RequestHandlerTrait.php
index ff82889d4..6b4e5c768 100644
--- a/system/src/Grav/Framework/RequestHandler/Traits/RequestHandlerTrait.php
+++ b/system/src/Grav/Framework/RequestHandler/Traits/RequestHandlerTrait.php
@@ -28,10 +28,10 @@ trait RequestHandlerTrait
     protected $middleware;
 
     /** @var callable */
-    private $handler;
+    protected $handler;
 
     /** @var ContainerInterface|null */
-    private $container;
+    protected $container;
 
     /**
      * {@inheritdoc}