Skip to content

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.

Migrate 'Bids' region into BaseProductController (ARCH-001 Phase 1)

KrzysztofPajak871b0d2e48f5
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs
index fb2482a17..061a4a504 100644
--- a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs
@@ -62,6 +62,7 @@ public class BaseProductControllerTests
private Mock<IAdminDataScope<Product>> _scopeMock;
private Mock<IPermissionService> _permissionServiceMock;
private Mock<IProductReservationService> _productReservationServiceMock;
+ private Mock<IAuctionService> _auctionServiceMock;
[TestInitialize]
public void Setup()
@@ -89,6 +90,7 @@ public class BaseProductControllerTests
languageServiceMock.Setup(l => l.GetAllLanguages(true, It.IsAny<string>())).ReturnsAsync(new List<Domain.Localization.Language>());
_productReservationServiceMock = new Mock<IProductReservationService>();
+ _auctionServiceMock = new Mock<IAuctionService>();
_controller = new TestProductController(
_productViewModelServiceMock.Object,
@@ -97,7 +99,7 @@ public class BaseProductControllerTests
languageServiceMock.Object,
_translationServiceMock.Object,
_productReservationServiceMock.Object,
- new Mock<IAuctionService>().Object,
+ _auctionServiceMock.Object,
new Mock<IDateTimeService>().Object,
_permissionServiceMock.Object,
new Mock<IEnumTranslationService>().Object,
@@ -5526,4 +5528,161 @@ public class BaseProductControllerTests
_productReservationServiceMock.Verify(
s => s.DeleteProductReservation(It.IsAny<ProductReservation>()), Times.Never);
}
+
+ // --- Bids ----------------------------------------------------------------------------------------
+ // ARCH-001 Phase 1 Task 8 row 24 (final region). Admin's originals had no ownership check at all;
+ // Store used CanAccessProduct; Vendor used a combined null-or-HasAccessToProduct throw - all
+ // normalized to scope.HasAccess.
+
+ private static Bid NewBid(string id, string productId, string orderId = "") =>
+ new() { Id = id, ProductId = productId, OrderId = orderId, Date = DateTime.UtcNow };
+
+ // --- ListBids --------------------------------------------------------------------------------
+
+ [TestMethod]
+ public async Task ListBids_MissingProduct_Throws()
+ {
+ _productServiceMock.Setup(p => p.GetProductById("missing")).ReturnsAsync((Product)null);
+
+ await Assert.ThrowsExactlyAsync<ArgumentException>(
+ () => _controller.ListBids(new Grand.Web.Common.DataSource.DataSourceRequest(), "missing"));
+ }
+
+ [TestMethod]
+ public async Task ListBids_ScopeDeniesAccess_ReturnsKendoGridError_DoesNotQuery()
+ {
+ var product = new Product { Id = "p1" };
+ _productServiceMock.Setup(p => p.GetProductById("p1")).ReturnsAsync(product);
+ _scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(false);
+
+ var result = await _controller.ListBids(new Grand.Web.Common.DataSource.DataSourceRequest(), "p1");
+
+ Assert.IsInstanceOfType<JsonResult>(result);
+ _translationServiceMock.Verify(t => t.GetResource("Admin.Catalog.Products.Permissions"), Times.Once);
+ _productViewModelServiceMock.Verify(
+ s => s.PrepareBidMode(It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task ListBids_ScopeGrantsAccess_ReturnsBids()
+ {
+ var product = new Product { Id = "p1" };
+ _productServiceMock.Setup(p => p.GetProductById("p1")).ReturnsAsync(product);
+ _scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(true);
+ _productViewModelServiceMock.Setup(s => s.PrepareBidMode("p1", 0, 10))
+ .ReturnsAsync((Enumerable.Empty<ProductModel.BidModel>(), 0));
+
+ var result = await _controller.ListBids(
+ new Grand.Web.Common.DataSource.DataSourceRequest { PageSize = 10 }, "p1");
+
+ Assert.IsInstanceOfType<JsonResult>(result);
+ var json = result as JsonResult;
+ var gridModel = json.Value as Grand.Web.Common.DataSource.DataSourceResult;
+ Assert.IsNotNull(gridModel);
+ Assert.AreEqual(0, gridModel.Total);
+ }
+
+ // --- BidDelete ---------------------------------------------------------------------------------
+
+ [TestMethod]
+ public async Task BidDelete_MissingProduct_Throws()
+ {
+ _productServiceMock.Setup(p => p.GetProductById("missing")).ReturnsAsync((Product)null);
+ var model = new ProductModel.BidModel { ProductId = "missing", BidId = "b1" };
+
+ await Assert.ThrowsExactlyAsync<ArgumentException>(() => _controller.BidDelete(model));
+ }
+
+ [TestMethod]
+ public async Task BidDelete_ScopeDeniesAccess_ReturnsKendoGridError_DoesNotDelete()
+ {
+ var product = new Product { Id = "p1" };
+ _productServiceMock.Setup(p => p.GetProductById("p1")).ReturnsAsync(product);
+ _scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(false);
+ var model = new ProductModel.BidModel { ProductId = "p1", BidId = "b1" };
+
+ var result = await _controller.BidDelete(model);
+
+ Assert.IsInstanceOfType<JsonResult>(result);
+ _translationServiceMock.Verify(t => t.GetResource("Admin.Catalog.Products.Permissions"), Times.Once);
+ _auctionServiceMock.Verify(s => s.DeleteBid(It.IsAny<Bid>()), Times.Never);
+ }
+
+ // Regression guard for the same cross-product IDOR shape as ProductReservationDelete above (found by
+ // the row 23 reviewer to apply identically here): the access check ran against model.ProductId while
+ // the delete ran against model.BidId, with no check that the two referred to the same product. A
+ // caller with access to *any* product could pass that product's id for the access check while
+ // supplying the BidId of a bid belonging to a different, unowned product, deleting it.
+ [TestMethod]
+ public async Task BidDelete_BidBelongsToDifferentProduct_ReturnsKendoGridError_DoesNotDelete()
+ {
+ var ownedProduct = new Product { Id = "p1" };
+ _productServiceMock.Setup(p => p.GetProductById("p1")).ReturnsAsync(ownedProduct);
+ _scopeMock.Setup(s => s.HasAccess(ownedProduct)).ReturnsAsync(true);
+ var foreignBid = NewBid("b1", "p2");
+ _auctionServiceMock.Setup(s => s.GetBid("b1")).ReturnsAsync(foreignBid);
+ var model = new ProductModel.BidModel { ProductId = "p1", BidId = "b1" };
+
+ var result = await _controller.BidDelete(model);
+
+ Assert.IsInstanceOfType<JsonResult>(result);
+ _translationServiceMock.Verify(t => t.GetResource("Admin.Catalog.Products.Permissions"), Times.Once);
+ _auctionServiceMock.Verify(s => s.DeleteBid(It.IsAny<Bid>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task BidDelete_BidHasOrder_ReturnsErrorsJson_DoesNotDelete()
+ {
+ var product = new Product { Id = "p1" };
+ _productServiceMock.Setup(p => p.GetProductById("p1")).ReturnsAsync(product);
+ _scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(true);
+ var bid = NewBid("b1", "p1", "order1");
+ _auctionServiceMock.Setup(s => s.GetBid("b1")).ReturnsAsync(bid);
+ var model = new ProductModel.BidModel { ProductId = "p1", BidId = "b1" };
+
+ var result = await _controller.BidDelete(model);
+
+ var json = result as JsonResult;
+ Assert.IsNotNull(json);
+ var gridModel = json.Value as Grand.Web.Common.DataSource.DataSourceResult;
+ Assert.IsNotNull(gridModel);
+ Assert.IsNotNull(gridModel.Errors);
+ _translationServiceMock.Verify(t => t.GetResource("Admin.Catalog.Products.Bids.CantDeleteWithOrder"), Times.Once);
+ _auctionServiceMock.Verify(s => s.DeleteBid(It.IsAny<Bid>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task BidDelete_ScopeGrantsAccess_SameProduct_Deletes()
+ {
+ var product = new Product { Id = "p1" };
+ _productServiceMock.Setup(p => p.GetProductById("p1")).ReturnsAsync(product);
+ _scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(true);
+ var bid = NewBid("b1", "p1");
+ _auctionServiceMock.Setup(s => s.GetBid("b1")).ReturnsAsync(bid);
+ var model = new ProductModel.BidModel { ProductId = "p1", BidId = "b1" };
+
+ var result = await _controller.BidDelete(model);
+
+ Assert.IsInstanceOfType<JsonResult>(result);
+ _auctionServiceMock.Verify(s => s.DeleteBid(bid), Times.Once);
+ }
+
+ [TestMethod]
+ public async Task BidDelete_BidNotFound_ReturnsErrorsJson_NoOp()
+ {
+ var product = new Product { Id = "p1" };
+ _productServiceMock.Setup(p => p.GetProductById("p1")).ReturnsAsync(product);
+ _scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(true);
+ _auctionServiceMock.Setup(s => s.GetBid("missing")).ReturnsAsync((Bid)null);
+ var model = new ProductModel.BidModel { ProductId = "p1", BidId = "missing" };
+
+ var result = await _controller.BidDelete(model);
+
+ var json = result as JsonResult;
+ Assert.IsNotNull(json);
+ var gridModel = json.Value as Grand.Web.Common.DataSource.DataSourceResult;
+ Assert.IsNotNull(gridModel);
+ Assert.AreEqual("Bid not exists", gridModel.Errors);
+ _auctionServiceMock.Verify(s => s.DeleteBid(It.IsAny<Bid>()), Times.Never);
+ }
}
diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs
index 281242880..6bc2ab8cb 100644
--- a/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs
+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs
@@ -3329,4 +3329,69 @@ public abstract class BaseProductController(
}
#endregion
+
+ #region Bids
+
+ [PermissionAuthorizeAction(PermissionActionName.Preview)]
+ [HttpPost]
+ public async Task<IActionResult> ListBids(DataSourceRequest command, string productId)
+ {
+ var product = await productService.GetProductById(productId);
+ if (product == null)
+ throw new ArgumentException("No product found with the specified id");
+
+ // HasAccess: mirrors Store's CanAccessProduct and Vendor's HasAccessToProduct checks; Admin's
+ // original had no check at all - normalized to scope.HasAccess for all three hosts.
+ if (!await scope.HasAccess(product))
+ return ErrorForKendoGridJson(translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.Permissions"));
+
+ var (bidModels, totalCount) =
+ await productViewModelService.PrepareBidMode(productId, command.Page, command.PageSize);
+ var gridModel = new DataSourceResult {
+ Data = bidModels.ToList(),
+ Total = totalCount
+ };
+ return Json(gridModel);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> BidDelete(ProductModel.BidModel model)
+ {
+ var product = await productService.GetProductById(model.ProductId);
+ if (product == null)
+ throw new ArgumentException("No product found with the specified id");
+
+ if (!await scope.HasAccess(product))
+ return ErrorForKendoGridJson(translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.Permissions"));
+
+ var toDelete = await auctionService.GetBid(model.BidId);
+
+ // Cross-product IDOR closed here, identical shape to ProductReservationDelete above: none of the
+ // three original hosts verified that the bid being deleted (looked up purely by model.BidId)
+ // actually belongs to the product just access-checked (model.ProductId). Both are independent,
+ // attacker-supplied POST fields - Store and Vendor's original code let a caller who owns/has
+ // access to *any* product pass the access check using that product's id while supplying a BidId
+ // belonging to a different, unowned product, deleting a bid on a product they have no access to.
+ if (toDelete != null && toDelete.ProductId != product.Id)
+ return ErrorForKendoGridJson(translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.Permissions"));
+
+ if (toDelete != null)
+ {
+ if (string.IsNullOrEmpty(toDelete.OrderId))
+ {
+ //delete bid
+ await auctionService.DeleteBid(toDelete);
+ return Json("");
+ }
+
+ return Json(new DataSourceResult {
+ Errors = translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.Bids.CantDeleteWithOrder")
+ });
+ }
+
+ return Json(new DataSourceResult { Errors = "Bid not exists" });
+ }
+
+ #endregion
}