This is an automated email from the ASF dual-hosted git repository.
ashishvijaywargiya pushed a commit to branch release24.09
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release24.09 by this push:
new 4f988acd4b Improved: Reuse existing catalog permission checks for
search-result bulk actions (#1735) (#1738)
4f988acd4b is described below
commit 4f988acd4b31980b8fa4aa9e4191c240fd01c63a
Author: Ashish Vijaywargiya <[email protected]>
AuthorDate: Wed Aug 26 16:52:11 2026 +0530
Improved: Reuse existing catalog permission checks for search-result bulk
actions (#1735) (#1738)
- The search-result bulk actions (remove/expire/add category membership,
add/remove product feature) now call the same permission services
already used by the equivalent single-record catalog services, before
running.
- Category membership actions call
checkCategoryPermissionWithViewPurchaseAllow; feature association
actions call productGenericPermission — matching the checks their
single-record counterparts already require.
Thank you Krishna Uprit for the contribution.
(cherry picked from commit 34d2c014b3ed99862d9905bd6553d6bb52c78ef0)
Co-authored-by: Krishna Uprit <[email protected]>
Co-authored-by: Krishnauprit18 <[email protected]>
---
.../ofbiz/product/product/ProductSearchEvents.java | 65 ++++++++++++++++++++++
1 file changed, 65 insertions(+)
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchEvents.java
b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchEvents.java
index 6a151324df..04820860c0 100644
---
a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchEvents.java
+++
b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchEvents.java
@@ -44,6 +44,9 @@ import org.apache.ofbiz.entity.util.EntityListIterator;
import org.apache.ofbiz.entity.util.EntityQuery;
import org.apache.ofbiz.product.product.ProductSearch.ProductSearchContext;
import org.apache.ofbiz.product.product.ProductSearch.ResultSortOrder;
+import org.apache.ofbiz.service.GenericServiceException;
+import org.apache.ofbiz.service.LocalDispatcher;
+import org.apache.ofbiz.service.ServiceUtil;
import org.apache.ofbiz.webapp.stats.VisitHandler;
/**
@@ -55,6 +58,35 @@ public class ProductSearchEvents {
private static final String MODULE = ProductSearchEvents.class.getName();
private static final String RESOURCE = "ProductErrorUiLabels";
+ /**
+ * Checks whether the current user may bulk-mutate the products in the
current search
+ * results, using the same permission service the equivalent single-record
catalog
+ * service already requires.
+ * @return null if permission is granted; otherwise the error message to
show the user
+ */
+ private static String checkSearchMutationPermission(HttpServletRequest
request, String permissionServiceName,
+ Map<String, Object> extraContext) {
+ LocalDispatcher dispatcher = (LocalDispatcher)
request.getAttribute("dispatcher");
+ GenericValue userLogin = (GenericValue)
request.getSession().getAttribute("userLogin");
+ Map<String, Object> permSvcCtx = new HashMap<>(extraContext);
+ permSvcCtx.put("userLogin", userLogin);
+ try {
+ Map<String, Object> permSvcResp =
dispatcher.runSync(permissionServiceName, permSvcCtx);
+ if (ServiceUtil.isError(permSvcResp)) {
+ return ServiceUtil.getErrorMessage(permSvcResp);
+ }
+ if (!Boolean.TRUE.equals(permSvcResp.get("hasPermission"))) {
+ String failMessage = (String) permSvcResp.get("failMessage");
+ return UtilValidate.isNotEmpty(failMessage) ? failMessage
+ : UtilProperties.getMessage("ProductUiLabels",
"ProductPermissionError", UtilHttp.getLocale(request));
+ }
+ } catch (GenericServiceException e) {
+ Debug.logError(e, MODULE);
+ return e.getMessage();
+ }
+ return null;
+ }
+
/**
* Removes the results of a search from the specified category
* @param request The HTTPRequest object for the current request
@@ -66,6 +98,13 @@ public class ProductSearchEvents {
String productCategoryId =
request.getParameter("SE_SEARCH_CATEGORY_ID");
String errMsg = null;
+ String permError = checkSearchMutationPermission(request,
"checkCategoryPermissionWithViewPurchaseAllow",
+ UtilMisc.toMap("mainAction", "DELETE", "productCategoryId",
productCategoryId));
+ if (permError != null) {
+ request.setAttribute("_ERROR_MESSAGE_", permError);
+ return "error";
+ }
+
try {
boolean beganTransaction =
TransactionUtil.begin(DEFAULT_TX_TIMEOUT);
try (EntityListIterator eli = getProductSearchResults(request)) {
@@ -119,6 +158,13 @@ public class ProductSearchEvents {
String thruDateStr = request.getParameter("thruDate");
String errMsg = null;
+ String permError = checkSearchMutationPermission(request,
"checkCategoryPermissionWithViewPurchaseAllow",
+ UtilMisc.toMap("mainAction", "UPDATE", "productCategoryId",
productCategoryId));
+ if (permError != null) {
+ request.setAttribute("_ERROR_MESSAGE_", permError);
+ return "error";
+ }
+
Timestamp thruDate;
try {
thruDate = Timestamp.valueOf(thruDateStr);
@@ -195,6 +241,13 @@ public class ProductSearchEvents {
Timestamp fromDate = null;
String errMsg = null;
+ String permError = checkSearchMutationPermission(request,
"checkCategoryPermissionWithViewPurchaseAllow",
+ UtilMisc.toMap("mainAction", "CREATE", "productCategoryId",
productCategoryId));
+ if (permError != null) {
+ request.setAttribute("_ERROR_MESSAGE_", permError);
+ return "error";
+ }
+
try {
fromDate = Timestamp.valueOf(fromDateStr);
} catch (RuntimeException e) {
@@ -264,6 +317,12 @@ public class ProductSearchEvents {
Delegator delegator = (Delegator) request.getAttribute("delegator");
Locale locale = UtilHttp.getLocale(request);
+ String permError = checkSearchMutationPermission(request,
"productGenericPermission", UtilMisc.toMap("mainAction", "CREATE"));
+ if (permError != null) {
+ request.setAttribute("_ERROR_MESSAGE_", permError);
+ return "error";
+ }
+
String productFeatureId = request.getParameter("productFeatureId");
String fromDateStr = request.getParameter("fromDate");
String thruDateStr = request.getParameter("thruDate");
@@ -353,6 +412,12 @@ public class ProductSearchEvents {
Delegator delegator = (Delegator) request.getAttribute("delegator");
Locale locale = UtilHttp.getLocale(request);
+ String permError = checkSearchMutationPermission(request,
"productGenericPermission", UtilMisc.toMap("mainAction", "DELETE"));
+ if (permError != null) {
+ request.setAttribute("_ERROR_MESSAGE_", permError);
+ return "error";
+ }
+
String productFeatureId = request.getParameter("productFeatureId");
try {
