Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Fix missing CSRF protection across storefront controllers (#740)
Krzysztof Pajak9d19918c8623
diff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/_Layout.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/_Layout.cshtmlindex bbbc22238..e0d8e06e4 100644--- a/src/Plugins/Theme.Modern/Views/Modern/Shared/_Layout.cshtml+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/_Layout.cshtml@@ -19,6 +19,7 @@@await RenderSectionAsync("head", false)</head><body><resources asp-type="ScriptHeader"/>@await Component.InvokeAsync("Widget", new { widgetZone = "body_start_html_tag_after" })diff --git a/src/Web/Grand.Web.Common/Controllers/BasePublicController.cs b/src/Web/Grand.Web.Common/Controllers/BasePublicController.csindex 5b5afee97..6521f45ef 100644--- a/src/Web/Grand.Web.Common/Controllers/BasePublicController.cs+++ b/src/Web/Grand.Web.Common/Controllers/BasePublicController.cs@@ -8,6 +8,7 @@ namespace Grand.Web.Common.Controllers;[ClosedStore][Language][Affiliate]+[AutoValidateAntiforgeryToken][SharedKernel.Attributes.ApiController]public abstract class BasePublicController : BaseController{diff --git a/src/Web/Grand.Web/Controllers/AccountController.cs b/src/Web/Grand.Web/Controllers/AccountController.csindex 8169012a0..683cfe44e 100644--- a/src/Web/Grand.Web/Controllers/AccountController.cs+++ b/src/Web/Grand.Web/Controllers/AccountController.cs@@ -195,7 +195,6 @@ public class AccountController : BasePublicController//available even when navigation is not allowed[PublicStore(true)][ClosedStore(true)]- [AutoValidateAntiforgeryToken][IgnoreApi]public virtual async Task<IActionResult> Login(LoginModel model, string returnUrl){@@ -367,7 +366,6 @@ public class AccountController : BasePublicController}[HttpPost]- [AutoValidateAntiforgeryToken][PublicStore(true)]public virtual async Task<ActionResult<PasswordRecoveryModel>> PasswordRecovery(PasswordRecoveryModel model){@@ -400,7 +398,6 @@ public class AccountController : BasePublicController}[HttpPost]- [AutoValidateAntiforgeryToken]//available even when navigation is not allowed[PublicStore(true)]public virtual async Task<IActionResult> PasswordRecoveryConfirm(PasswordRecoveryConfirmModel model)@@ -447,7 +444,6 @@ public class AccountController : BasePublicController}[HttpPost]- [AutoValidateAntiforgeryToken]//available even when navigation is not allowed[PublicStore(true)]public virtual async Task<IActionResult> Register(RegisterModel model, string returnUrl)@@ -570,7 +566,6 @@ public class AccountController : BasePublicController}[HttpPost]- [AutoValidateAntiforgeryToken]//available even when navigation is not allowed[PublicStore(true)]public virtual async Task<IActionResult> CheckUsernameAvailability(string username)@@ -647,7 +642,6 @@ public class AccountController : BasePublicController}[HttpPost]- [AutoValidateAntiforgeryToken][CustomerGroupAuthorize(SystemCustomerGroupNames.Registered)]public virtual async Task<ActionResult<CustomerInfoModel>> Info(CustomerInfoModel model){@@ -683,7 +677,6 @@ public class AccountController : BasePublicController}[HttpPost]- [AutoValidateAntiforgeryToken][CustomerGroupAuthorize(SystemCustomerGroupNames.Registered)]public virtual async Task<IActionResult> RemoveExternalAssociation(string id,[FromServices] IExternalAuthenticationService openAuthenticationService)@@ -733,7 +726,6 @@ public class AccountController : BasePublicController}[HttpPost]- [AutoValidateAntiforgeryToken][CustomerGroupAuthorize(SystemCustomerGroupNames.Registered)]public virtual async Task<IActionResult> AddressDelete(string addressId){@@ -776,7 +768,6 @@ public class AccountController : BasePublicController}[HttpPost]- [AutoValidateAntiforgeryToken][CustomerGroupAuthorize(SystemCustomerGroupNames.Registered)]public virtual async Task<ActionResult<AddressModel>> AddressAdd(CustomerAddressEditModel model,[FromServices] AddressSettings addressSettings)@@ -841,7 +832,6 @@ public class AccountController : BasePublicController}[HttpPost]- [AutoValidateAntiforgeryToken][CustomerGroupAuthorize(SystemCustomerGroupNames.Registered)]public virtual async Task<ActionResult<CustomerAddressEditModel>> AddressEdit(CustomerAddressEditModel model,[FromServices] AddressSettings addressSettings)@@ -929,7 +919,6 @@ public class AccountController : BasePublicController}[HttpPost]- [AutoValidateAntiforgeryToken][CustomerGroupAuthorize(SystemCustomerGroupNames.Registered)]public virtual async Task<IActionResult> ChangePassword(ChangePasswordModel model){@@ -965,7 +954,6 @@ public class AccountController : BasePublicController}[HttpPost]- [AutoValidateAntiforgeryToken][CustomerGroupAuthorize(SystemCustomerGroupNames.Registered)]public virtual async Task<IActionResult> DeleteAccount(DeleteAccountModel model){@@ -1152,7 +1140,6 @@ public class AccountController : BasePublicController}[HttpPost]- [AutoValidateAntiforgeryToken][CustomerGroupAuthorize(SystemCustomerGroupNames.Registered)]public virtual async Task<IActionResult> SubAccountAdd(SubAccountCreateModel model){@@ -1184,7 +1171,6 @@ public class AccountController : BasePublicController}[HttpPost]- [AutoValidateAntiforgeryToken][CustomerGroupAuthorize(SystemCustomerGroupNames.Registered)]public virtual async Task<IActionResult> SubAccountEdit(SubAccountEditModel model){@@ -1203,7 +1189,6 @@ public class AccountController : BasePublicController}[HttpPost]- [AutoValidateAntiforgeryToken][CustomerGroupAuthorize(SystemCustomerGroupNames.Registered)]public virtual async Task<IActionResult> SubAccountDelete(string id){diff --git a/src/Web/Grand.Web/Controllers/BlogController.cs b/src/Web/Grand.Web/Controllers/BlogController.csindex 7fa0f9adb..083bcf71e 100644--- a/src/Web/Grand.Web/Controllers/BlogController.cs+++ b/src/Web/Grand.Web/Controllers/BlogController.cs@@ -130,7 +130,6 @@ public class BlogController : BasePublicController}[HttpPost]- [AutoValidateAntiforgeryToken][DenySystemAccount]public virtual async Task<ActionResult<AddBlogCommentModel>> BlogPost(AddBlogCommentModel model,[FromServices] IAclService aclService)diff --git a/src/Web/Grand.Web/Controllers/CatalogController.cs b/src/Web/Grand.Web/Controllers/CatalogController.csindex 0ba64bc6b..953f1b310 100644--- a/src/Web/Grand.Web/Controllers/CatalogController.cs+++ b/src/Web/Grand.Web/Controllers/CatalogController.cs@@ -318,7 +318,6 @@ public class CatalogController : BasePublicController#region Vendor reviews[HttpPost]- [AutoValidateAntiforgeryToken][DenySystemAccount]public virtual async Task<IActionResult> VendorReviews(VendorReviewsModel model){diff --git a/src/Web/Grand.Web/Controllers/ContactController.cs b/src/Web/Grand.Web/Controllers/ContactController.csindex c45557336..206ebc5ef 100644--- a/src/Web/Grand.Web/Controllers/ContactController.cs+++ b/src/Web/Grand.Web/Controllers/ContactController.cs@@ -59,7 +59,6 @@ public class ContactController : BasePublicController}[HttpPost]- [AutoValidateAntiforgeryToken][ClosedStore(true)][DenySystemAccount]public virtual async Task<ActionResult<ContactUsModel>> Index(diff --git a/src/Web/Grand.Web/Controllers/KnowledgebaseController.cs b/src/Web/Grand.Web/Controllers/KnowledgebaseController.csindex de16e61d0..353165f54 100644--- a/src/Web/Grand.Web/Controllers/KnowledgebaseController.cs+++ b/src/Web/Grand.Web/Controllers/KnowledgebaseController.cs@@ -264,7 +264,6 @@ public class KnowledgebaseController : BasePublicController}[HttpPost]- [AutoValidateAntiforgeryToken][DenySystemAccount]public virtual async Task<IActionResult> ArticleCommentAdd(KnowledgebaseArticleModel model,[FromServices] ICustomerService customerService)diff --git a/src/Web/Grand.Web/Controllers/MerchandiseReturnController.cs b/src/Web/Grand.Web/Controllers/MerchandiseReturnController.csindex a8cebfab4..61e0fd2a8 100644--- a/src/Web/Grand.Web/Controllers/MerchandiseReturnController.cs+++ b/src/Web/Grand.Web/Controllers/MerchandiseReturnController.cs@@ -138,7 +138,6 @@ public class MerchandiseReturnController : BasePublicController}[HttpPost]- [AutoValidateAntiforgeryToken]public virtual async Task<IActionResult> MerchandiseReturn(MerchandiseReturnModel model){var order = await _orderService.GetOrderById(model.OrderId);diff --git a/src/Web/Grand.Web/Controllers/NewsController.cs b/src/Web/Grand.Web/Controllers/NewsController.csindex 5851d33be..2b7694469 100644--- a/src/Web/Grand.Web/Controllers/NewsController.cs+++ b/src/Web/Grand.Web/Controllers/NewsController.cs@@ -91,7 +91,6 @@ public class NewsController : BasePublicController}[HttpPost]- [AutoValidateAntiforgeryToken][DenySystemAccount]public virtual async Task<IActionResult> NewsCommentAdd(AddNewsCommentModel model){diff --git a/src/Web/Grand.Web/Controllers/OrderController.cs b/src/Web/Grand.Web/Controllers/OrderController.csindex 883634f00..647be5489 100644--- a/src/Web/Grand.Web/Controllers/OrderController.cs+++ b/src/Web/Grand.Web/Controllers/OrderController.cs@@ -135,7 +135,6 @@ public class OrderController : BasePublicController//My account / Order details page / Add order note[HttpPost]- [AutoValidateAntiforgeryToken]public virtual async Task<ActionResult<AddOrderNoteModel>> AddOrderNote(AddOrderNoteModel model){if (!_orderSettings.AllowCustomerToAddOrderNote)@@ -174,7 +173,6 @@ public class OrderController : BasePublicController//My account / Order details page / Complete payment[HttpPost]- [AutoValidateAntiforgeryToken]public virtual async Task<IActionResult> RePostPayment(string orderId){var order = await _orderService.GetOrderById(orderId);diff --git a/src/Web/Grand.Web/Controllers/ProductController.cs b/src/Web/Grand.Web/Controllers/ProductController.csindex 6e45d6a83..d751d31c3 100644--- a/src/Web/Grand.Web/Controllers/ProductController.cs+++ b/src/Web/Grand.Web/Controllers/ProductController.cs@@ -136,7 +136,6 @@ public class ProductController : BasePublicController#region Email a friend[HttpPost]- [AutoValidateAntiforgeryToken][DenySystemAccount]public virtual async Task<IActionResult> ProductEmailAFriend(ProductEmailAFriendModel model){@@ -180,7 +179,6 @@ public class ProductController : BasePublicController#region Ask question[HttpPost]- [AutoValidateAntiforgeryToken][DenySystemAccount]public virtual async Task<IActionResult> AskQuestionOnProduct(ProductAskQuestionSimpleModel model){@@ -549,7 +547,6 @@ public class ProductController : BasePublicController#region Product reviews[HttpPost]- [AutoValidateAntiforgeryToken][DenySystemAccount]public virtual async Task<IActionResult> ProductReviews(ProductReviewsModel model)diff --git a/src/Web/Grand.Web/Controllers/ShoppingCartController.cs b/src/Web/Grand.Web/Controllers/ShoppingCartController.csindex 3f28df28c..e1fc0fd35 100644--- a/src/Web/Grand.Web/Controllers/ShoppingCartController.cs+++ b/src/Web/Grand.Web/Controllers/ShoppingCartController.cs@@ -301,7 +301,6 @@ public class ShoppingCartController : BasePublicController}- [AutoValidateAntiforgeryToken][DenySystemAccount][HttpPost]public virtual async Task<IActionResult> UpdateQuantity(UpdateQuantityModel model)@@ -497,7 +496,6 @@ public class ShoppingCartController : BasePublicControllerreturn RedirectToRoute("LoginCheckoutAsGuest", new { returnUrl = Url.RouteUrl("ShoppingCart") });}- [AutoValidateAntiforgeryToken][DenySystemAccount][HttpPost]public virtual async Task<IActionResult> ApplyDiscountCoupon(DiscountCouponModel model)@@ -541,7 +539,6 @@ public class ShoppingCartController : BasePublicController});}- [AutoValidateAntiforgeryToken][DenySystemAccount][HttpPost]public virtual async Task<IActionResult> ApplyGiftVoucher(GiftVoucherCouponModel model)@@ -586,7 +583,6 @@ public class ShoppingCartController : BasePublicController});}- [AutoValidateAntiforgeryToken][HttpPost]public virtual async Task<IActionResult> GetEstimateShipping(EstimateShippingModel model){diff --git a/src/Web/Grand.Web/Controllers/VendorController.cs b/src/Web/Grand.Web/Controllers/VendorController.csindex 4b7efcdaf..7f2c04cf2 100644--- a/src/Web/Grand.Web/Controllers/VendorController.cs+++ b/src/Web/Grand.Web/Controllers/VendorController.cs@@ -128,7 +128,6 @@ public class VendorController : BasePublicController[HttpPost][ActionName("ApplyVendor")]- [AutoValidateAntiforgeryToken][DenySystemAccount][CustomerGroupAuthorize(SystemCustomerGroupNames.Registered)]public virtual async Task<IActionResult> ApplyVendorSubmit(ApplyVendorModel model, [FromServices] ISeNameService seNameService)@@ -195,7 +194,6 @@ public class VendorController : BasePublicController}[HttpPost]- [AutoValidateAntiforgeryToken][DenySystemAccount]public virtual async Task<IActionResult> ContactVendor(ContactVendorModel model){diff --git a/src/Web/Grand.Web/Controllers/WishlistController.cs b/src/Web/Grand.Web/Controllers/WishlistController.csindex 050c6bf34..9965c0485 100644--- a/src/Web/Grand.Web/Controllers/WishlistController.cs+++ b/src/Web/Grand.Web/Controllers/WishlistController.cs@@ -111,7 +111,6 @@ public class WishlistController : BasePublicControllerreturn View(model);}- [AutoValidateAntiforgeryToken][DenySystemAccount][HttpPost]public virtual async Task<IActionResult> UpdateQuantity(UpdateQuantityModel model)@@ -208,7 +207,6 @@ public class WishlistController : BasePublicController}[HttpPost]- [AutoValidateAntiforgeryToken][DenySystemAccount]public virtual async Task<IActionResult> EmailWishlist(WishlistEmailAFriendModel model,[FromServices] IMessageProviderService messageProviderService,diff --git a/src/Web/Grand.Web/Views/Shared/_Layout.cshtml b/src/Web/Grand.Web/Views/Shared/_Layout.cshtmlindex 104332ff4..51951c577 100644--- a/src/Web/Grand.Web/Views/Shared/_Layout.cshtml+++ b/src/Web/Grand.Web/Views/Shared/_Layout.cshtml@@ -19,6 +19,7 @@@await RenderSectionAsync("head", false)</head><body><resources asp-type="TemplateHeader"/><resources asp-type="ScriptHeader"/>diff --git a/src/Web/Grand.Web/Views/Shared/_LayoutPopup.cshtml b/src/Web/Grand.Web/Views/Shared/_LayoutPopup.cshtmlindex 8fc177288..9400d4a11 100644--- a/src/Web/Grand.Web/Views/Shared/_LayoutPopup.cshtml+++ b/src/Web/Grand.Web/Views/Shared/_LayoutPopup.cshtml@@ -15,6 +15,7 @@<resources asp-type="HeadScript"/></head><body class="popup-window text-center px-3"><resources asp-type="ScriptHeader"/><vc:widget widget-zone="body_start_html_tag_after" additional-data="null"></vc:widget>@RenderBody()diff --git a/src/Web/Grand.Web/wwwroot/theme/script/public.common.js b/src/Web/Grand.Web/wwwroot/theme/script/public.common.jsindex 49776e565..7c881fd3e 100644--- a/src/Web/Grand.Web/wwwroot/theme/script/public.common.js+++ b/src/Web/Grand.Web/wwwroot/theme/script/public.common.js@@ -12,6 +12,28 @@ function addAntiForgeryToken(data) {return data;};+//attach the CSRF token as a header to every AJAX request (axios and jQuery),+//so requests are covered regardless of body type (json/form/FormData)+(function () {+ const tokenInput = document.querySelector('input[name=__RequestVerificationToken]');+ if (!tokenInput) {+ return;+ }+ const token = tokenInput.value;++ if (typeof axios !== 'undefined') {+ axios.defaults.headers.common['X-CSRF-TOKEN'] = token;+ }++ if (typeof $ !== 'undefined' && typeof $.ajaxSetup === 'function') {+ $.ajaxSetup({+ beforeSend: function (xhr) {+ xhr.setRequestHeader('X-CSRF-TOKEN', token);+ }+ });+ }+})();+// runs an array of async functions in sequential orderfunction seq(arr, callback, index) {// first call, without an index