From a0fb548970152051e776a2be7aa30d47fe40e0cb Mon Sep 17 00:00:00 2001
From: dvesh3 <divesh.pahuja@pimcore.com>
Date: Thu, 9 Dec 2021 13:42:42 +0100
Subject: [PATCH 1/2] Fix CSRF protection for cart - resolves #260

---
 src/Controller/CartController.php          | 6 +++++-
 templates/product/detail.html.twig         | 7 +++++--
 templates/product/product_teaser.html.twig | 7 ++++++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/Controller/CartController.php b/src/Controller/CartController.php
index 1c54ba6e..85da2d4b 100644
--- a/src/Controller/CartController.php
+++ b/src/Controller/CartController.php
@@ -54,7 +54,7 @@ protected function getCart()
     }
 
     /**
-     * @Route("/cart/add-to-cart", name="shop-add-to-cart")
+     * @Route("/cart/add-to-cart", name="shop-add-to-cart", methods={"POST"})
      *
      * @param Request $request
      * @param Factory $ecommerceFactory
@@ -65,6 +65,10 @@ protected function getCart()
      */
     public function addToCartAction(Request $request, Factory $ecommerceFactory)
     {
+        if (!$this->isCsrfTokenValid('addToCart', $request->get('_csrf_token'))) {
+            throw new \Exception('Invalid request');
+        }
+
         $id = $request->get('id');
         $product = AbstractProduct::getById($id);
 
diff --git a/templates/product/detail.html.twig b/templates/product/detail.html.twig
index 70660bd8..59db9b97 100644
--- a/templates/product/detail.html.twig
+++ b/templates/product/detail.html.twig
@@ -156,8 +156,11 @@
                                 <p class="small text-muted mt-1">{{ 'general.available-in' | trans }} {{ ('attribute.' ~ product.saleInformation.saleInformation.availabilityType) | lower | trans }}</p>
                             {% endif %}
                         </div>
-
-                        <a href="{{ path('shop-add-to-cart', { id: product.id }) }}" class="btn btn-success btn-block">{{ 'general.add-to-cart' | trans }}</a>
+                        <form id="shop_add_to_cart_form" method="post" action="{{ path('shop-add-to-cart', { id: product.id }) }}">
+                            <input type="hidden" name="csrfToken" value="{{ pimcore_csrf.getCsrfToken() }}">
+                            <a href="#" onclick="document.getElementById('shop_add_to_cart_form').submit();"
+                               class="btn btn-success btn-block">{{ 'general.add-to-cart' | trans }}</a>
+                        </form>
 
                     </div>
 
diff --git a/templates/product/product_teaser.html.twig b/templates/product/product_teaser.html.twig
index 662a9514..550a6ca3 100644
--- a/templates/product/product_teaser.html.twig
+++ b/templates/product/product_teaser.html.twig
@@ -33,7 +33,12 @@
                         </a>
                     </div>
                     <div class="col p-1">
-                        <a href="{{ path('shop-add-to-cart', { id: product.id }) }}" class="btn btn-block btn-primary">{{ 'general.buy' | trans }} <i class=" ml-2"><img src="/static/images/icons/cart.svg" height="20" width="auto"></i></a>
+                        <form id="shop_add_to_cart_form" method="post" action="{{ path('shop-add-to-cart', { id: product.id }) }}">
+                            <input type="hidden" name="_csrf_token" value="{{ csrf_token('addToCart') }}">
+                            <a href="#" onclick="document.getElementById('shop_add_to_cart_form').submit();"
+                               class="btn btn-block btn-primary">{{ 'general.buy' | trans }} <i class=" ml-2"><img
+                                        src="/static/images/icons/cart.svg" height="20" width="auto"></i></a>
+                        </form>
                     </div>
                 </div>
             </div>

From 1db78cc5760d7d4340fb45f6da588652154ce2ba Mon Sep 17 00:00:00 2001
From: dvesh3 <divesh.pahuja@pimcore.com>
Date: Thu, 9 Dec 2021 13:44:46 +0100
Subject: [PATCH 2/2] Fix CSRF protection for cart - resolves #260

---
 templates/product/detail.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/product/detail.html.twig b/templates/product/detail.html.twig
index 59db9b97..ad3ff7ef 100644
--- a/templates/product/detail.html.twig
+++ b/templates/product/detail.html.twig
@@ -157,7 +157,7 @@
                             {% endif %}
                         </div>
                         <form id="shop_add_to_cart_form" method="post" action="{{ path('shop-add-to-cart', { id: product.id }) }}">
-                            <input type="hidden" name="csrfToken" value="{{ pimcore_csrf.getCsrfToken() }}">
+                            <input type="hidden" name="_csrf_token" value="{{ csrf_token('addToCart') }}">
                             <a href="#" onclick="document.getElementById('shop_add_to_cart_form').submit();"
                                class="btn btn-success btn-block">{{ 'general.add-to-cart' | trans }}</a>
                         </form>