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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Improve `redirect_to_default_locale` method to only pass safe parameters (#12745)
Damian Legawiec3d20a34860aa
diff --git a/storefront/app/controllers/concerns/spree/locale_urls.rb b/storefront/app/controllers/concerns/spree/locale_urls.rbindex 76fdf2a931..4fd562dffa 100644--- a/storefront/app/controllers/concerns/spree/locale_urls.rb+++ b/storefront/app/controllers/concerns/spree/locale_urls.rb@@ -21,7 +21,19 @@ module Spreedef redirect_to_default_localereturn if params[:locale].blank? || supported_locale?(params[:locale])- redirect_to url_for(request.parameters.merge(locale: nil))+ # Only include safe parameters in the redirect+ safe_params = {+ controller: params[:controller],+ action: params[:action],+ locale: nil+ }++ # Add any additional safe parameters that should be preserved+ %i[id format currency category_id tag].each do |param|+ safe_params[param] = params[param] if params[param].present?+ end++ redirect_to url_for(safe_params)endendenddiff --git a/storefront/spec/controllers/concerns/spree/locale_urls_spec.rb b/storefront/spec/controllers/concerns/spree/locale_urls_spec.rbindex b09d1f0bda..d29622f025 100644--- a/storefront/spec/controllers/concerns/spree/locale_urls_spec.rb+++ b/storefront/spec/controllers/concerns/spree/locale_urls_spec.rb@@ -62,7 +62,7 @@ module Spreecontext 'when locale param is present but not supported' doit 'redirects to URL without locale' doallow(controller).to receive(:supported_locale?).with('xx').and_return(false)- expect(controller).to receive(:url_for).with({ 'locale' => nil, 'action' => 'index', 'controller' => 'anonymous' }).and_return('/anonymous/index')+ expect(controller).to receive(:url_for).with({ locale: nil, action: 'index', controller: 'anonymous' }).and_return('/anonymous/index')get :index, params: { locale: 'xx' }expect(response).to redirect_to('/anonymous/index')end