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: close cross-store IDOR in Category/Collection/Brand ImportFromXlsx (#830)
Krzysztof Pajake07e8f71abc2
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseBrandControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseBrandControllerTests.csindex f8d2716c7..4b422d713 100644--- a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseBrandControllerTests.cs+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseBrandControllerTests.cs@@ -451,4 +451,40 @@ public class BaseBrandControllerTestsAssert.AreEqual("List", redirect.ActionName);importManagerMock.Verify(i => i.Import(It.IsAny<Stream>()), Times.Never);}++ // --- ImportFromXlsx (security fix: ImportManager<T> upserts by an attacker-supplied Id with no+ // ownership check - store-scoped callers must be denied outright) ------------------------------++ [TestMethod]+ public async Task ImportFromXlsx_StoreScope_DeniesAndNeverCallsImportManager()+ {+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");+ var importManagerMock = new Mock<Grand.Business.Core.Interfaces.ExportImport.IImportManager<Grand.Business.Core.Dto.BrandDto>>();+ var fileMock = new Mock<IFormFile>();+ fileMock.Setup(f => f.Length).Returns(100);++ var result = await _controller.ImportFromXlsx(fileMock.Object, importManagerMock.Object);++ var redirect = result as RedirectToActionResult;+ Assert.IsNotNull(redirect);+ Assert.AreEqual("List", redirect.ActionName);+ importManagerMock.Verify(m => m.Import(It.IsAny<Stream>()), Times.Never);+ }++ [TestMethod]+ public async Task ImportFromXlsx_GlobalScope_CallsImportManager()+ {+ _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);+ var importManagerMock = new Mock<Grand.Business.Core.Interfaces.ExportImport.IImportManager<Grand.Business.Core.Dto.BrandDto>>();+ var fileMock = new Mock<IFormFile>();+ fileMock.Setup(f => f.Length).Returns(100);+ fileMock.Setup(f => f.OpenReadStream()).Returns(Stream.Null);++ var result = await _controller.ImportFromXlsx(fileMock.Object, importManagerMock.Object);++ var redirect = result as RedirectToActionResult;+ Assert.IsNotNull(redirect);+ Assert.AreEqual("List", redirect.ActionName);+ importManagerMock.Verify(m => m.Import(It.IsAny<Stream>()), Times.Once);+ }}diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseCategoryControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseCategoryControllerTests.csindex a356d767c..a302f535e 100644--- a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseCategoryControllerTests.cs+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseCategoryControllerTests.cs@@ -544,4 +544,40 @@ public class BaseCategoryControllerTestsAssert.AreEqual(1, gridModel.Total);Assert.IsNotNull(gridModel.Data);}++ // --- ImportFromXlsx (security fix: ImportManager<T> upserts by an attacker-supplied Id with no+ // ownership check - store-scoped callers must be denied outright) ------------------------------++ [TestMethod]+ public async Task ImportFromXlsx_StoreScope_DeniesAndNeverCallsImportManager()+ {+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");+ var importManagerMock = new Mock<Grand.Business.Core.Interfaces.ExportImport.IImportManager<Grand.Business.Core.Dto.CategoryDto>>();+ var fileMock = new Mock<IFormFile>();+ fileMock.Setup(f => f.Length).Returns(100);++ var result = await _controller.ImportFromXlsx(fileMock.Object, importManagerMock.Object);++ var redirect = result as RedirectToActionResult;+ Assert.IsNotNull(redirect);+ Assert.AreEqual("List", redirect.ActionName);+ importManagerMock.Verify(m => m.Import(It.IsAny<Stream>()), Times.Never);+ }++ [TestMethod]+ public async Task ImportFromXlsx_GlobalScope_CallsImportManager()+ {+ _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);+ var importManagerMock = new Mock<Grand.Business.Core.Interfaces.ExportImport.IImportManager<Grand.Business.Core.Dto.CategoryDto>>();+ var fileMock = new Mock<IFormFile>();+ fileMock.Setup(f => f.Length).Returns(100);+ fileMock.Setup(f => f.OpenReadStream()).Returns(Stream.Null);++ var result = await _controller.ImportFromXlsx(fileMock.Object, importManagerMock.Object);++ var redirect = result as RedirectToActionResult;+ Assert.IsNotNull(redirect);+ Assert.AreEqual("List", redirect.ActionName);+ importManagerMock.Verify(m => m.Import(It.IsAny<Stream>()), Times.Once);+ }}diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseCollectionControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseCollectionControllerTests.csindex ebadc419c..f79b7c5fe 100644--- a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseCollectionControllerTests.cs+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseCollectionControllerTests.cs@@ -604,4 +604,40 @@ public class BaseCollectionControllerTests_collectionViewModelServiceMock.Verify(v => v.InsertCollectionProductModel(It.IsAny<CollectionModel.AddCollectionProductModel>()), Times.Never);}++ // --- ImportFromXlsx (security fix: ImportManager<T> upserts by an attacker-supplied Id with no+ // ownership check - store-scoped callers must be denied outright) ------------------------------++ [TestMethod]+ public async Task ImportFromXlsx_StoreScope_DeniesAndNeverCallsImportManager()+ {+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");+ var importManagerMock = new Mock<Grand.Business.Core.Interfaces.ExportImport.IImportManager<Grand.Business.Core.Dto.CollectionDto>>();+ var fileMock = new Mock<IFormFile>();+ fileMock.Setup(f => f.Length).Returns(100);++ var result = await _controller.ImportFromXlsx(fileMock.Object, importManagerMock.Object);++ var redirect = result as RedirectToActionResult;+ Assert.IsNotNull(redirect);+ Assert.AreEqual("List", redirect.ActionName);+ importManagerMock.Verify(m => m.Import(It.IsAny<Stream>()), Times.Never);+ }++ [TestMethod]+ public async Task ImportFromXlsx_GlobalScope_CallsImportManager()+ {+ _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);+ var importManagerMock = new Mock<Grand.Business.Core.Interfaces.ExportImport.IImportManager<Grand.Business.Core.Dto.CollectionDto>>();+ var fileMock = new Mock<IFormFile>();+ fileMock.Setup(f => f.Length).Returns(100);+ fileMock.Setup(f => f.OpenReadStream()).Returns(Stream.Null);++ var result = await _controller.ImportFromXlsx(fileMock.Object, importManagerMock.Object);++ var redirect = result as RedirectToActionResult;+ Assert.IsNotNull(redirect);+ Assert.AreEqual("List", redirect.ActionName);+ importManagerMock.Verify(m => m.Import(It.IsAny<Stream>()), Times.Once);+ }}diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseBrandController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseBrandController.csindex 812386f33..1fac1341c 100644--- a/src/Web/Grand.Web.AdminShared/Controllers/BaseBrandController.cs+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseBrandController.cs@@ -268,6 +268,17 @@ public abstract class BaseBrandController({try{+ // ImportManager<T>/BrandImportDataObject match rows by an attacker-supplied Id and+ // upsert with no ownership check at all (see project security-fix history) - a+ // store-scoped caller could otherwise create or silently overwrite ANY store's brand.+ // Deny outright for non-global scope rather than threading scope through the shared,+ // multi-entity import engine.+ if (scope.DefaultStoreId is not null)+ {+ Error(translationService.GetResource("Admin.AccessDenied.Title"));+ return RedirectToAction("List");+ }+if (importexcelfile is { Length: > 0 }){await importManager.Import(importexcelfile.OpenReadStream());diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseCategoryController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseCategoryController.csindex 255859132..52995c09d 100644--- a/src/Web/Grand.Web.AdminShared/Controllers/BaseCategoryController.cs+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseCategoryController.cs@@ -236,6 +236,17 @@ public abstract class BaseCategoryController({try{+ // ImportManager<T>/CategoryImportDataObject match rows by an attacker-supplied Id and+ // upsert with no ownership check at all (see project security-fix history) - a+ // store-scoped caller could otherwise create or silently overwrite ANY store's category.+ // Deny outright for non-global scope rather than threading scope through the shared,+ // multi-entity import engine.+ if (scope.DefaultStoreId is not null)+ {+ Error(translationService.GetResource("Admin.AccessDenied.Title"));+ return RedirectToAction("List");+ }+if (importexcelfile is { Length: > 0 }){await importManager.Import(importexcelfile.OpenReadStream());diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseCollectionController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseCollectionController.csindex 8424bfb88..4040b4db8 100644--- a/src/Web/Grand.Web.AdminShared/Controllers/BaseCollectionController.cs+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseCollectionController.cs@@ -269,6 +269,17 @@ public abstract class BaseCollectionController({try{+ // ImportManager<T>/CollectionImportDataObject match rows by an attacker-supplied Id and+ // upsert with no ownership check at all (see project security-fix history) - a+ // store-scoped caller could otherwise create or silently overwrite ANY store's+ // collection. Deny outright for non-global scope rather than threading scope through the+ // shared, multi-entity import engine.+ if (scope.DefaultStoreId is not null)+ {+ Error(translationService.GetResource("Admin.AccessDenied.Title"));+ return RedirectToAction("List");+ }+if (importexcelfile is { Length: > 0 }){await importManager.Import(importexcelfile.OpenReadStream());