spree_core 5.5.3 → 5.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2edebb88f8cab59b634a4bbbae5a24b15feab2d7673ecd521d70a1265b4e7bd0
-  data.tar.gz: 1fa56dfbe5ebd747212b1608490c5414246cfad12e721f49d040c97f8299ef33
+  metadata.gz: d1bfb936ec246953ec3805bd017b32594f42bb168c5373dd3ed86d4a219efd6d
+  data.tar.gz: 273695ba130dafae60be7bb880cb6bae32722d82bf8dc3d49ee11943049c1c65
 SHA512:
-  metadata.gz: 20f0b006c40c37d8e8cbf25d97b99a73e9f3ce72d6a4903f6238aec8cad435f45c1f6517cfb54356732f7c0f69910e1013f45b7a344bc29506c888521661f46a
-  data.tar.gz: c72003a7f9002a1443ef60fa19f70fe6aa4e4acf9f466012101889bd964c7aaf806d9f136fe158453c751d4f11dee74f4c42b9c9e1d39ec82b3994a5293337ee
+  metadata.gz: 412b093fc9621b695691bcbd3b3b9cb4335d42f17fe62b81b820ed67acabdabbc9b16954ae4331cac03d58fabb43217b72d68dd1bc4992d6ee13f203fcad4b71
+  data.tar.gz: 9e325093542d1a77466ff4780e61aae47d309daeba2f583723f00bb83c906f26ee085512b1bb85caae53d4c731f1a2ff309541878c675a2736f397e98931001d

data/app/models/concerns/spree/webhook_payload_redaction.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+module Spree
+  # Keeps single-use credentials out of the persisted webhook delivery log.
+  #
+  # Some events must carry a live credential to their subscriber — a storefront
+  # that owns its transactional emails needs the real password reset token to
+  # build the email. Delivering it over TLS to a merchant-configured endpoint is
+  # intended; keeping a readable copy in `spree_webhook_deliveries.payload` is
+  # not, because that column is queryable and is served back through the Admin
+  # API delivery log.
+  #
+  # Sensitive values are therefore replaced with {REDACTION_PLACEHOLDER} before
+  # the record is written, and re-attached in memory at send time so the
+  # outgoing request body is unchanged.
+  module WebhookPayloadRedaction
+    extend ActiveSupport::Concern
+
+    # Payload keys under `data` whose values are live credentials.
+    SENSITIVE_PAYLOAD_KEYS = %w[reset_token unsubscribe_token].freeze
+
+    REDACTION_PLACEHOLDER = '[REDACTED]'
+
+    # Splits a payload into the version safe to persist and the secrets held
+    # back from it.
+    #
+    # @param payload [Hash] the full event payload
+    # @return [Array(Hash, Hash)] redacted payload, and the extracted secrets
+    #   keyed as they appeared under `data`
+    def self.split(payload)
+      secrets = {}
+
+      redacted = transform_data_hashes(payload) do |data|
+        data.to_h do |key, value|
+          if SENSITIVE_PAYLOAD_KEYS.include?(key.to_s) && value.present?
+            secrets[secret_key_for(key)] = value
+            [key, REDACTION_PLACEHOLDER]
+          else
+            [key, value]
+          end
+        end
+      end
+
+      secrets.empty? ? [payload, {}] : [redacted, secrets]
+    end
+
+    # Re-attaches previously extracted secrets to a redacted payload.
+    #
+    # @param payload [Hash] the redacted payload
+    # @param secrets [Hash] secrets returned by {split}
+    # @return [Hash] the payload as it should go over the wire
+    def self.merge(payload, secrets)
+      return payload if secrets.blank?
+
+      transform_data_hashes(payload) do |data|
+        data.to_h do |key, value|
+          secret = secrets[secret_key_for(key)]
+          [key, secret.presence || value]
+        end
+      end
+    end
+
+    # Applies +block+ to every `data` hash on the payload.
+    #
+    # Both key forms are visited rather than only the first match: a payload
+    # carrying `:data` *and* `'data'` would otherwise leave one of them
+    # unredacted.
+    def self.transform_data_hashes(payload)
+      return payload unless payload.is_a?(Hash)
+
+      [:data, 'data'].reduce(payload) do |result, data_key|
+        data = result[data_key]
+        next result unless data.is_a?(Hash)
+
+        result.merge(data_key => yield(data))
+      end
+    end
+    private_class_method :transform_data_hashes
+
+    # Secrets are keyed by name alone. They cross an ActiveJob serialization
+    # boundary, which coerces symbol keys to strings, so the key form at split
+    # time cannot be relied on to still match at merge time.
+    def self.secret_key_for(key)
+      key.to_s
+    end
+    private_class_method :secret_key_for
+  end
+end

data/app/models/spree/webhook_delivery.rb

@@ -7,6 +7,11 @@ module Spree
     belongs_to :webhook_endpoint, class_name: 'Spree::WebhookEndpoint'
     delegate :url, to: :webhook_endpoint
 
+    # Credentials stripped from the persisted payload. Never written to the
+    # database — held in memory on a single delivery instance, assigned by
+    # WebhookDeliveryJob when it runs. See {Spree::WebhookPayloadRedaction}.
+    attr_accessor :payload_secrets
+
     validates :event_name, presence: true
     validates :payload, presence: true
 
@@ -64,6 +69,23 @@ module Spree
       webhook_endpoint.check_auto_disable! unless is_success
     end
 
+    # Payload as it should be sent over the wire.
+    #
+    # Re-attaches any credentials withheld from the persisted column. Once this
+    # record has been reloaded from the database those secrets are gone for
+    # good, so a redelivery sends the redacted placeholder — single-use tokens
+    # are not replayable anyway.
+    #
+    # This is deliberate: keeping a recoverable copy would put the credential
+    # back at rest, which is what redaction exists to prevent. If a delivery is
+    # lost (worker crash between creation and delivery), the customer requests
+    # a new reset, which mints a fresh token.
+    #
+    # @return [Hash]
+    def deliverable_payload
+      Spree::WebhookPayloadRedaction.merge(payload, payload_secrets)
+    end
+
     # Create a new delivery with the same payload and queue it.
     # Used to retry failed deliveries manually.
     #

data/app/presenters/spree/data_feeds/google_presenter.rb

@@ -3,6 +3,22 @@ require 'nokogiri'
 module Spree
   module DataFeeds
     class GooglePresenter < BasePresenter
+      # Optional Google Merchant Center product attributes sourced from
+      # metafields. See https://support.google.com/merchants/answer/7052112
+      OPTIONAL_ATTRIBUTES = %w[
+        brand gtin mpn identifier_exists condition adult multipack is_bundle
+        age_group color gender material pattern size size_type size_system
+        product_length product_width product_height product_weight
+        google_product_category product_type sale_price sale_price_effective_date
+        cost_of_goods_sold unit_pricing_measure unit_pricing_base_measure
+        shipping shipping_label shipping_weight shipping_length shipping_width
+        shipping_height ships_from_country transit_time_label max_handling_time
+        min_handling_time tax tax_category energy_efficiency_class
+        min_energy_efficiency_class max_energy_efficiency_class
+        gtin_source expiration_date custom_label_0 custom_label_1 custom_label_2
+        custom_label_3 custom_label_4 mobile_link additional_image_link
+      ].freeze
+
       # @return [String] RSS XML feed for Google Merchant Center
       def call
         builder = Nokogiri::XML::Builder.new do |xml|
@@ -59,10 +75,21 @@ module Spree
 
       def build_optional_attributes(xml, product)
         product.public_metafields.each do |metafield|
-          xml['g'].send(metafield.metafield_definition.key.parameterize.underscore, metafield.value)
+          key = metafield.metafield_definition.key.parameterize.underscore
+          next unless OPTIONAL_ATTRIBUTES.include?(key)
+
+          append_g_element(xml, key, metafield.value)
         end
       end
 
+      def append_g_element(xml, name, value)
+        parent = xml.parent
+        node = Nokogiri::XML::Node.new(name, parent.document)
+        node.namespace = parent.namespace_scopes.find { |ns| ns.prefix == 'g' }
+        node.content = value
+        parent << node
+      end
+
       def format_title(product, variant)
         parts = [product.name]
         variant.option_values.each do |option_value|

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '5.5.3'.freeze
+  VERSION = '5.5.4'.freeze
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.5.3
+  version: 5.5.4
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-10 00:00:00.000000000 Z
+date: 2026-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -930,6 +930,7 @@ files:
 - app/models/concerns/spree/user_reporting.rb
 - app/models/concerns/spree/user_roles.rb
 - app/models/concerns/spree/vat_price_calculation.rb
+- app/models/concerns/spree/webhook_payload_redaction.rb
 - app/models/spree/ability.rb
 - app/models/spree/address.rb
 - app/models/spree/adjustable/adjuster/base.rb
@@ -1818,9 +1819,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.5.3
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.5.4
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.5.3
+  source_code_uri: https://github.com/spree/spree/tree/v5.5.4
 post_install_message:
 rdoc_options: []
 require_paths: