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
Harden Admin API resource scopes and added missing permission checks (#14187)
Damian Legawieccd9e3036845d
diff --git a/spree/api/app/controllers/spree/api/v3/admin/channels_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/channels_controller.rbindex c6205101e1..e1d1fbfc6f 100644--- a/spree/api/app/controllers/spree/api/v3/admin/channels_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/admin/channels_controller.rb@@ -49,14 +49,12 @@ module Spreeprivate- # Deliberately not scoped through `for_store` — this endpoint is the- # path by which a product *enters* the store, so requiring an- # existing publication would block first-time onboarding. The- # cross-store guard runs one level up: `find_resource` already- # restricted the channel to `current_store`.+ # Scoped to the current store: a product can only be published to a+ # channel of the store that owns it (products are single-owner via+ # `belongs_to :store`). Foreign product IDs are silently dropped.def scoped_product_idsids = decode_prefixed_ids(params[:product_ids])- Spree::Product.accessible_by(current_ability, :update).where(id: ids).ids+ current_store.products.accessible_by(current_ability, :update).where(id: ids).idsendendenddiff --git a/spree/api/app/controllers/spree/api/v3/admin/coupon_codes_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/coupon_codes_controller.rbindex 59cc0c3f6a..23dec92105 100644--- a/spree/api/app/controllers/spree/api/v3/admin/coupon_codes_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/admin/coupon_codes_controller.rb@@ -19,8 +19,8 @@ module Spreeenddef set_parent- @parent = Spree::Promotion.accessible_by(current_ability, :show)- .find_by_prefix_id!(params[:promotion_id])+ @parent = current_store.promotions.accessible_by(current_ability, :show)+ .find_by_prefix_id!(params[:promotion_id])enddef parent_associationdiff --git a/spree/api/app/controllers/spree/api/v3/admin/custom_fields_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/custom_fields_controller.rbindex 946e595d46..b76114505b 100644--- a/spree/api/app/controllers/spree/api/v3/admin/custom_fields_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/admin/custom_fields_controller.rb@@ -54,7 +54,7 @@ module Spreeraise ActiveRecord::RecordNotFound, 'Parent resource not found' unless parent_lookup@parent = parent_relation.find_by_prefix_id!(parent_lookup.value)- authorize!(:show, @parent)+ authorize!(:update, @parent)end# Resolves the parent within the current store so a token for onediff --git a/spree/api/app/controllers/spree/api/v3/admin/media_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/media_controller.rbindex 4cc430b532..7c8d5090fb 100644--- a/spree/api/app/controllers/spree/api/v3/admin/media_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/admin/media_controller.rb@@ -34,7 +34,7 @@ module Spreedef set_parent@product = current_store.products.find_by_prefix_id!(params[:product_id])- authorize!(:show, @product)+ authorize!(:update, @product)@parent = if params[:variant_id].present?@product.variants_including_master.find_by_prefix_id!(params[:variant_id])diff --git a/spree/api/app/controllers/spree/api/v3/admin/orders/fulfillments_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/orders/fulfillments_controller.rbindex b6ac73a633..78690d72b6 100644--- a/spree/api/app/controllers/spree/api/v3/admin/orders/fulfillments_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/admin/orders/fulfillments_controller.rb@@ -57,11 +57,11 @@ module Spree# PATCH /api/v3/admin/orders/:order_id/fulfillments/:id/splitdef splitwith_order_lock do- variant = Spree::Variant.find_by_prefix_id!(params[:variant_id])+ variant = current_store.variants.find_by_prefix_id!(params[:variant_id])quantity = params[:quantity].to_istock_location = if params[:stock_location_id].present?- Spree::StockLocation.find_by_prefix_id!(params[:stock_location_id])+ Spree::StockLocation.accessible_by(current_ability, :show).find_by_prefix_id!(params[:stock_location_id])else@resource.stock_locationenddiff --git a/spree/api/app/controllers/spree/api/v3/admin/orders/payments_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/orders/payments_controller.rbindex 9f7b8f9e4d..0c1e764530 100644--- a/spree/api/app/controllers/spree/api/v3/admin/orders/payments_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/admin/orders/payments_controller.rb@@ -15,7 +15,7 @@ module Spree# The source must belong to the customer assigned to the order.def createwith_order_lock do- payment_method = Spree::PaymentMethod.find_by_prefix_id!(params[:payment_method_id])+ payment_method = current_store.payment_methods.accessible_by(current_ability, :show).find_by_prefix_id!(params[:payment_method_id])@resource = @parent.payments.build(amount: params[:amount] || @parent.order_total_after_store_credit,payment_method: payment_methoddiff --git a/spree/api/app/controllers/spree/api/v3/admin/orders/refunds_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/orders/refunds_controller.rbindex 8c37034768..8ffd991e6e 100644--- a/spree/api/app/controllers/spree/api/v3/admin/orders/refunds_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/admin/orders/refunds_controller.rb@@ -9,9 +9,9 @@ module Spree# POST /api/v3/admin/orders/:order_id/refundsdef createwith_order_lock do- payment = @parent.payments.find_by_prefix_id!(params[:payment_id])- reason = Spree::RefundReason.find_by_prefix_id!(params[:refund_reason_id]) if params[:refund_reason_id].present?- reason ||= Spree::RefundReason.first+ payment = @parent.payments.accessible_by(current_ability, :update).find_by_prefix_id!(params[:payment_id])+ reason = Spree::RefundReason.accessible_by(current_ability, :show).find_by_prefix_id!(params[:refund_reason_id]) if params[:refund_reason_id].present?+ reason ||= Spree::RefundReason.accessible_by(current_ability, :show).first@resource = payment.refunds.build(amount: params[:amount],diff --git a/spree/api/app/controllers/spree/api/v3/admin/prices_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/prices_controller.rbindex 19d5b1a020..c6e327da15 100644--- a/spree/api/app/controllers/spree/api/v3/admin/prices_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/admin/prices_controller.rb@@ -35,7 +35,13 @@ module Spree)end- foreign = foreign_rows(rows)+ store_variant_ids = store_variants.where(id: rows.map { |r| r[:variant_id] }).ids.map(&:to_s).to_set+ store_price_list_ids = store_price_lists.where(id: rows.filter_map { |r| r[:price_list_id] }).ids.map(&:to_s).to_set+ foreign = rows.each_with_index.filter_map do |row, idx|+ variant_ok = store_variant_ids.include?(row[:variant_id].to_s)+ price_list_ok = row[:price_list_id].blank? || store_price_list_ids.include?(row[:price_list_id].to_s)+ { index: idx } unless variant_ok && price_list_ok+ endif foreign.any?return render_error(code: 'invalid_prices',@@ -91,14 +97,26 @@ module Spreefalseend+ # Resolves variant_id / price_list_id through the current store's+ # scopes so a foreign or unknown id 404s instead of binding the+ # price to another store's record.def permitted_params- normalize_params(- params.permit(:variant_id, :currency, :amount, :compare_at_amount, :price_list_id)- )+ permitted = params.permit(:variant_id, :currency, :amount, :compare_at_amount, :price_list_id)+ permitted[:variant_id] = store_variants.find_by_prefix_id!(permitted[:variant_id]).id if permitted[:variant_id].present?+ permitted[:price_list_id] = store_price_lists.find_by_prefix_id!(permitted[:price_list_id]).id if permitted[:price_list_id].present?+ permittedendprivate+ def store_variants+ current_store.variants.accessible_by(current_ability, :update)+ end++ def store_price_lists+ current_store.price_lists.accessible_by(current_ability, :update)+ end+def bulk_record_count_key:price_countend@@ -132,24 +150,6 @@ module SpreeSpree::PrefixedId.prefixed_id?(value) ? Spree::PrefixedId.decode_prefixed_id(value) : valueend-- # Rejects rows whose variant or price list belongs to another store.- # `Spree::Prices::BulkUpsert` writes rows keyed on the raw variant_id- # with no ownership check, so the store boundary is enforced here.- def foreign_rows(rows)- variant_ids = rows.map { |r| r[:variant_id] }.compact.uniq- price_list_ids = rows.map { |r| r[:price_list_id] }.compact.uniq-- store_variant_ids = current_store.variants.where(id: variant_ids).pluck(:id).map(&:to_s).to_set- store_price_list_ids = Spree::PriceList.for_store(current_store).where(id: price_list_ids).pluck(:id).map(&:to_s).to_set-- rows.each_with_index.filter_map do |row, idx|- variant_ok = store_variant_ids.include?(row[:variant_id].to_s)- price_list_ok = row[:price_list_id].blank? || store_price_list_ids.include?(row[:price_list_id].to_s)-- { index: idx } unless variant_ok && price_list_ok- end- endendendenddiff --git a/spree/api/app/controllers/spree/api/v3/admin/promotion_actions_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/promotion_actions_controller.rbindex de476b1e03..ffaf25ad0a 100644--- a/spree/api/app/controllers/spree/api/v3/admin/promotion_actions_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/admin/promotion_actions_controller.rb@@ -58,8 +58,8 @@ module Spreedef set_parentreturn if %w[types calculators].include?(action_name)- @parent = Spree::Promotion.accessible_by(current_ability, :show)- .find_by_prefix_id!(params[:promotion_id])+ @parent = current_store.promotions.accessible_by(current_ability, :update)+ .find_by_prefix_id!(params[:promotion_id])enddef parent_associationdiff --git a/spree/api/app/controllers/spree/api/v3/admin/promotion_rules_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/promotion_rules_controller.rbindex e522b35d49..239642c793 100644--- a/spree/api/app/controllers/spree/api/v3/admin/promotion_rules_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/admin/promotion_rules_controller.rb@@ -36,8 +36,8 @@ module Spreedef set_parentreturn if action_name == 'types'- @parent = Spree::Promotion.accessible_by(current_ability, :show)- .find_by_prefix_id!(params[:promotion_id])+ @parent = current_store.promotions.accessible_by(current_ability, :update)+ .find_by_prefix_id!(params[:promotion_id])enddef parent_associationdiff --git a/spree/api/app/controllers/spree/api/v3/admin/stock_transfers_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/stock_transfers_controller.rbindex 42b444786e..b3c307f2eb 100644--- a/spree/api/app/controllers/spree/api/v3/admin/stock_transfers_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/admin/stock_transfers_controller.rb@@ -11,9 +11,10 @@ module Spreedef createauthorize!(:create, model_class)- destination = Spree::StockLocation.find_by_prefix_id!(params[:destination_location_id])+ stock_locations = Spree::StockLocation.accessible_by(current_ability, :show)+ destination = stock_locations.find_by_prefix_id!(params[:destination_location_id])source = params[:source_location_id].present? ?- Spree::StockLocation.find_by_prefix_id!(params[:source_location_id]) : nil+ stock_locations.find_by_prefix_id!(params[:source_location_id]) : nilvariants_map = build_variants_mapif variants_map.empty?@@ -63,7 +64,7 @@ module Spreehash[decoded.to_i] = entry[:quantity].to_i if decodedend- Spree::Variant.where(id: quantities_by_id.keys).each_with_object({}) do |variant, acc|+ current_store.variants.accessible_by(current_ability, :update).where(id: quantities_by_id.keys).each_with_object({}) do |variant, acc|quantity = quantities_by_id[variant.id]acc[variant] = quantity if quantity&.positive?enddiff --git a/spree/api/spec/controllers/spree/api/v3/admin/channels_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/channels_controller_spec.rbindex 0d4bcc1791..b37018b747 100644--- a/spree/api/spec/controllers/spree/api/v3/admin/channels_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/admin/channels_controller_spec.rb@@ -51,7 +51,7 @@ RSpec.describe Spree::Api::V3::Admin::ChannelsController, type: :controller doexpect(channel.reload.products).to include(fresh)end- it 'co-publishes a product from another store onto this channel' do+ it 'does not publish a product owned by another store' doother_store = create(:store)cross_store = create(:product, store: other_store)@@ -60,7 +60,8 @@ RSpec.describe Spree::Api::V3::Admin::ChannelsController, type: :controller do}, as: :jsonexpect(response).to have_http_status(:ok)- expect(channel.reload.products).to include(cross_store)+ expect(json_response['product_count']).to eq(0)+ expect(channel.reload.products).not_to include(cross_store)endit 'accepts an ISO8601 published_at window' dodiff --git a/spree/api/spec/controllers/spree/api/v3/admin/coupon_codes_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/coupon_codes_controller_spec.rbnew file mode 100644index 0000000000..6af4f48f12--- /dev/null+++ b/spree/api/spec/controllers/spree/api/v3/admin/coupon_codes_controller_spec.rb@@ -0,0 +1,32 @@+require 'spec_helper'++RSpec.describe Spree::Api::V3::Admin::CouponCodesController, type: :controller do+ render_views++ include_context 'API v3 Admin authenticated'++ def multi_code_promotion(promo_store)+ create(:promotion, stores: [promo_store], multi_codes: true, number_of_codes: 2, code_prefix: 'SAVE')+ end++ let!(:promotion) { multi_code_promotion(store) }++ before { request.headers.merge!(headers) }++ describe 'GET #index' do+ it 'lists coupon codes for a promotion in the current store' do+ get :index, params: { promotion_id: promotion.prefixed_id }, as: :json++ expect(response).to have_http_status(:ok)+ expect(json_response['data']).to be_present+ end++ it "404s when reading coupon codes of another store's promotion" do+ foreign_promotion = multi_code_promotion(create(:store))++ get :index, params: { promotion_id: foreign_promotion.prefixed_id }, as: :json++ expect(response).to have_http_status(:not_found)+ end+ end+enddiff --git a/spree/api/spec/controllers/spree/api/v3/admin/orders/payments_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/orders/payments_controller_spec.rbindex d52b1cff5b..0ca45bb8dd 100644--- a/spree/api/spec/controllers/spree/api/v3/admin/orders/payments_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/admin/orders/payments_controller_spec.rb@@ -61,6 +61,24 @@ RSpec.describe Spree::Api::V3::Admin::Orders::PaymentsController, type: :controlexpect(response).to have_http_status(:not_found)end+ context 'when payment_method belongs to a different store' do+ let(:other_store) { create(:store) }+ let(:other_store_payment_method) do+ create(:check_payment_method, stores: [other_store])+ end++ it 'returns 404 and does not attach the cross-store method' do+ post :create, params: {+ order_id: order.prefixed_id,+ payment_method_id: other_store_payment_method.prefixed_id,+ amount: order.total+ }, as: :json++ expect(response).to have_http_status(:not_found)+ expect(order.reload.payments.count).to eq(0)+ end+ end+context 'when payment_method does not require a source' doit 'ignores source_id silently' dopost :create, params: {diff --git a/spree/api/spec/controllers/spree/api/v3/admin/prices_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/prices_controller_spec.rbindex fd0d787f86..7bd6a348cc 100644--- a/spree/api/spec/controllers/spree/api/v3/admin/prices_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/admin/prices_controller_spec.rb@@ -324,6 +324,69 @@ RSpec.describe Spree::Api::V3::Admin::PricesController, type: :controller doendend+ describe 'POST #create' do+ it 'creates a price on a variant in the current store' do+ eur_variant = create(:variant, product: product)++ post :create, params: {+ variant_id: eur_variant.prefixed_id, currency: 'EUR', amount: '9.99'+ }, as: :json++ expect(response).to have_http_status(:created)+ expect(eur_variant.prices.find_by(currency: 'EUR')&.amount).to eq(BigDecimal('9.99'))+ end++ context 'cross-store IDOR' do+ let(:other_store) { create(:store) }+ let(:other_variant) { create(:product, store: other_store).master }++ it "404s when writing a price on another store's variant" do+ expect do+ post :create, params: {+ variant_id: other_variant.prefixed_id, currency: 'EUR', amount: '0.01'+ }, as: :json+ end.not_to change { other_variant.prices.where(currency: 'EUR').count }++ expect(response).to have_http_status(:not_found)+ end++ it "404s when attaching a price to another store's price list" do+ other_list = create(:price_list, store: other_store)++ post :create, params: {+ variant_id: variant.prefixed_id,+ currency: 'EUR',+ amount: '9.99',+ price_list_id: other_list.prefixed_id+ }, as: :json++ expect(response).to have_http_status(:not_found)+ end+ end+ end++ describe 'PATCH #update' do+ let!(:base_price) { variant.prices.find_by!(currency: 'USD', price_list_id: nil) }++ it 'updates a price on a variant in the current store' do+ patch :update, params: { id: base_price.prefixed_id, amount: '12.50' }, as: :json++ expect(response).to have_http_status(:ok)+ expect(base_price.reload.amount).to eq(BigDecimal('12.50'))+ end++ it "404s when rebinding a price to another store's variant" do+ other_variant = create(:product, store: create(:store)).master++ patch :update, params: {+ id: base_price.prefixed_id, variant_id: other_variant.prefixed_id+ }, as: :json++ expect(response).to have_http_status(:not_found)+ expect(base_price.reload.variant_id).to eq(variant.id)+ end+ end+describe 'DELETE #bulk_destroy' dolet!(:to_delete) docreate(:price, variant: variant, price_list: price_list, currency: 'USD', amount: 5.0)diff --git a/spree/api/spec/controllers/spree/api/v3/admin/products_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/products_controller_spec.rbindex 9f5aca800f..1273c714ed 100644--- a/spree/api/spec/controllers/spree/api/v3/admin/products_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/admin/products_controller_spec.rb@@ -753,6 +753,19 @@ RSpec.describe Spree::Api::V3::Admin::ProductsController, type: :controller doexpect(response).to have_http_status(:ok)expect(product.reload.taxons.where(taxonomy: taxonomy)).to be_emptyend++ it "ignores a category that belongs to another store's taxonomy" do+ foreign_taxon = create(:taxon, taxonomy: create(:taxonomy, store: create(:store)))++ patch :update, params: {+ id: product.prefixed_id,+ category_ids: [category1.prefixed_id, foreign_taxon.prefixed_id]+ }, as: :json++ expect(response).to have_http_status(:ok)+ expect(product.reload.taxons).to include(category1)+ expect(product.reload.taxons).not_to include(foreign_taxon)+ endendcontext 'with tags' do@@ -838,6 +851,22 @@ RSpec.describe Spree::Api::V3::Admin::ProductsController, type: :controller doexpect(response).to have_http_status(:ok)expect(product.reload.channels).to contain_exactly(default_channel)end++ it "ignores a channel that belongs to another store" do+ foreign_channel = create(:channel, store: create(:store), code: 'foreign')++ patch :update, params: {+ id: product.prefixed_id,+ product_publications: [+ { channel_id: pos_channel.prefixed_id },+ { channel_id: foreign_channel.prefixed_id }+ ]+ }, as: :json++ expect(response).to have_http_status(:ok)+ expect(product.reload.channels).to include(pos_channel)+ expect(product.reload.channels).not_to include(foreign_channel)+ endendcontext 'with invalid params' dodiff --git a/spree/api/spec/controllers/spree/api/v3/admin/promotion_actions_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/promotion_actions_controller_spec.rbnew file mode 100644index 0000000000..49ecf38dd3--- /dev/null+++ b/spree/api/spec/controllers/spree/api/v3/admin/promotion_actions_controller_spec.rb@@ -0,0 +1,47 @@+require 'spec_helper'++RSpec.describe Spree::Api::V3::Admin::PromotionActionsController, type: :controller do+ render_views++ include_context 'API v3 Admin authenticated'++ let!(:promotion) { create(:promotion, stores: [store]) }++ before { request.headers.merge!(headers) }++ describe 'POST #create' do+ it 'creates an action on a promotion in the current store' do+ post :create, params: {+ promotion_id: promotion.prefixed_id,+ type: 'create_adjustment'+ }, as: :json++ expect(response).to have_http_status(:created)+ expect(promotion.reload.promotion_actions.map(&:type))+ .to include('Spree::Promotion::Actions::CreateAdjustment')+ end++ it "404s for a promotion that belongs to another store" do+ foreign_promotion = create(:promotion, stores: [create(:store)])++ post :create, params: {+ promotion_id: foreign_promotion.prefixed_id,+ type: 'create_adjustment'+ }, as: :json++ expect(response).to have_http_status(:not_found)+ expect(foreign_promotion.reload.promotion_actions).to be_empty+ end+ end++ describe 'GET #index' do+ it "404s when listing actions of another store's promotion" do+ foreign_promotion = create(:promotion, stores: [create(:store)])+ create(:promotion_action_create_adjustment, promotion: foreign_promotion)++ get :index, params: { promotion_id: foreign_promotion.prefixed_id }, as: :json++ expect(response).to have_http_status(:not_found)+ end+ end+enddiff --git a/spree/api/spec/controllers/spree/api/v3/admin/promotion_rules_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/promotion_rules_controller_spec.rbnew file mode 100644index 0000000000..f213cadc1a--- /dev/null+++ b/spree/api/spec/controllers/spree/api/v3/admin/promotion_rules_controller_spec.rb@@ -0,0 +1,46 @@+require 'spec_helper'++RSpec.describe Spree::Api::V3::Admin::PromotionRulesController, type: :controller do+ render_views++ include_context 'API v3 Admin authenticated'++ let!(:promotion) { create(:promotion, stores: [store]) }++ before { request.headers.merge!(headers) }++ describe 'POST #create' do+ it 'creates a rule on a promotion in the current store' do+ post :create, params: {+ promotion_id: promotion.prefixed_id,+ type: 'first_order'+ }, as: :json++ expect(response).to have_http_status(:created)+ expect(promotion.reload.promotion_rules.map(&:type)).to include('Spree::Promotion::Rules::FirstOrder')+ end++ it "404s for a promotion that belongs to another store" do+ foreign_promotion = create(:promotion, stores: [create(:store)])++ post :create, params: {+ promotion_id: foreign_promotion.prefixed_id,+ type: 'first_order'+ }, as: :json++ expect(response).to have_http_status(:not_found)+ expect(foreign_promotion.reload.promotion_rules).to be_empty+ end+ end++ describe 'GET #index' do+ it "404s when listing rules of another store's promotion" do+ foreign_promotion = create(:promotion, stores: [create(:store)])+ create(:promotion_rule_user, promotion: foreign_promotion)++ get :index, params: { promotion_id: foreign_promotion.prefixed_id }, as: :json++ expect(response).to have_http_status(:not_found)+ end+ end+enddiff --git a/spree/api/spec/controllers/spree/api/v3/admin/stock_transfers_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/stock_transfers_controller_spec.rbindex 6b94327e4f..5577a0d96f 100644--- a/spree/api/spec/controllers/spree/api/v3/admin/stock_transfers_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/admin/stock_transfers_controller_spec.rb@@ -65,5 +65,18 @@ RSpec.describe Spree::Api::V3::Admin::StockTransfersController, type: :controlleexpect(response).to have_http_status(:not_found)end++ it "drops variants belonging to another store and surfaces invalid_variants" do+ foreign_variant = create(:product, store: create(:store)).master++ expect do+ post :create, params: base_params.merge(+ variants: [{ variant_id: foreign_variant.prefixed_id, quantity: 5 }]+ ), as: :json+ end.not_to change(Spree::StockTransfer, :count)++ expect(response).to have_http_status(:unprocessable_content)+ expect(json_response['error']['code']).to eq('invalid_variants')+ endendenddiff --git a/spree/core/app/models/spree/product.rb b/spree/core/app/models/spree/product.rbindex 878f291690..c84027c257 100644--- a/spree/core/app/models/spree/product.rb+++ b/spree/core/app/models/spree/product.rb@@ -211,11 +211,14 @@ module Spreeend# Maps 6.0 API name (category_ids) to model column (taxon_ids).- # Accepts both prefixed IDs and raw integer IDs.+ # Accepts both prefixed IDs and raw integer IDs. Only taxons belonging to+ # the product's own store are assigned — ids from another store's+ # taxonomies are dropped, preventing cross-store category attachment.def category_ids=(ids)- self.taxon_ids = Array(ids).filter_map do |id|+ decoded_ids = Array(ids).filter_map do |id|id.to_s.include?('_') ? Spree::Taxon.decode_prefixed_id(id) : idend+ self.taxon_ids = Spree::Taxon.for_store(assignable_store).where(id: decoded_ids).idsend# Sync media inline. Entries with `id` patch the existing assetdiff --git a/spree/core/app/models/spree/product/channels.rb b/spree/core/app/models/spree/product/channels.rbindex edb2e6b529..979eefebe9 100644--- a/spree/core/app/models/spree/product/channels.rb+++ b/spree/core/app/models/spree/product/channels.rb@@ -96,6 +96,13 @@ module Spreeself.store ||= Spree::Current.store || Spree::Store.defaultend+ # The store a product's associations (categories, channels) must belong+ # to. Falls back to the request/default store for not-yet-persisted+ # products whose `store` hasn't been assigned.+ def assignable_store+ store || Spree::Current.store || Spree::Store.default+ end+def pending_publications?@pending_publications_params.present?end@@ -126,9 +133,14 @@ module Spreepublication.update!(publication_data.slice(:published_at, :unpublished_at))publication_ids_in_payload << publication.idelsif channel_id.present?+ # Only publish to channels owned by the product's store; ignore+ # ids referencing another store's channel.+ channel = publishable_channels.find_by(id: channel_id)+ next unless channel+# Upsert by channel_id so repeat submissions are idempotent# against the unique (product_id, channel_id) index.- publication = product_publications.find_or_initialize_by(channel_id: channel_id)+ publication = product_publications.find_or_initialize_by(channel_id: channel.id)publication.assign_attributes(publication_data.slice(:published_at, :unpublished_at))publication.save!publication_ids_in_payload << publication.id@@ -144,6 +156,11 @@ module SpreeSpree::PrefixedId.decode_prefixed_id(value) || valueend++ # Channels the product may be published to — those owned by its store.+ def publishable_channels+ assignable_store.channels+ endendendenddiff --git a/spree/core/app/models/spree/store.rb b/spree/core/app/models/spree/store.rbindex 3961135a8a..d81736dfbd 100644--- a/spree/core/app/models/spree/store.rb+++ b/spree/core/app/models/spree/store.rb@@ -82,6 +82,7 @@ module Spreehas_many :variants, through: :products, class_name: 'Spree::Variant', source: :variants_including_masterhas_many :stock_items, through: :variants, class_name: 'Spree::StockItem'has_many :prices, through: :variants, class_name: 'Spree::Price'+ has_many :price_lists, class_name: 'Spree::PriceList', inverse_of: :storehas_many :inventory_units, through: :variants, class_name: 'Spree::InventoryUnit'has_many :option_value_variants, through: :variants, class_name: 'Spree::OptionValueVariant'has_many :customer_returns, class_name: 'Spree::CustomerReturn', inverse_of: :storediff --git a/spree/core/spec/models/spree/product_spec.rb b/spree/core/spec/models/spree/product_spec.rbindex 36e292bae0..2ec1817e6c 100644--- a/spree/core/spec/models/spree/product_spec.rb+++ b/spree/core/spec/models/spree/product_spec.rb@@ -1108,6 +1108,26 @@ describe Spree::Product, type: :model doendend+ describe '#category_ids=' do+ let(:product) { create(:product, store: store) }+ let(:taxonomy) { create(:taxonomy, store: store) }+ let(:category) { create(:taxon, taxonomy: taxonomy) }++ it 'assigns categories belonging to the product store' do+ product.update!(category_ids: [category.prefixed_id])+ expect(product.reload.taxons).to include(category)+ end++ it "ignores categories from another store's taxonomy" do+ foreign_taxon = create(:taxon, taxonomy: create(:taxonomy, store: create(:store)))++ product.update!(category_ids: [category.prefixed_id, foreign_taxon.prefixed_id])++ expect(product.reload.taxons).to include(category)+ expect(product.reload.taxons).not_to include(foreign_taxon)+ end+ end+describe '#any_variant_in_stock_or_backorderable?' dosubject { product.any_variant_in_stock_or_backorderable? }@@ -2168,6 +2188,20 @@ describe Spree::Product, type: :model doendend+ context 'cross-store isolation' do+ it "ignores a channel that belongs to another store" do+ foreign_channel = create(:channel, store: create(:store), code: 'foreign')++ product.product_publications = [+ { channel_id: pos_channel.prefixed_id },+ { channel_id: foreign_channel.prefixed_id }+ ]++ expect(product.reload.channels).to include(pos_channel)+ expect(product.reload.channels).not_to include(foreign_channel)+ end+ end+context 'idempotency and detach' doit 'is idempotent when re-sending an existing channel by channel_id' doexisting = product.product_publications.create!(channel: pos_channel)