Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Fixed unsafe parameter permitting in `Admin::NavigationHelper#per_page_dropdown_params`

Damian Legawiec42e8cd1cf46c
diff --git a/admin/app/helpers/spree/admin/navigation_helper.rb b/admin/app/helpers/spree/admin/navigation_helper.rb
index 010f87b060..de310d3a63 100644
--- a/admin/app/helpers/spree/admin/navigation_helper.rb
+++ b/admin/app/helpers/spree/admin/navigation_helper.rb
@@ -52,11 +52,9 @@ module Spree
# @param per_page [Integer] the number of items per page
# @return [Hash] the params to apply per page
def per_page_dropdown_params(per_page)
- args = params.permit!.to_h.clone
- args.delete(:page)
- args.delete(:per_page)
- args.merge!(per_page: per_page)
- args
+ # Keep only safe query params that should survive pagination changes
+ safe_params = request.query_parameters.slice(:q)
+ safe_params.merge(per_page: per_page, page: nil)
end
# render a button link to edit a resource
diff --git a/admin/app/views/spree/admin/shared/_index_table_options.html.erb b/admin/app/views/spree/admin/shared/_index_table_options.html.erb
index e981888b33..298ba9f231 100644
--- a/admin/app/views/spree/admin/shared/_index_table_options.html.erb
+++ b/admin/app/views/spree/admin/shared/_index_table_options.html.erb
@@ -5,7 +5,7 @@
<% args[:action] = per_page_action %>
<% end %>
-<% if collection.any? && collection.total_pages > 1 %>
+<% if collection.any? %>
<div class="py-2 border-top">
<div class="index-pagination-row d-flex align-items-center">
<div class="col-6 col-lg-3">