aws-ses 0.6.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d83b84b06b584bdb5c4643e75dde6cd185d7b54
-  data.tar.gz: f7c7c7d108a5e87ba91b5249f2e8795a6ace7606
+  metadata.gz: 649f6d5775f0057147e1b411dd5f43af48812bf2
+  data.tar.gz: b3b7fd033599ef3678b3c93d0ed6f0456bcef2d5
 SHA512:
-  metadata.gz: bd17ce170e886f373038bbee96b593398ad2f9a1397bcce409cc7d9c0ecdcd6adceca4756d9380b7d114cc503797065de349df675ff409d1a8ab8806c147e00b
-  data.tar.gz: 97d79a71412f8bf55659ac2bca9697072b5ad0a7ec6531d45ab249d56e817f6b56f0f432b1a2f21acdf9a5cb3c68869dd3aa5f50ae853828b6cc9bd25a46fd47
+  metadata.gz: d8e1a237725651f2e99fcc6a8207466df258b9ce466058ca13287a9f6e16f9fbd60fcb6690a54cbafe382131149180e2474e23dad3d02e56d6e261b7895f8bcb
+  data.tar.gz: 776c4d15557c85664f81dbcbd49caf401a48d4e21bc7beb01846688055da1b3d243e7ad1040e82742e9167d46f9d46b193359256a438c711b6f4659068462db4

data/CHANGELOG

@@ -1,4 +1,14 @@
-0.4.5:
+0.7.1:
+* Bugfix in sig version v4 detection
+
+0.7.0:
+* Implement Authorization Header v4 (add config: `signature_version: 4`)
+* Wrap message ID in `<>` correctly
+
+0.6.0:
+* Various small bug fixes
+
+0.5.0:
 * Check for existence of html or text body when attachments are included
 * Message ids in mail objects should now reflect what is actually sent.
 

data/Gemfile

@@ -6,13 +6,16 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda-context", ">= 0"
-  gem "bundler"
-  #gem "rcov", ">= 0"
+  gem "bundler", ">= 1.17"
   gem 'flexmock', '~> 0.8.11'
+  gem "jeweler"
+  gem "rake"
+  gem "shoulda-context", ">= 0"
+  gem 'test-unit'
+  gem 'timecop'
 end
 
-gem 'xml-simple'
 gem 'builder'
-gem 'mime-types'
 gem 'mail', '> 2.2.5'
+gem 'mime-types'
+gem 'xml-simple'

data/Gemfile.lock

@@ -1,12 +1,63 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.4.0)
     builder (3.2.2)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
     flexmock (0.8.11)
+    git (1.7.0)
+      rchardet (~> 1.8)
+    github_api (0.16.0)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      mime-types (>= 1.16, < 3.0)
+      oauth2 (~> 1.0)
+    hashie (4.1.0)
+    highline (2.0.3)
+    jeweler (2.3.9)
+      builder
+      bundler
+      git (>= 1.2.5)
+      github_api (~> 0.16.0)
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      psych
+      rake
+      rdoc
+      semver2
+    jwt (2.2.2)
     mail (2.6.1)
       mime-types (>= 1.16, < 3)
     mime-types (2.4.1)
+    mini_portile2 (2.4.0)
+    multi_json (1.15.0)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    oauth2 (1.4.4)
+      faraday (>= 0.8, < 2.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    power_assert (1.2.0)
+    psych (3.1.0)
+    rack (2.2.3)
+    rake (13.0.1)
+    rchardet (1.8.0)
+    rdoc (6.2.0)
+    semver2 (3.4.2)
     shoulda-context (1.2.1)
+    test-unit (3.3.6)
+      power_assert
+    thread_safe (0.3.6)
+    timecop (0.9.1)
     xml-simple (1.1.4)
 
 PLATFORMS
@@ -14,9 +65,16 @@ PLATFORMS
 
 DEPENDENCIES
   builder
-  bundler
+  bundler (>= 1.17)
   flexmock (~> 0.8.11)
+  jeweler
   mail (> 2.2.5)
   mime-types
+  rake
   shoulda-context
+  test-unit
+  timecop
   xml-simple
+
+BUNDLED WITH
+   1.17.3

data/README.erb

@@ -16,11 +16,11 @@
 
 == Rails
 
-This gem is compatible with Rails >= 3.0.0 and Rails 2.3.x
+This gem is compatible with Rails >= 3.0.0 and Ruby 2.3.x
 
 To use, first add the gem to your Gemfile:
 
-    gem "aws-ses", "~> 0.6.0", :require => 'aws/ses'
+    gem "aws-ses", "~> 0.7.1", :require => 'aws/ses'
     
 == For Rails 3.x
 
@@ -28,7 +28,8 @@ Then, add your Amazon credentials and extend ActionMailer in `config/initializer
 
     ActionMailer::Base.add_delivery_method :ses, AWS::SES::Base,
       :access_key_id     => 'abc',
-      :secret_access_key => '123'
+      :secret_access_key => '123',
+      :signature_version => 4
 
 Then set the delivery method in `config/environments/*rb` as appropriate:
 
@@ -77,7 +78,7 @@ Available at: https://github.com/drewblas/aws-ses
 
 == Copyright
 
-Copyright (c) 2011 Drew Blas. See LICENSE for further details.
+Copyright (c) 2020 Drew Blas. See LICENSE for further details.
 
 == Thanks
 
@@ -90,3 +91,5 @@ Special thanks to Marcel Molina Jr. for his creation of AWS::S3 which I used por
 * sshaw
 * teeparham (documentation)
 * pzb
+* NicholasHely
+* m33h

data/README.rdoc

@@ -28,7 +28,8 @@ To connect to a different one, just pass it as a parameter to the AWS::SES::Base
   ses = AWS::SES::Base.new(
     :access_key_id     => 'abc', 
     :secret_access_key => '123',
-    :server => 'email.eu-west-1.amazonaws.com'
+    :server => 'email.eu-west-1.amazonaws.com',
+    :message_id_domain => 'eu-west-1.amazonses.com'
   )
 
 == Send E-mail
@@ -134,14 +135,13 @@ will return:
         "Rejects"=>"0",
         "Complaints"=>"0"}]
 
-
 == Rails
 
-This gem is compatible with Rails >= 3.0.0 and Rails 2.3.x
+This gem is compatible with Rails >= 3.0.0 and Ruby 2.3.x
 
 To use, first add the gem to your Gemfile:
 
-    gem "aws-ses", "~> 0.6.0", :require => 'aws/ses'
+    gem "aws-ses", "~> 0.7.0", :require => 'aws/ses'
     
 == For Rails 3.x
 
@@ -149,9 +149,10 @@ Then, add your Amazon credentials and extend ActionMailer in `config/initializer
 
     ActionMailer::Base.add_delivery_method :ses, AWS::SES::Base,
       :access_key_id     => 'abc',
-      :secret_access_key => '123'
+      :secret_access_key => '123',
+      :signature_version => 4
 
-Then set the delivery method in `config/environments/*rb` as appropriate:
+Then set the delivery method in `config/environments/*.rb` as appropriate:
 
     config.action_mailer.delivery_method = :ses
 
@@ -179,8 +180,12 @@ It means that you are not running with SSL enabled in ruby.  Re-compile ruby wit
 If you are receiving this message and you HAVE verified the [source] please <b>check to be sure you are not in sandbox mode!</b>
     "Email address is not verified.MessageRejected (AWS::Error)"
 If you have not been granted production access, you will have to <b>verify all recipients</b> as well.
-  
-http://docs.amazonwebservices.com/ses/2010-12-01/DeveloperGuide/index.html?InitialSetup.Customer.html
+
+To verify email addresses and domains:
+https://docs.aws.amazon.com/ses/latest/DeveloperGuide/verify-addresses-and-domains.html
+
+To request production access:
+https://docs.aws.amazon.com/ses/latest/DeveloperGuide/request-production-access.html
 
 == Source
 

data/Rakefile

@@ -67,3 +67,17 @@ namespace :doc do
     end
   end
 end
+
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
+  gem.name = "aws-ses"
+  gem.homepage = "http://github.com/drewblas/aws-ses"
+  gem.license = "MIT"
+  gem.summary = "Client library for Amazon's Simple Email Service's REST API"
+  gem.description = "Client library for Amazon's Simple Email Service's REST API"
+  gem.email = "drew.blas@gmail.com"
+  gem.authors = ["Drew Blas", "Marcel Molina Jr."]
+  # dependencies defined in Gemfile
+end
+Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.1

data/aws-ses.gemspec

@@ -2,17 +2,20 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: aws-ses 0.7.1 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "aws-ses"
-  s.version = "0.6.0"
+  s.name = "aws-ses".freeze
+  s.version = "0.7.1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Drew Blas", "Marcel Molina Jr."]
-  s.date = "2014-10-13"
-  s.description = "Client library for Amazon's Simple Email Service's REST API"
-  s.email = "drew.blas@gmail.com"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Drew Blas".freeze, "Marcel Molina Jr.".freeze]
+  s.date = "2020-09-30"
+  s.description = "Client library for Amazon's Simple Email Service's REST API".freeze
+  s.email = "drew.blas@gmail.com".freeze
   s.extra_rdoc_files = [
+    "CHANGELOG",
     "LICENSE",
     "README.erb",
     "README.rdoc",
@@ -49,48 +52,51 @@ Gem::Specification.new do |s|
     "test/response_test.rb",
     "test/send_email_test.rb"
   ]
-  s.homepage = "http://github.com/drewblas/aws-ses"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.19"
-  s.summary = "Client library for Amazon's Simple Email Service's REST API"
-  s.test_files = [
-    "test/address_test.rb",
-    "test/base_test.rb",
-    "test/extensions_test.rb",
-    "test/fixtures.rb",
-    "test/helper.rb",
-    "test/info_test.rb",
-    "test/mocks/fake_response.rb",
-    "test/response_test.rb",
-    "test/send_email_test.rb"
-  ]
+  s.homepage = "http://github.com/drewblas/aws-ses".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.5.2.3".freeze
+  s.summary = "Client library for Amazon's Simple Email Service's REST API".freeze
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<xml-simple>, [">= 0"])
-      s.add_runtime_dependency(%q<builder>, [">= 0"])
-      s.add_runtime_dependency(%q<mime-types>, [">= 0"])
-      s.add_runtime_dependency(%q<mail>, ["> 2.2.5"])
-      s.add_development_dependency(%q<shoulda-context>, [">= 0"])
-      s.add_development_dependency(%q<flexmock>, ["~> 0.8.11"])
+      s.add_runtime_dependency(%q<builder>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<mail>.freeze, ["> 2.2.5"])
+      s.add_runtime_dependency(%q<mime-types>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<xml-simple>.freeze, [">= 0"])
+      s.add_development_dependency(%q<bundler>.freeze, [">= 1.17"])
+      s.add_development_dependency(%q<flexmock>.freeze, ["~> 0.8.11"])
+      s.add_development_dependency(%q<jeweler>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rake>.freeze, [">= 0"])
+      s.add_development_dependency(%q<shoulda-context>.freeze, [">= 0"])
+      s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
+      s.add_development_dependency(%q<timecop>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<xml-simple>, [">= 0"])
-      s.add_dependency(%q<builder>, [">= 0"])
-      s.add_dependency(%q<mime-types>, [">= 0"])
-      s.add_dependency(%q<mail>, ["> 2.2.5"])
-      s.add_dependency(%q<shoulda-context>, [">= 0"])
-      s.add_dependency(%q<flexmock>, ["~> 0.8.11"])
+      s.add_dependency(%q<builder>.freeze, [">= 0"])
+      s.add_dependency(%q<mail>.freeze, ["> 2.2.5"])
+      s.add_dependency(%q<mime-types>.freeze, [">= 0"])
+      s.add_dependency(%q<xml-simple>.freeze, [">= 0"])
+      s.add_dependency(%q<bundler>.freeze, [">= 1.17"])
+      s.add_dependency(%q<flexmock>.freeze, ["~> 0.8.11"])
+      s.add_dependency(%q<jeweler>.freeze, [">= 0"])
+      s.add_dependency(%q<rake>.freeze, [">= 0"])
+      s.add_dependency(%q<shoulda-context>.freeze, [">= 0"])
+      s.add_dependency(%q<test-unit>.freeze, [">= 0"])
+      s.add_dependency(%q<timecop>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<xml-simple>, [">= 0"])
-    s.add_dependency(%q<builder>, [">= 0"])
-    s.add_dependency(%q<mime-types>, [">= 0"])
-    s.add_dependency(%q<mail>, ["> 2.2.5"])
-    s.add_dependency(%q<shoulda-context>, [">= 0"])
-    s.add_dependency(%q<flexmock>, ["~> 0.8.11"])
+    s.add_dependency(%q<builder>.freeze, [">= 0"])
+    s.add_dependency(%q<mail>.freeze, ["> 2.2.5"])
+    s.add_dependency(%q<mime-types>.freeze, [">= 0"])
+    s.add_dependency(%q<xml-simple>.freeze, [">= 0"])
+    s.add_dependency(%q<bundler>.freeze, [">= 1.17"])
+    s.add_dependency(%q<flexmock>.freeze, ["~> 0.8.11"])
+    s.add_dependency(%q<jeweler>.freeze, [">= 0"])
+    s.add_dependency(%q<rake>.freeze, [">= 0"])
+    s.add_dependency(%q<shoulda-context>.freeze, [">= 0"])
+    s.add_dependency(%q<test-unit>.freeze, [">= 0"])
+    s.add_dependency(%q<timecop>.freeze, [">= 0"])
   end
 end
 

data/lib/aws/ses/base.rb

@@ -26,14 +26,22 @@ module AWS #:nodoc:
   #   ses = AWS::SES::Base.new(
   #     :access_key_id     => 'abc', 
   #     :secret_access_key => '123',
-  #     :server => 'email.eu-west-1.amazonaws.com'
+  #     :server => 'email.eu-west-1.amazonaws.com',
+  #     :message_id_domain => 'eu-west-1.amazonses.com'
   #   )
+  #
 
   module SES
     
     API_VERSION = '2010-12-01'
-    
+
+    DEFAULT_REGION = 'us-east-1'
+
+    SERVICE = 'ec2'
+
     DEFAULT_HOST = 'email.us-east-1.amazonaws.com'
+
+    DEFAULT_MESSAGE_ID_DOMAIN = 'email.amazonses.com'
     
     USER_AGENT = 'github-aws-ses-ruby-gem'
     
@@ -67,13 +75,17 @@ module AWS #:nodoc:
     def SES.authorization_header(key, alg, sig)
       "AWS3-HTTPS AWSAccessKeyId=#{key}, Algorithm=#{alg}, Signature=#{sig}"
     end
-    
+
+    def SES.authorization_header_v4(credential, signed_headers, signature)
+      "AWS4-HMAC-SHA256 Credential=#{credential}, SignedHeaders=#{signed_headers}, Signature=#{signature}"
+    end
+
     # AWS::SES::Base is the abstract super class of all classes who make requests against SES
     class Base   
       include SendEmail
       include Info
       
-      attr_reader :use_ssl, :server, :proxy_server, :port
+      attr_reader :use_ssl, :server, :proxy_server, :port, :message_id_domain, :signature_version, :region
       attr_accessor :settings
 
       # @option options [String] :access_key_id ("") The user's AWS Access Key ID
@@ -82,6 +94,8 @@ module AWS #:nodoc:
       # @option options [String] :server ("email.us-east-1.amazonaws.com") The server API endpoint host
       # @option options [String] :proxy_server (nil) An HTTP proxy server FQDN
       # @option options [String] :user_agent ("github-aws-ses-ruby-gem") The HTTP User-Agent header value
+      # @option options [String] :region ("us-east-1") The server API endpoint host
+      # @option options [String] :message_id_domain ("us-east-1.amazonses.com") Domain used to build message_id header
       # @return [Object] the object.
       def initialize( options = {} )
 
@@ -89,16 +103,21 @@ module AWS #:nodoc:
                     :secret_access_key => "",
                     :use_ssl => true,
                     :server => DEFAULT_HOST,
+                    :message_id_domain => DEFAULT_MESSAGE_ID_DOMAIN,
                     :path => "/",
                     :user_agent => USER_AGENT,
-                    :proxy_server => nil
+                    :proxy_server => nil,
+                    :region => DEFAULT_REGION
                     }.merge(options)
 
+        @signature_version = options[:signature_version] || 2
         @server = options[:server]
+        @message_id_domain = options[:message_id_domain]
         @proxy_server = options[:proxy_server]
         @use_ssl = options[:use_ssl]
         @path = options[:path]
         @user_agent = options[:user_agent]
+        @region = options[:region]
         @settings = {}
 
         raise ArgumentError, "No :access_key_id provided" if options[:access_key_id].nil? || options[:access_key_id].empty?
@@ -130,10 +149,6 @@ module AWS #:nodoc:
                                   proxy.password).new(options[:server], @port)
 
         @http.use_ssl = @use_ssl
-
-        # Don't verify the SSL certificates.  Avoids SSL Cert warning in log on every GET.
-        @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
       end
       
       def connection
@@ -150,7 +165,7 @@ module AWS #:nodoc:
         timestamp = Time.now.getutc
 
         params.merge!( {"Action" => action,
-                        "SignatureVersion" => "2",
+                        "SignatureVersion" => signature_version.to_s,
                         "SignatureMethod" => 'HmacSHA256',
                         "AWSAccessKeyId" => @access_key_id,
                         "Version" => API_VERSION,
@@ -162,9 +177,9 @@ module AWS #:nodoc:
 
         req = {}
 
-        req['X-Amzn-Authorization'] = get_aws_auth_param(timestamp.httpdate, @secret_access_key)
+        req['X-Amzn-Authorization'] = get_aws_auth_param(timestamp.httpdate, @secret_access_key, action, signature_version)
         req['Date'] = timestamp.httpdate
-        req['User-Agent'] = @user_agent 
+        req['User-Agent'] = @user_agent
 
         response = connection.post(@path, query, req)
         
@@ -179,9 +194,77 @@ module AWS #:nodoc:
       end
 
       # Set the Authorization header using AWS signed header authentication
-      def get_aws_auth_param(timestamp, secret_access_key)
+      def get_aws_auth_param(timestamp, secret_access_key, action = '', signature_version = 2)
+        raise(ArgumentError, "signature_version must be `2` or `4`") unless signature_version == 2 || signature_version == 4
         encoded_canonical = SES.encode(secret_access_key, timestamp, false)
-        SES.authorization_header(@access_key_id, 'HmacSHA256', encoded_canonical)
+
+        if signature_version == 4
+          SES.authorization_header_v4(sig_v4_auth_credential, sig_v4_auth_signed_headers, sig_v4_auth_signature(action))
+        else
+          SES.authorization_header(@access_key_id, 'HmacSHA256', encoded_canonical)
+        end
+      end
+
+      private
+
+      def sig_v4_auth_credential
+        @access_key_id + '/' + credential_scope
+      end
+
+      def sig_v4_auth_signed_headers
+        'host;x-amz-date'
+      end
+
+      def credential_scope
+        datestamp + '/' + region + '/' + SERVICE + '/' + 'aws4_request'
+      end
+
+      def string_to_sign(for_action)
+        "AWS4-HMAC-SHA256\n" +  amzdate + "\n" +  credential_scope + "\n" + Digest::SHA256.hexdigest(canonical_request(for_action).encode('utf-8').b)
+      end
+
+
+      def amzdate
+        Time.now.utc.strftime('%Y%m%dT%H%M%SZ')
+      end
+
+      def datestamp
+        Time.now.utc.strftime('%Y%m%d')
+      end
+
+      def canonical_request(for_action)
+        "GET" + "\n" + "/" + "\n" + canonical_querystring(for_action) + "\n" + canonical_headers + "\n" + sig_v4_auth_signed_headers + "\n" + payload_hash
+      end
+
+      def canonical_querystring(action)
+        "Action=#{action}&Version=2013-10-15"
+      end
+
+      def canonical_headers
+        'host:' + server + "\n" + 'x-amz-date:' + amzdate + "\n"
+      end
+
+      def payload_hash
+        Digest::SHA256.hexdigest(''.encode('utf-8'))
+      end
+
+      def sig_v4_auth_signature(for_action)
+        signing_key = getSignatureKey(@secret_access_key, datestamp, region, SERVICE)
+
+        OpenSSL::HMAC.hexdigest("SHA256", signing_key, string_to_sign(for_action).encode('utf-8'))
+      end
+
+      def getSignatureKey(key, dateStamp, regionName, serviceName)
+        kDate = sign(('AWS4' + key).encode('utf-8'), dateStamp)
+        kRegion = sign(kDate, regionName)
+        kService = sign(kRegion, serviceName)
+        kSigning = sign(kService, 'aws4_request')
+
+        kSigning
+      end
+
+      def sign(key, msg)
+        OpenSSL::HMAC.digest("SHA256", key, msg.encode('utf-8'))
       end
     end # class Base
   end # Module SES

data/lib/aws/ses/send_email.rb

@@ -101,7 +101,7 @@ module AWS
 
         raw_email = build_raw_email(message, args)
         result = request('SendRawEmail', raw_email)
-        message.message_id = "#{result.parsed['SendRawEmailResult']['MessageId']}@email.amazonses.com"
+        message.message_id = "<#{result.parsed['SendRawEmailResult']['MessageId']}@#{message_id_domain}>"
         result
       end
 

data/test/base_test.rb

@@ -37,4 +37,69 @@ class BaseTest < Test::Unit::TestCase
     #     assert result.error.error?
     #     assert_equal 'ValidationError', result.error.code
   end
+
+  def test_ses_authorization_header_v2
+    aws_access_key_id = 'fake_aws_key_id'
+    aws_secret_access_key = 'fake_aws_access_key'
+    timestamp = Time.new(2020, 7, 2, 7, 17, 58, '+00:00')
+
+    base = ::AWS::SES::Base.new(
+        access_key_id:     aws_access_key_id,
+        secret_access_key: aws_secret_access_key
+    )
+
+    assert_equal 'AWS3-HTTPS AWSAccessKeyId=fake_aws_key_id, Algorithm=HmacSHA256, Signature=eHh/cPIJJUc1+RMCueAi50EPlYxkZNXMrxtGxjkBD1w=', base.get_aws_auth_param(timestamp.httpdate, aws_secret_access_key)
+  end
+
+  def test_ses_authorization_header_v4
+    aws_access_key_id = 'fake_aws_key_id'
+    aws_secret_access_key = 'fake_aws_access_key'
+    time = Time.new(2020, 7, 2, 7, 17, 58, '+00:00')
+    ::Timecop.freeze(time)
+
+    base = ::AWS::SES::Base.new(
+        server:            'ec2.amazonaws.com',
+        signature_version: 4,
+        access_key_id:     aws_access_key_id,
+        secret_access_key: aws_secret_access_key
+    )
+
+    assert_equal 'AWS4-HMAC-SHA256 Credential=fake_aws_key_id/20200702/us-east-1/ec2/aws4_request, SignedHeaders=host;x-amz-date, Signature=c0465b36efd110b14a1c6dcca3e105085ed2bfb2a3fd3b3586cc459326ab43aa', base.get_aws_auth_param(time.httpdate, aws_secret_access_key, 'DescribeRegions', 4)
+    Timecop.return
+  end
+
+  def test_ses_authorization_header_v4_changed_host
+    aws_access_key_id = 'fake_aws_key_id'
+    aws_secret_access_key = 'fake_aws_access_key'
+    time = Time.new(2020, 7, 2, 7, 17, 58, '+00:00')
+    ::Timecop.freeze(time)
+
+    base = ::AWS::SES::Base.new(
+        server:            'email.us-east-1.amazonaws.com',
+        signature_version: 4,
+        access_key_id:     aws_access_key_id,
+        secret_access_key: aws_secret_access_key
+    )
+
+    assert_equal 'AWS4-HMAC-SHA256 Credential=fake_aws_key_id/20200702/us-east-1/ec2/aws4_request, SignedHeaders=host;x-amz-date, Signature=b872601457070ab98e7038bdcd4dc1f5eab586ececf9908525474408b0740515', base.get_aws_auth_param(time.httpdate, aws_secret_access_key, 'DescribeRegions', 4)
+    Timecop.return
+  end
+
+  def test_ses_authorization_header_v4_changed_region
+    aws_access_key_id = 'fake_aws_key_id'
+    aws_secret_access_key = 'fake_aws_access_key'
+    time = Time.new(2020, 7, 2, 7, 17, 58, '+00:00')
+    ::Timecop.freeze(time)
+
+    base = ::AWS::SES::Base.new(
+        server:            'email.us-east-1.amazonaws.com',
+        signature_version: 4,
+        access_key_id:     aws_access_key_id,
+        secret_access_key: aws_secret_access_key,
+        region:            'eu-west-1'
+    )
+
+    assert_not_equal 'AWS4-HMAC-SHA256 Credential=fake_aws_key_id/20200702/us-east-1/ec2/aws4_request, SignedHeaders=host;x-amz-date, Signature=b872601457070ab98e7038bdcd4dc1f5eab586ececf9908525474408b0740515', base.get_aws_auth_param(time.httpdate, aws_secret_access_key, 'DescribeRegions', 4)
+    Timecop.return
+  end
 end

data/test/helper.rb

@@ -24,6 +24,7 @@ require File.dirname(__FILE__) + '/fixtures'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'aws/ses'
+require 'timecop'
 
 class Test::Unit::TestCase
   require 'net/http'

data/test/send_email_test.rb

@@ -82,6 +82,27 @@ class SendEmailTest < Test::Unit::TestCase
       assert_equal 'xyz-123', result.request_id
     end
 
+    should 'send a raw e-mail with a mail object' do
+      mock_connection(@base, :body => %{
+        <SendRawEmailResponse xmlns="http://ses.amazonaws.com/doc/2010-12-01/">
+          <SendRawEmailResult>
+            <MessageId>abc-123</MessageId>
+          </SendRawEmailResult>
+          <ResponseMetadata>
+            <RequestId>xyz-123</RequestId>
+          </ResponseMetadata>
+        </SendRawEmailResponse>
+      })
+
+      message = Mail.new(@basic_email)
+      result = @base.send_raw_email(message)
+      assert result.success?
+      assert_equal 'abc-123', result.message_id
+      assert_equal 'xyz-123', result.request_id
+      assert message.errors.empty?
+      assert_equal 'abc-123@email.amazonses.com', message.message_id
+    end
+
     context "with a standard email"  do
       setup do
         @message = Mail.new({:from => 'jon@example.com', :to => 'dave@example.com', :cc => 'sally@example.com', :subject => 'Subject1', :body => "test body"})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-ses
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Drew Blas
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2020-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: xml-simple
+  name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -26,19 +26,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: builder
+  name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.5
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -54,33 +54,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mail
+  name: xml-simple
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.5
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda-context
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: flexmock
   requirement: !ruby/object:Gem::Requirement
@@ -95,11 +95,82 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.11
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda-context
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Client library for Amazon's Simple Email Service's REST API
 email: drew.blas@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
+- CHANGELOG
 - LICENSE
 - README.erb
 - README.rdoc
@@ -154,17 +225,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Client library for Amazon's Simple Email Service's REST API
-test_files:
-- test/address_test.rb
-- test/base_test.rb
-- test/extensions_test.rb
-- test/fixtures.rb
-- test/helper.rb
-- test/info_test.rb
-- test/mocks/fake_response.rb
-- test/response_test.rb
-- test/send_email_test.rb
+test_files: []