aws-sdk 1.11.3 → 1.12.0

data/lib/aws/iam/virtual_mfa_device.rb

@@ -120,7 +120,7 @@ module AWS
 
       protected
       def format_auth_code(code)
-        sprintf("%06d", code)
+        code.is_a?(Integer) ? sprintf("%06d", code) : code
       end
 
       protected

data/lib/aws/route_53/change_batch.rb

@@ -114,7 +114,7 @@ module AWS
       # @return [String]
       attr_reader :type
 
-      # Build query fro change request.
+      # Build query for change request.
       # @return [Hash]
       def to_hash
         q = {}
@@ -128,6 +128,8 @@ module AWS
         q[:resource_record_set][:ttl] = @change_options[:ttl] if @change_options[:ttl]
         q[:resource_record_set][:resource_records] = @change_options[:resource_records] if @change_options[:resource_records]
         q[:resource_record_set][:alias_target] = @change_options[:alias_target] if @change_options[:alias_target]
+        q[:resource_record_set][:failover] = @change_options[:failover] if @change_options[:failover]
+        q[:resource_record_set][:health_check_id] = @change_options[:health_check_id] if @change_options[:health_check_id]
         q
       end
     end

data/lib/aws/route_53/resource_record_set.rb

@@ -119,6 +119,18 @@ module AWS
         @create_options[:ttl] = new_ttl
       end
 
+      attribute :failover
+
+      def failover= new_failover
+        @create_options[:failover] = new_failover
+      end
+
+      attribute :health_check_id
+
+      def health_check_id= new_health_check_id
+        @create_options[:health_check_id] = new_health_check_id
+      end
+
       attribute :resource_records
 
       # @param [Array<Hash>] new_rrs
@@ -159,9 +171,9 @@ module AWS
         end
 
         @change_info = batch.call()
-        @name = @create_options[:name]
-        @type = @create_options[:type]
-        @set_identifier = @create_options[:set_identifier]
+        @name = @create_options[:name] || @name
+        @type = @create_options[:type] || @type
+        @set_identifier = @create_options[:set_identifier] || @set_identifier
         @create_options = {}
         self
       end
@@ -229,6 +241,8 @@ module AWS
           options[:region] = region if region
           options[:ttl] = ttl if ttl
           options[:resource_records] = resource_records if resource_records && !resource_records.empty?
+          options[:failover] = failover if failover
+          options[:health_check_id] = health_check_id if health_check_id
         end
         options
       end

data/lib/aws/s3/client.rb

@@ -1403,11 +1403,16 @@ module AWS
 
       def retryable_error? response
         super or
-          (response.request_type == :complete_multipart_upload &&
-          extract_error_details(response))
-          # complete multipart upload can return an error inside a
-          # 200 level response -- this forces us to parse the
-          # response for errors every time
+        failed_multipart_upload?(response) or
+        response.error.is_a?(Errors::RequestTimeout)
+      end
+
+      # S3 may return a 200 response code in response to complete_multipart_upload
+      # and then start streaming whitespace until it knows the final result.
+      # At that time it sends an XML message with success or failure.
+      def failed_multipart_upload? response
+        response.request_type == :complete_multipart_upload &&
+        extract_error_details(response)
       end
 
       def new_request

data/lib/aws/s3/encryption_utils.rb

@@ -20,22 +20,29 @@ module AWS
 
       protected
 
+      UNSAFE_MSG = "Unsafe encryption, data is longer than key length"
 
       # @param [OpenSSL::PKey::RSA, String] key Key used to encrypt.
       #
       # @param [String] data Data to be encrypted.
       #
       # @note Use check_encryption_materials before this method to check
-      #   formatting of keys
+      #   formatting of keys.
+      # @note This should not be used for data longer than the key length as
+      #   it will not be cryptographically safe.
       #
       # @return [String] Returns the data encrypted with the key given.
       def encrypt data, key
         rsa = OpenSSL::PKey::RSA
+        data_cipher_size = get_cipher_size(data.length)
+
         # Encrypting data key
         case key
         when rsa # Asymmetric encryption
+          warn UNSAFE_MSG if key.public_key.n.num_bits < data_cipher_size
           key.public_encrypt(data)
         when String             # Symmetric encryption
+          warn UNSAFE_MSG if get_cipher_size(key.length) < data_cipher_size
           cipher = get_aes_cipher(:encrypt, :ECB, key)
           cipher.update(data) + cipher.final
         end

data/lib/aws/s3/object_collection.rb

@@ -306,12 +306,15 @@ module AWS
       # @api private
       protected
       def next_markers page
-        marker = (last = page.contents.last and last.key)
-        if marker.nil?
-          raise 'Unable to find marker in S3 list objects response'
+        if page[:next_marker]
+          marker = page[:next_marker]
+        elsif page[:contents].size > 0
+          marker = page[:contents].last[:key]
         else
-          { :marker => marker }
+          raise 'Unable to find marker in S3 list objects response'
         end
+
+        { :marker => marker }
       end
 
       # processes items in batches of 1k items

data/lib/aws/simple_email_service.rb

@@ -342,9 +342,12 @@ module AWS
       end
       send_opts[:destinations] = [options[:to]].flatten if options[:to]
 
-      client.send_raw_email(send_opts)
-      nil
+      response = client.send_raw_email(send_opts)
+      if raw_message.respond_to?(:message_id=)
+        raw_message.message_id = "#{response.data[:message_id]}@email.amazonses.com"
+      end
 
+      nil
     end
 
     # for compatability with ActionMailer

data/lib/aws/sns.rb

@@ -13,6 +13,7 @@
 
 require 'aws/core'
 require 'aws/sns/config'
+require 'aws/sns/message'
 
 module AWS
 

data/lib/aws/sns/message.rb

@@ -0,0 +1,175 @@
+# Copyright 2011-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
+require 'base64'
+require 'json'
+require 'net/http'
+require 'net/https'
+require 'openssl'
+Dir.glob("#{File.dirname __FILE__}/originators/*.rb").each { |rb| require rb }
+
+module AWS
+  class SNS
+    class MessageWasNotAuthenticError < StandardError
+    end
+
+    # Represents a single SNS message.
+    #
+    # See also http://docs.amazonwebservices.com/sns/latest/gsg/json-formats.html
+    #
+    # = Originators
+    # Originators are sources of SNS messages.  {FromAutoScaling} is one.  {Message}
+    # can be extended by originators if their #applicable? method returns true when
+    # passed the raw message.
+    # Originator modules must implement `applicable? sns` module function.
+    # If an originator is applicable, it should set the `@origin` accessor to denote 
+    # itself.
+    class Message
+      attr_reader :raw
+      attr_accessor :origin
+
+      # @return {Message} Constructs a new {Message} from the raw SNS, sets origin
+      def initialize sns
+        if sns.is_a? String
+          @raw = parse_from sns
+        else
+          @raw = sns
+        end
+        @origin = :sns
+        self.extend FromAutoScaling if FromAutoScaling.applicable? @raw
+      end
+
+      # @param [String] indexer into raw SNS JSON message
+      # @return [String] the value of the SNS' field
+      def [] key
+        @raw[key]
+      end
+
+      # @return [Boolean] true when the {Message} is authentic:
+      #   SigningCert is hosted at amazonaws.com, on https
+      #   correctly cryptographically signed by sender
+      #   nothing went wrong during authenticating the {Message}
+      #
+      # See http://docs.amazonwebservices.com/sns/latest/gsg/SendMessageToHttp.verify.signature.html
+      def authentic?
+        begin
+          decoded_from_base64 = decode signature
+          public_key = get_public_key_from signing_cert_url
+          public_key.verify OpenSSL::Digest::SHA1.new, decoded_from_base64, canonical_string
+        rescue MessageWasNotAuthenticError
+          false
+        end
+      end
+
+      # @return[Symbol] the message type
+      def type
+        case when @raw['Type'] =~ /SubscriptionConfirmation/i
+          then :SubscriptionConfirmation
+        when @raw['Type'] =~ /Notification/i
+          then :Notification
+        when @raw['Type'] =~ /UnsubscribeConfirmation/i
+          then :UnsubscribeConfirmation
+        else
+          :unknown
+        end
+      end
+
+      def message_id
+        @raw['MessageId']
+      end
+
+      def topic_arn
+        @raw['TopicArn']
+      end
+
+      def subject
+        @raw['Subject']
+      end
+
+      def message
+        @raw['Message']
+      end
+
+      def timestamp
+        @raw['Timestamp']
+      end
+
+      def signature
+        @raw['Signature']
+      end
+
+      def signature_version
+        @raw['SignatureVersion']
+      end
+
+      def signing_cert_url
+        @raw['SigningCertURL']
+      end
+
+      def unsubscribe_url
+        @raw['UnsubscribeURL']
+      end
+
+      def parse_from json
+        JSON.parse json
+      end
+
+      protected
+      def decode raw
+        Base64.decode64 raw
+      end
+
+      def get_public_key_from(x509_pem_url)
+        cert_pem = download x509_pem_url
+        x509 = OpenSSL::X509::Certificate.new(cert_pem)
+        OpenSSL::PKey::RSA.new(x509.public_key)
+      end
+
+      def canonical_string
+        # TODO: Support SubscriptionConfirmation and UnsubscribeConfirmation messages
+        text = "Message\n#{message}\n"
+        text += "MessageId\n#{message_id}\n"
+        text += "Subject\n#{subject}\n" unless subject.nil? or subject.empty?
+        text += "Timestamp\n#{timestamp}\n"
+        text += "TopicArn\n#{topic_arn}\n"
+        text += "Type\n#{type}\n"
+        text
+      end
+
+      def download url
+        raise MessageWasNotAuthenticError, "cert is not hosted at AWS URL (https): #{url}" unless url =~ /^https.*amazonaws\.com\/.*$/i
+        tries = 0
+        begin
+          resp = https_get(url)
+          resp.body
+        rescue => error
+          tries += 1
+          retry if tries < 3
+          raise error
+        end
+      end
+
+      def https_get(url)
+        uri = URI.parse(url)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        http.start
+        resp = http.request(Net::HTTP::Get.new(uri.request_uri))
+        http.finish
+        resp
+      end
+
+    end
+  end
+end

data/lib/aws/sns/originators/from_auto_scaling.rb

@@ -0,0 +1,68 @@
+# Copyright 2011-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
+module AWS
+  class SNS
+
+    # A module to enrich {Message} based on it originating from AutoScaling,
+    # which have a particular subject and message payload.
+    # Parses such messages into a more rich representation.
+    module FromAutoScaling
+      def self.extended base
+        base.origin = :autoscaling
+      end
+
+      # @return [Boolean] true when the SNS originates from auto-scaling
+      def applicable? sns
+        sns['Subject'] =~ /.*autoscaling:.*/i
+      end
+
+      module_function :applicable?
+
+      def body
+        return @body if defined? @body
+        @body = self.parse_from self.raw['Message']
+      end
+
+      # @return [Symbol] the auto-scaling event name
+      def event
+        return @event if defined? @event
+        e = body['Event']
+        @event = case
+          when e =~ /EC2_INSTANCE_TERMINATE/ then :ec2_instance_terminate
+          when e =~ /EC2_INSTANCE_TERMINATE_ERROR/ then :ec2_instance_terminate_error
+          when e =~ /EC2_INSTANCE_LAUNCH/ then :ec2_instance_launch
+          when e =~ /EC2_INSTANCE_LAUNCH_ERROR/ then :ec2_instance_launch_error
+          when e =~ /TEST_NOTIFICATION/ then :test_notification
+          else :unknown
+        end
+      end
+
+      # @return [String] the auto-scaling group name
+      def group_name
+        body['AutoScalingGroupName']
+      end
+
+      def status_code
+        body['StatusCode']
+      end
+
+      # @return [String] the instance-ID that is the subject of this event
+      def instance_id
+        body['EC2InstanceId']
+      end
+
+      # TODO: Further methods to fully expose what AS-SNS' carry as payload.
+    end
+  end
+end

data/lib/aws/version.rb

@@ -13,5 +13,5 @@
 
 module AWS
   # Current version of the AWS SDK for Ruby
-  VERSION = '1.11.3'
+  VERSION = '1.12.0'
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk
 version: !ruby/object:Gem::Version
-  version: 1.11.3
-  prerelease: 
+  version: 1.12.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,14 +48,14 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
 description: AWS SDK for Ruby
 email: 
-executables: []
+executables:
+- aws-rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -546,6 +540,8 @@ files:
 - lib/aws/sns/config.rb
 - lib/aws/sns/errors.rb
 - lib/aws/sns/has_delivery_policy.rb
+- lib/aws/sns/message.rb
+- lib/aws/sns/originators/from_auto_scaling.rb
 - lib/aws/sns/policy.rb
 - lib/aws/sns/request.rb
 - lib/aws/sns/subscription.rb
@@ -615,30 +611,30 @@ files:
 - lib/aws/api_config/StorageGateway-2012-06-30.yml
 - lib/aws/api_config/STS-2011-06-15.yml
 - lib/aws/api_config/Support-2013-04-15.yml
+- bin/aws-rb
 homepage: http://aws.amazon.com/sdkforruby
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: AWS SDK for Ruby
 test_files: []
 has_rdoc: