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
Add NoScriptsAttribute for XSS Protection (#461)
Krzysztof Pajakec8968b75ad8
diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/BrandModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/BrandModel.csindex b2102355d..97067b7b9 100644--- a/src/Web/Grand.Web.Admin/Models/Catalog/BrandModel.cs+++ b/src/Web/Grand.Web.Admin/Models/Catalog/BrandModel.cs@@ -5,6 +5,7 @@ using Grand.Web.Common.Link;using Grand.Web.Common.Models;using Microsoft.AspNetCore.Mvc.Rendering;using System.ComponentModel.DataAnnotations;+using Grand.Web.Common.Validators;namespace Grand.Web.Admin.Models.Catalog{@@ -20,13 +21,15 @@ namespace Grand.Web.Admin.Models.CatalogAvailableBrandLayouts = new List<SelectListItem>();AvailableSortOptions = new List<SelectListItem>();}-+[GrandResourceDisplayName("Admin.Catalog.Brands.Fields.Name")]public string Name { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Brands.Fields.Description")]public string Description { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Brands.Fields.BottomDescription")]public string BottomDescription { get; set; }@@ -34,12 +37,15 @@ namespace Grand.Web.Admin.Models.Catalogpublic string BrandLayoutId { get; set; }public IList<SelectListItem> AvailableBrandLayouts { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Brands.Fields.MetaKeywords")]public string MetaKeywords { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Brands.Fields.MetaDescription")]public string MetaDescription { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Brands.Fields.MetaTitle")]public string MetaTitle { get; set; }@@ -105,23 +111,27 @@ namespace Grand.Web.Admin.Models.Catalog[GrandResourceDisplayName("Admin.Catalog.Brands.Fields.Name")]public string Name { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Brands.Fields.Description")]public string Description { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Brands.Fields.BottomDescription")]public string BottomDescription { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Brands.Fields.MetaKeywords")]public string MetaKeywords { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Brands.Fields.MetaDescription")]public string MetaDescription { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Brands.Fields.MetaTitle")]public string MetaTitle { get; set; }[GrandResourceDisplayName("Admin.Catalog.Brands.Fields.SeName")]-public string SeName { get; set; }}diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/CategoryModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/CategoryModel.csindex 23ab4d668..8e7b47155 100644--- a/src/Web/Grand.Web.Admin/Models/Catalog/CategoryModel.cs+++ b/src/Web/Grand.Web.Admin/Models/Catalog/CategoryModel.cs@@ -5,6 +5,7 @@ using Grand.Web.Common.Link;using Grand.Web.Common.Models;using Microsoft.AspNetCore.Mvc.Rendering;using System.ComponentModel.DataAnnotations;+using Grand.Web.Common.Validators;namespace Grand.Web.Admin.Models.Catalog{@@ -20,13 +21,15 @@ namespace Grand.Web.Admin.Models.CatalogAvailableCategoryLayouts = new List<SelectListItem>();AvailableSortOptions = new List<SelectListItem>();}-+[GrandResourceDisplayName("Admin.Catalog.Categories.Fields.Name")]public string Name { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Categories.Fields.Description")]public string Description { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Categories.Fields.BottomDescription")]public string BottomDescription { get; set; }@@ -35,12 +38,15 @@ namespace Grand.Web.Admin.Models.Catalogpublic IList<SelectListItem> AvailableCategoryLayouts { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Categories.Fields.MetaKeywords")]public string MetaKeywords { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Categories.Fields.MetaDescription")]public string MetaDescription { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Categories.Fields.MetaTitle")]public string MetaTitle { get; set; }@@ -180,18 +186,23 @@ namespace Grand.Web.Admin.Models.Catalog[GrandResourceDisplayName("Admin.Catalog.Categories.Fields.Name")]public string Name { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Categories.Fields.Description")]public string Description { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Categories.Fields.BottomDescription")]public string BottomDescription { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Categories.Fields.MetaKeywords")]public string MetaKeywords { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Categories.Fields.MetaDescription")]public string MetaDescription { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Categories.Fields.MetaTitle")]public string MetaTitle { get; set; }diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/CollectionModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/CollectionModel.csindex 974553bee..2ed986528 100644--- a/src/Web/Grand.Web.Admin/Models/Catalog/CollectionModel.cs+++ b/src/Web/Grand.Web.Admin/Models/Catalog/CollectionModel.cs@@ -5,6 +5,7 @@ using Grand.Web.Common.Link;using Grand.Web.Common.Models;using Microsoft.AspNetCore.Mvc.Rendering;using System.ComponentModel.DataAnnotations;+using Grand.Web.Common.Validators;namespace Grand.Web.Admin.Models.Catalog{@@ -24,9 +25,11 @@ namespace Grand.Web.Admin.Models.Catalog[GrandResourceDisplayName("Admin.Catalog.Collections.Fields.Name")]public string Name { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Collections.Fields.Description")]public string Description { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Collections.Fields.BottomDescription")]public string BottomDescription { get; set; }@@ -34,12 +37,15 @@ namespace Grand.Web.Admin.Models.Catalogpublic string CollectionLayoutId { get; set; }public IList<SelectListItem> AvailableCollectionLayouts { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Collections.Fields.MetaKeywords")]public string MetaKeywords { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Collections.Fields.MetaDescription")]public string MetaDescription { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Collections.Fields.MetaTitle")]public string MetaTitle { get; set; }@@ -156,18 +162,23 @@ namespace Grand.Web.Admin.Models.Catalog[GrandResourceDisplayName("Admin.Catalog.Collections.Fields.Name")]public string Name { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Collections.Fields.Description")]public string Description { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Collections.Fields.BottomDescription")]public string BottomDescription { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Collections.Fields.MetaKeywords")]public string MetaKeywords { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Collections.Fields.MetaDescription")]public string MetaDescription { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Collections.Fields.MetaTitle")]public string MetaTitle { get; set; }diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.csindex 33e47d7a8..ebc6e63a4 100644--- a/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.cs+++ b/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.cs@@ -6,6 +6,7 @@ using Grand.Infrastructure.Models;using Grand.Web.Admin.Models.Discounts;using Microsoft.AspNetCore.Mvc.Rendering;using System.ComponentModel.DataAnnotations;+using Grand.Web.Common.Validators;namespace Grand.Web.Admin.Models.Catalog{@@ -39,15 +40,18 @@ namespace Grand.Web.Admin.Models.Catalog[GrandResourceDisplayName("Admin.Catalog.Products.Fields.Name")]public string Name { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Products.Fields.ShortDescription")]public string ShortDescription { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Products.Fields.FullDescription")]public string FullDescription { get; set; }[GrandResourceDisplayName("Admin.Catalog.Products.Fields.Flag")]public string Flag { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Products.Fields.AdminComment")]public string AdminComment { get; set; }@@ -65,20 +69,19 @@ namespace Grand.Web.Admin.Models.Catalog[GrandResourceDisplayName("Admin.Catalog.Products.Fields.BestSeller")]public bool BestSeller { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Products.Fields.MetaKeywords")]-public string MetaKeywords { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Products.Fields.MetaDescription")]-public string MetaDescription { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Products.Fields.MetaTitle")]-public string MetaTitle { get; set; }[GrandResourceDisplayName("Admin.Catalog.Products.Fields.SeName")]-public string SeName { get; set; }[GrandResourceDisplayName("Admin.Catalog.Products.Fields.AllowCustomerReviews")]@@ -86,17 +89,14 @@ namespace Grand.Web.Admin.Models.Catalog[GrandResourceDisplayName("Admin.Catalog.Products.Fields.ProductTags")]public string ProductTags { get; set; }-+[GrandResourceDisplayName("Admin.Catalog.Products.Fields.Sku")]-public string Sku { get; set; }-+[GrandResourceDisplayName("Admin.Catalog.Products.Fields.Mpn")]-public string Mpn { get; set; }[GrandResourceDisplayName("Admin.Catalog.Products.Fields.GTIN")]-public virtual string Gtin { get; set; }[GrandResourceDisplayName("Admin.Catalog.Products.Fields.IsGiftVoucher")]@@ -148,8 +148,8 @@ namespace Grand.Web.Admin.Models.Catalog[GrandResourceDisplayName("Admin.Catalog.Products.Fields.HasUserAgreement")]public bool HasUserAgreement { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Products.Fields.UserAgreementText")]-public string UserAgreementText { get; set; }[GrandResourceDisplayName("Admin.Catalog.Products.Fields.IsRecurring")]@@ -987,31 +987,29 @@ namespace Grand.Web.Admin.Models.Catalogpublic string LanguageId { get; set; }[GrandResourceDisplayName("Admin.Catalog.Products.Fields.Name")]-public string Name { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Products.Fields.ShortDescription")]-public string ShortDescription { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Products.Fields.FullDescription")]-public string FullDescription { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Products.Fields.MetaKeywords")]-public string MetaKeywords { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Products.Fields.MetaDescription")]-public string MetaDescription { get; set; }+ [NoScripts][GrandResourceDisplayName("Admin.Catalog.Products.Fields.MetaTitle")]-public string MetaTitle { get; set; }[GrandResourceDisplayName("Admin.Catalog.Products.Fields.SeName")]-public string SeName { get; set; }}}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Models/Catalog/ProductReviewModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/ProductReviewModel.csindex 03872a954..63a43389a 100644--- a/src/Web/Grand.Web.Admin/Models/Catalog/ProductReviewModel.cs+++ b/src/Web/Grand.Web.Admin/Models/Catalog/ProductReviewModel.cs@@ -20,10 +20,13 @@ namespace Grand.Web.Admin.Models.Catalogpublic string CustomerInfo { get; set; }[GrandResourceDisplayName("Admin.Catalog.ProductReviews.Fields.Title")]public string Title { get; set; }+[GrandResourceDisplayName("Admin.Catalog.ProductReviews.Fields.ReviewText")]public string ReviewText { get; set; }+[GrandResourceDisplayName("Admin.Catalog.ProductReviews.Fields.ReplyText")]public string ReplyText { get; set; }+[GrandResourceDisplayName("Admin.Catalog.ProductReviews.Fields.Signature")]public string Signature { get; set; }[GrandResourceDisplayName("Admin.Catalog.ProductReviews.Fields.Rating")]diff --git a/src/Web/Grand.Web.Common/Validators/NoScriptsAttribute.cs b/src/Web/Grand.Web.Common/Validators/NoScriptsAttribute.csnew file mode 100644index 000000000..00a7f2b27--- /dev/null+++ b/src/Web/Grand.Web.Common/Validators/NoScriptsAttribute.cs@@ -0,0 +1,23 @@+using System.ComponentModel.DataAnnotations;+using System.Text.RegularExpressions;++namespace Grand.Web.Common.Validators;+public class NoScriptsAttribute : ValidationAttribute+{+ // Simple regular expression to detect potential scripts+ private const string Pattern = "<script.*?>.*?</script>|javascript:[^\\s]*|onload=|onerror=|onmouseover=|onclick=|onchange=|onsubmit=";++ protected override ValidationResult IsValid(object value, ValidationContext validationContext)+ {+ if (value == null) return ValidationResult.Success;+ var valueAsString = value.ToString();+ // Check if the value contains a script+ return ContainsScript(valueAsString) ? new ValidationResult("JavaScript scripts are not allowed.") : ValidationResult.Success;+ }++ private static bool ContainsScript(string input)+ {+ Regex scriptRegex = new Regex(Pattern, RegexOptions.IgnoreCase);+ return scriptRegex.IsMatch(input);+ }+}diff --git a/src/Web/Grand.Web.Vendor/Models/Catalog/ProductModel.cs b/src/Web/Grand.Web.Vendor/Models/Catalog/ProductModel.csindex b719116b5..8e257acd9 100644--- a/src/Web/Grand.Web.Vendor/Models/Catalog/ProductModel.cs+++ b/src/Web/Grand.Web.Vendor/Models/Catalog/ProductModel.cs@@ -2,6 +2,7 @@using Grand.Domain.Catalog;using Grand.Infrastructure.ModelBinding;using Grand.Infrastructure.Models;+using Grand.Web.Common.Validators;using Microsoft.AspNetCore.Mvc.Rendering;using System.ComponentModel.DataAnnotations;@@ -37,15 +38,18 @@ namespace Grand.Web.Vendor.Models.Catalog[GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Name")]public string Name { get; set; }+ [NoScripts][GrandResourceDisplayName("Vendor.Catalog.Products.Fields.ShortDescription")]public string ShortDescription { get; set; }+ [NoScripts][GrandResourceDisplayName("Vendor.Catalog.Products.Fields.FullDescription")]public string FullDescription { get; set; }[GrandResourceDisplayName("Vendor.Catalog.Products.Fields.Flag")]public string Flag { get; set; }+ [NoScripts][GrandResourceDisplayName("Vendor.Catalog.Products.Fields.AdminComment")]public string AdminComment { get; set; }@@ -54,20 +58,19 @@ namespace Grand.Web.Vendor.Models.Catalogpublic string BrandId { get; set; }+ [NoScripts][GrandResourceDisplayName("Vendor.Catalog.Products.Fields.MetaKeywords")]-public string MetaKeywords { get; set; }+ [NoScripts][GrandResourceDisplayName("Vendor.Catalog.Products.Fields.MetaDescription")]-public string MetaDescription { get; set; }+ [NoScripts][GrandResourceDisplayName("Vendor.Catalog.Products.Fields.MetaTitle")]-public string MetaTitle { get; set; }[GrandResourceDisplayName("Vendor.Catalog.Products.Fields.SeName")]-public string SeName { get; set; }[GrandResourceDisplayName("Vendor.Catalog.Products.Fields.AllowCustomerReviews")]@@ -365,9 +368,11 @@ namespace Grand.Web.Vendor.Models.Catalog[GrandResourceDisplayName("Vendor.Catalog.Products.SpecificationAttributes.Fields.SpecificationAttributeOption")]public string SpecificationAttributeOptionId { get; set; }+ [NoScripts][GrandResourceDisplayName("Vendor.Catalog.Products.SpecificationAttributes.Fields.CustomName")]public string CustomName { get; set; }+ [NoScripts][GrandResourceDisplayName("Vendor.Catalog.Products.SpecificationAttributes.Fields.CustomValue")]public string CustomValue { get; set; }@@ -900,28 +905,28 @@ namespace Grand.Web.Vendor.Models.Catalogpublic string Name { get; set; }+ [NoScripts][GrandResourceDisplayName("Vendor.Catalog.Products.Fields.ShortDescription")]-public string ShortDescription { get; set; }[GrandResourceDisplayName("Vendor.Catalog.Products.Fields.FullDescription")]+ [NoScripts]public string FullDescription { get; set; }-[GrandResourceDisplayName("Vendor.Catalog.Products.Fields.MetaKeywords")]+ [NoScripts]public string MetaKeywords { get; set; }+ [NoScripts][GrandResourceDisplayName("Vendor.Catalog.Products.Fields.MetaDescription")]-public string MetaDescription { get; set; }+ [NoScripts][GrandResourceDisplayName("Vendor.Catalog.Products.Fields.MetaTitle")]-public string MetaTitle { get; set; }[GrandResourceDisplayName("Vendor.Catalog.Products.Fields.SeName")]-public string SeName { get; set; }}}\ No newline at end of file