Merge branch '7.4' into 8.0

* 7.4:
  Minor tweak
  [HttpFoundation] Add `Request::setAllowedHttpMethodOverride()` and `allowed_http_method_override` config option

Author: javiereguiluz

forms.rst

@@ -761,6 +761,10 @@ to the ``form()`` or the ``form_start()`` helper functions:
     ``DELETE`` request. The :ref:`http_method_override <configuration-framework-http_method_override>`
     option must be enabled for this to work.
 
+    For security, you can restrict which HTTP methods can be overridden using the
+    :ref:`allowed_http_method_override <configuration-framework-allowed_http_method_override>`
+    option.
+
 Changing the Form Name
 ~~~~~~~~~~~~~~~~~~~~~~
 

reference/configuration/framework.rst

@@ -1775,6 +1775,85 @@ named ``kernel.http_method_override``.
         $request = Request::createFromGlobals();
         // ...
 
+.. _configuration-framework-allowed_http_method_override:
+
+allowed_http_method_override
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. versionadded:: 7.4
+
+    The ``allowed_http_method_override`` option was introduced in Symfony 7.4.
+
+**type**: ``array`` **default**: ``null``
+
+This option controls which HTTP methods can be overridden via the ``_method``
+request parameter or the ``X-HTTP-METHOD-OVERRIDE`` header when
+:ref:`http_method_override <configuration-framework-http_method_override>` is enabled.
+
+When set to ``null`` (the default), all HTTP methods can be overridden. When set
+to an empty array (``[]``), HTTP method overriding is completely disabled. When
+set to a specific list of methods, only those methods will be allowed as overrides:
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # config/packages/framework.yaml
+        framework:
+            http_method_override: true
+            # Only allow PUT, PATCH, and DELETE to be overridden
+            allowed_http_method_override: ['PUT', 'PATCH', 'DELETE']
+
+    .. code-block:: xml
+
+        <!-- config/packages/framework.xml -->
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:framework="http://symfony.com/schema/dic/symfony"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                https://symfony.com/schema/dic/services/services-1.0.xsd
+                http://symfony.com/schema/dic/symfony
+                https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+            <framework:config http-method-override="true">
+                <framework:allowed-http-method-override>PUT</framework:allowed-http-method-override>
+                <framework:allowed-http-method-override>PATCH</framework:allowed-http-method-override>
+                <framework:allowed-http-method-override>DELETE</framework:allowed-http-method-override>
+            </framework:config>
+        </container>
+
+    .. code-block:: php
+
+        // config/packages/framework.php
+        use Symfony\Config\FrameworkConfig;
+
+        return static function (FrameworkConfig $framework): void {
+            $framework
+                ->httpMethodOverride(true)
+                ->allowedHttpMethodOverride(['PUT', 'PATCH', 'DELETE'])
+            ;
+        };
+
+This security feature is useful for hardening your application by explicitly
+defining which methods can be tunneled through POST requests. For example, if
+your application only needs to override POST requests to PUT and DELETE, you
+can restrict the allowed methods accordingly.
+
+You can also configure this programmatically using the
+:method:`Request::setAllowedHttpMethodOverride <Symfony\\Component\\HttpFoundation\\Request::setAllowedHttpMethodOverride>`
+method::
+
+    // public/index.php
+
+    // ...
+    $kernel = new CacheKernel($kernel);
+
+    Request::enableHttpMethodParameterOverride();
+    Request::setAllowedHttpMethodOverride(['PUT', 'PATCH', 'DELETE']);
+    $request = Request::createFromGlobals();
+    // ...
+
 .. _reference-framework-ide:
 
 ide

routing.rst

@@ -206,6 +206,10 @@ Use the ``methods`` option to restrict the verbs each route should respond to:
     automatically for you when the :ref:`framework.http_method_override <configuration-framework-http_method_override>`
     option is ``true``.
 
+    For security, you can restrict which HTTP methods can be overridden using the
+    :ref:`framework.allowed_http_method_override <configuration-framework-allowed_http_method_override>`
+    option.
+
 Matching Environments
 ~~~~~~~~~~~~~~~~~~~~~