Skip to content

Fix vendor product IDORs and consolidate ownership checks in Grand.Web.Vendor #782

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KrzysztofPajak merged 1 commit into from
Aug 14, 2026
Merged

Fix vendor product IDORs and consolidate ownership checks in Grand.Web.Vendor #782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/Web/Grand.Web.Vendor/Controllers/MerchandiseReturnController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ await _merchandiseReturnViewModelService.PrepareMerchandiseReturnModel(model, co
public async Task<IActionResult> GoToId(MerchandiseReturnListModel model)
{
var merchandiseReturn = await _merchandiseReturnService.GetMerchandiseReturnById(model.GoDirectlyToId);
if (merchandiseReturn == null || merchandiseReturn.VendorId != _contextAccessor.WorkContext.CurrentVendor.Id)
if (merchandiseReturn == null || !_contextAccessor.WorkContext.HasAccessToMerchandiseReturn(merchandiseReturn))
//not found
return RedirectToAction("List", "MerchandiseReturn");

Expand All @@ -89,7 +89,7 @@ public async Task<IActionResult> GoToId(MerchandiseReturnListModel model)
public async Task<IActionResult> ProductsForMerchandiseReturn(string merchandiseReturnId)
{
var merchandiseReturn = await _merchandiseReturnService.GetMerchandiseReturnById(merchandiseReturnId);
if (merchandiseReturn == null || merchandiseReturn.VendorId != _contextAccessor.WorkContext.CurrentVendor.Id)
if (merchandiseReturn == null || !_contextAccessor.WorkContext.HasAccessToMerchandiseReturn(merchandiseReturn))
return ErrorForKendoGridJson("Merchandise return not found");

var items = await _merchandiseReturnViewModelService.PrepareMerchandiseReturnItemModel(merchandiseReturnId);
Expand All @@ -106,7 +106,7 @@ public async Task<IActionResult> ProductsForMerchandiseReturn(string merchandise
public async Task<IActionResult> Edit(string id)
{
var merchandiseReturn = await _merchandiseReturnService.GetMerchandiseReturnById(id);
if (merchandiseReturn == null || merchandiseReturn.VendorId != _contextAccessor.WorkContext.CurrentVendor.Id)
if (merchandiseReturn == null || !_contextAccessor.WorkContext.HasAccessToMerchandiseReturn(merchandiseReturn))
//No merchandise return found with the specified id
return RedirectToAction("List");

Expand All @@ -125,7 +125,7 @@ [FromServices] OrderSettings orderSettings
)
{
var merchandiseReturn = await _merchandiseReturnService.GetMerchandiseReturnById(model.Id);
if (merchandiseReturn == null || merchandiseReturn.VendorId != _contextAccessor.WorkContext.CurrentVendor.Id)
if (merchandiseReturn == null || !_contextAccessor.WorkContext.HasAccessToMerchandiseReturn(merchandiseReturn))
//No merchandise return found with the specified id
return RedirectToAction("List");

Expand Down Expand Up @@ -157,7 +157,7 @@ await _merchandiseReturnViewModelService.UpdateMerchandiseReturnModel(merchandis
public async Task<IActionResult> Delete(string id)
{
var merchandiseReturn = await _merchandiseReturnService.GetMerchandiseReturnById(id);
if (merchandiseReturn == null || merchandiseReturn.VendorId != _contextAccessor.WorkContext.CurrentVendor.Id)
if (merchandiseReturn == null || !_contextAccessor.WorkContext.HasAccessToMerchandiseReturn(merchandiseReturn))
//No merchandise return found with the specified id
return RedirectToAction("List");

Expand All @@ -181,7 +181,7 @@ public async Task<IActionResult> Delete(string id)
public async Task<IActionResult> MerchandiseReturnNotesSelect(string merchandiseReturnId)
{
var merchandiseReturn = await _merchandiseReturnService.GetMerchandiseReturnById(merchandiseReturnId);
if (merchandiseReturn == null || merchandiseReturn.VendorId != _contextAccessor.WorkContext.CurrentVendor.Id)
if (merchandiseReturn == null || !_contextAccessor.WorkContext.HasAccessToMerchandiseReturn(merchandiseReturn))
throw new ArgumentException("No merchandise return found with the specified id");

//merchandise return notes
Expand All @@ -199,7 +199,7 @@ public async Task<IActionResult> MerchandiseReturnNoteAdd(string merchandiseRetu
string message)
{
var merchandiseReturn = await _merchandiseReturnService.GetMerchandiseReturnById(merchandiseReturnId);
if (merchandiseReturn == null || merchandiseReturn.VendorId != _contextAccessor.WorkContext.CurrentVendor.Id)
if (merchandiseReturn == null || !_contextAccessor.WorkContext.HasAccessToMerchandiseReturn(merchandiseReturn))
return Json(new { Result = false });

await _merchandiseReturnViewModelService.InsertMerchandiseReturnNote(merchandiseReturn, displayToCustomer,
Expand All @@ -213,7 +213,7 @@ await _merchandiseReturnViewModelService.InsertMerchandiseReturnNote(merchandise
public async Task<IActionResult> MerchandiseReturnNoteDelete(string id, string merchandiseReturnId)
{
var merchandiseReturn = await _merchandiseReturnService.GetMerchandiseReturnById(merchandiseReturnId);
if (merchandiseReturn == null || merchandiseReturn.VendorId != _contextAccessor.WorkContext.CurrentVendor.Id)
if (merchandiseReturn == null || !_contextAccessor.WorkContext.HasAccessToMerchandiseReturn(merchandiseReturn))
throw new ArgumentException("No merchandise return found with the specified id");

await _merchandiseReturnViewModelService.DeleteMerchandiseReturnNote(merchandiseReturn, id);
Expand Down
Loading
Loading