aws-sdk-rails 3.6.4 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12ed1c705f5676b3a71f11c40d1cbc86e2f64b70f1a3183d7dff6ee0dec093d0
-  data.tar.gz: c5963b0723b65ccf6c0f098c878d9c024cb7c2bd0a3dee8773dc6a455c58eb8c
+  metadata.gz: 48698b21d8248ac597ad8fd9d334e52d9399cf5880c994ffe556aa2e988f81e6
+  data.tar.gz: bd88191e84e5676435a2d2135ad6f6835cb8c624eef573c688a81c3bd9e8f255
 SHA512:
-  metadata.gz: 77f501b49eae2b7716206ddf37e5eded053d3383d084225e583660e06a637324103d5f83ffc5f003518fb57d4c64472b352ad7b3aeafc908441598de1ad1e178
-  data.tar.gz: 50165f13f842c8d6d435905472666697253ea893d2edb18159f25645c2a50a299573d88a59b43c9e6513da61fd0af900a910a155fcb1f4573dfeff8fefc20d8a
+  metadata.gz: ec0f7a6f90b736285486d3a36d7aab50cf1d368d9ea69f4b76031634b16df1e899d8146586b9b806f0921f2afebecc5444fe25badf4f0d8bf54a3cf42f472b3c
+  data.tar.gz: bbfe9b2488cf8c141a5e196a2ebe9631705ed176327db28a1503213f82aac81f3ec37be4f77109665fbf3690c344c52870b39f5c12f35d031b89387b057bbe5a

data/VERSION

@@ -1 +1 @@
-3.6.4
+3.7.1

data/lib/aws/rails/middleware/ebs_sqs_active_job_middleware.rb

@@ -81,12 +81,30 @@ module Aws
       end
 
       def sent_from_docker_host?(request)
-        app_runs_in_docker_container? && request.ip == '172.17.0.1'
+        app_runs_in_docker_container? && default_gw_ips.include?(request.ip)
       end
 
       def app_runs_in_docker_container?
         @app_runs_in_docker_container ||= `[ -f /proc/1/cgroup ] && cat /proc/1/cgroup` =~ /docker/
       end
+
+      def default_gw_ips
+        default_gw_ips = ['172.17.0.1']
+
+        if File.exist?('/proc/net/route')
+          File.open('/proc/net/route').each_line do |line|
+            fields = line.strip.split
+            next if fields.size != 11
+
+            # Destination == 0.0.0.0 and Flags & RTF_GATEWAY != 0
+            if fields[1] == '00000000' && (fields[3].hex & 0x2) != 0
+              default_gw_ips << IPAddr.new_ntoh([fields[2].hex].pack('L')).to_s
+            end
+          end
+        end
+
+        default_gw_ips
+      end
     end
   end
 end

data/lib/aws/rails/railtie.rb

@@ -10,6 +10,7 @@ module Aws
         # Initialization Actions
         Aws::Rails.use_rails_encrypted_credentials
         Aws::Rails.add_action_mailer_delivery_method
+        Aws::Rails.add_action_mailer_delivery_method(:sesv2)
         Aws::Rails.log_to_rails_logger
       end
 
@@ -28,11 +29,15 @@ module Aws
     #
     # @param [Symbol] name The name of the ActionMailer delivery method to
     #   register.
-    # @param [Hash] options The options you wish to pass on to the
-    #   Aws::SES::Client initialization method.
-    def self.add_action_mailer_delivery_method(name = :ses, options = {})
+    # @param [Hash] client_options The options you wish to pass on to the
+    #   Aws::SES[V2]::Client initialization method.
+    def self.add_action_mailer_delivery_method(name = :ses, client_options = {})
       ActiveSupport.on_load(:action_mailer) do
-        add_delivery_method(name, Aws::Rails::Mailer, options)
+        if name == :sesv2
+          add_delivery_method(name, Aws::Rails::Sesv2Mailer, client_options)
+        else
+          add_delivery_method(name, Aws::Rails::SesMailer, client_options)
+        end
       end
     end
 

data/lib/aws/rails/{mailer.rb → ses_mailer.rb}

@@ -15,7 +15,7 @@ module Aws
     #
     # Uses the AWS SDK for Ruby's credential provider chain when creating an SES
     # client instance.
-    class Mailer
+    class SesMailer
       # @param [Hash] options Passes along initialization options to
       #   [Aws::SES::Client.new](https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/SES/Client.html#initialize-instance_method).
       def initialize(options = {})
@@ -25,15 +25,12 @@ module Aws
       # Rails expects this method to exist, and to handle a Mail::Message object
       # correctly. Called during mail delivery.
       def deliver!(message)
-        send_opts = {}
-        send_opts[:raw_message] = {}
-        send_opts[:raw_message][:data] = message.to_s
-
-        if message.respond_to?(:destinations)
-          send_opts[:destinations] = message.destinations
-        end
-
-        @client.send_raw_email(send_opts).tap do |response|
+        params = {
+          raw_message: { data: message.to_s },
+          source: message.smtp_envelope_from, # defaults to From header
+          destinations: message.smtp_envelope_to # defaults to destinations (To,Cc,Bcc)
+        }
+        @client.send_raw_email(params).tap do |response|
           message.header[:ses_message_id] = response.message_id
         end
       end
@@ -45,3 +42,7 @@ module Aws
     end
   end
 end
+
+# This is for backwards compatibility after introducing support for SESv2.
+# The old mailer is now replaced with the new SES (v1) mailer.
+Aws::Rails::Mailer = Aws::Rails::SesMailer

data/lib/aws/rails/sesv2_mailer.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'aws-sdk-sesv2'
+
+module Aws
+  module Rails
+    # Provides a delivery method for ActionMailer that uses Amazon Simple Email
+    # Service V2.
+    #
+    # Once you have an SESv2 delivery method you can configure Rails to
+    # use this for ActionMailer in your environment configuration
+    # (e.g. RAILS_ROOT/config/environments/production.rb)
+    #
+    #     config.action_mailer.delivery_method = :sesv2
+    #
+    # Uses the AWS SDK for Ruby's credential provider chain when creating an SESV2
+    # client instance.
+    class Sesv2Mailer
+      # @param [Hash] options Passes along initialization options to
+      #   [Aws::SESV2::Client.new](https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/SESV2/Client.html#initialize-instance_method).
+      def initialize(options = {})
+        @client = SESV2::Client.new(options)
+      end
+
+      # Rails expects this method to exist, and to handle a Mail::Message object
+      # correctly. Called during mail delivery.
+      def deliver!(message)
+        params = { content: { raw: { data: message.to_s } } }
+        # smtp_envelope_from will default to the From address *without* sender names.
+        # By omitting this param, SESv2 will correctly use sender names from the mail headers.
+        # We should only use smtp_envelope_from when it was explicitly set (instance variable set)
+        params[:from_email_address] = message.smtp_envelope_from if message.instance_variable_get(:@smtp_envelope_from)
+        params[:destination] = {
+          to_addresses: to_addresses(message),
+          cc_addresses: message.cc,
+          bcc_addresses: message.bcc
+        }
+
+        @client.send_email(params).tap do |response|
+          message.header[:ses_message_id] = response.message_id
+        end
+      end
+
+      # ActionMailer expects this method to be present and to return a hash.
+      def settings
+        {}
+      end
+
+      private
+
+      # smtp_envelope_to will default to the full destinations (To, Cc, Bcc)
+      # SES v2 API prefers each component split out into a destination hash.
+      # When smtp_envelope_to was set, use it explicitly for to_address only.
+      def to_addresses(message)
+        message.instance_variable_get(:@smtp_envelope_to) ? message.smtp_envelope_to : message.to
+      end
+    end
+  end
+end

data/lib/aws/rails/sqs_active_job/configuration.rb

@@ -145,8 +145,7 @@ module Aws
 
         # Load options from YAML file
         def load_from_file(file_path)
-          require "erb"
-          opts = YAML.load(ERB.new(File.read(file_path)).result) || {}
+          opts = load_yaml(file_path) || {}
           opts.deep_symbolize_keys
         end
 
@@ -158,6 +157,19 @@ module Aws
         def user_agent
           "ft/aws-sdk-rails-activejob/#{Aws::Rails::VERSION}"
         end
+
+        def load_yaml(file_path)
+          require "erb"
+          source = ERB.new(File.read(file_path)).result
+
+          # Avoid incompatible changes with Psych 4.0.0
+          # https://bugs.ruby-lang.org/issues/17866
+          begin
+            YAML.load(source, aliases: true) || {}
+          rescue ArgumentError
+            YAML.load(source) || {}
+          end
+        end
       end
     end
   end

data/lib/aws-sdk-rails.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'aws/rails/mailer'
+require_relative 'aws/rails/ses_mailer'
+require_relative 'aws/rails/sesv2_mailer'
 require_relative 'aws/rails/railtie'
 require_relative 'aws/rails/notifications'
 require_relative 'aws/rails/sqs_active_job/configuration'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-rails
 version: !ruby/object:Gem::Version
-  version: 3.6.4
+  version: 3.7.1
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-13 00:00:00.000000000 Z
+date: 2023-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-record
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-sesv2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sqs
   requirement: !ruby/object:Gem::Requirement
@@ -123,10 +137,11 @@ files:
 - lib/active_job/queue_adapters/amazon_sqs_adapter.rb
 - lib/active_job/queue_adapters/amazon_sqs_async_adapter.rb
 - lib/aws-sdk-rails.rb
-- lib/aws/rails/mailer.rb
 - lib/aws/rails/middleware/ebs_sqs_active_job_middleware.rb
 - lib/aws/rails/notifications.rb
 - lib/aws/rails/railtie.rb
+- lib/aws/rails/ses_mailer.rb
+- lib/aws/rails/sesv2_mailer.rb
 - lib/aws/rails/sqs_active_job/configuration.rb
 - lib/aws/rails/sqs_active_job/executor.rb
 - lib/aws/rails/sqs_active_job/job_runner.rb
@@ -164,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.7
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: AWS SDK for Ruby on Rails Plugin