fog 1.3.1 → 1.4.0

data/lib/fog/aws/requests/sts/get_federation_token.rb

@@ -9,7 +9,7 @@ module Fog
           request({
             'Action'          => 'GetFederationToken',
             'Name'            => name,
-            'Policy'          => MultiJson.encode(policy),
+            'Policy'          => Fog::JSON.encode(policy),
             'DurationSeconds' => duration,
             :idempotent       => true,
             :parser           => Fog::Parsers::AWS::STS::GetSessionToken.new

data/lib/fog/aws/ses.rb

@@ -1,11 +1,12 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'aws'))
+require 'fog/aws'
 
 module Fog
   module AWS
     class SES < Fog::Service
+      extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :region, :host, :path, :port, :scheme, :persistent
+      recognizes :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at
 
       request_path 'fog/aws/requests/ses'
       request :delete_verified_email_address
@@ -25,7 +26,7 @@ module Fog
       end
 
       class Real
-
+        include Fog::AWS::CredentialFetcher::ConnectionMethods
         # Initialize connection to SES
         #
         # ==== Notes
@@ -47,10 +48,10 @@ module Fog
         def initialize(options={})
           require 'fog/core/parser'
 
-          @aws_access_key_id      = options[:aws_access_key_id]
-          @aws_secret_access_key  = options[:aws_secret_access_key]
+          @use_iam_profile = options[:use_iam_profile]
+          setup_credentials(options)
+
           @connection_options     = options[:connection_options] || {}
-          @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
           options[:region] ||= 'us-east-1'
           @host = options[:host] || "email.#{options[:region]}.amazonaws.com"
           @path       = options[:path]        || '/'
@@ -66,15 +67,27 @@ module Fog
 
         private
 
+        def setup_credentials(options)
+          @aws_access_key_id      = options[:aws_access_key_id]
+          @aws_secret_access_key  = options[:aws_secret_access_key]
+          @aws_session_token     = options[:aws_session_token]
+          @aws_credentials_expire_at = options[:aws_credentials_expire_at]
+
+          @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
+        end
+
         def request(params)
+          refresh_credentials_if_expired
+
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
+
           headers = {
             'Content-Type'  => 'application/x-www-form-urlencoded',
-            'Date'          => Fog::Time.now.to_date_header
+            'Date'          => Fog::Time.now.to_date_header,
           }
-
+          headers['x-amz-security-token'] = @aws_session_token if @aws_session_token
           #AWS3-HTTPS AWSAccessKeyId=<Your AWS Access Key ID>, Algorithm=HmacSHA256, Signature=<Signature>
           headers['X-Amzn-Authorization'] = 'AWS3-HTTPS '
           headers['X-Amzn-Authorization'] << 'AWSAccessKeyId=' << @aws_access_key_id

data/lib/fog/aws/simpledb.rb

@@ -1,11 +1,12 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'aws'))
+require 'fog/aws'
 
 module Fog
   module AWS
     class SimpleDB < Fog::Service
-
+      extend Fog::AWS::CredentialFetcher::ServiceMethods
+      
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :host, :nil_string, :path, :port, :scheme, :persistent, :region, :aws_session_token
+      recognizes :host, :nil_string, :path, :port, :scheme, :persistent, :region, :aws_session_token, :use_iam_profile, :aws_credentials_expire_at
 
       request_path 'fog/aws/requests/simpledb'
       request :batch_put_attributes
@@ -33,7 +34,8 @@ module Fog
         end
 
         def initialize(options={})
-          @aws_access_key_id = options[:aws_access_key_id]
+          @use_iam_profile = options[:use_iam_profile]
+          setup_credentials(options)
         end
 
         def data
@@ -44,10 +46,13 @@ module Fog
           self.class.data.delete(@aws_access_key_id)
         end
 
+        def setup_credentials(options)
+          @aws_access_key_id = options[:aws_access_key_id]
+        end
       end
 
       class Real
-
+        include Fog::AWS::CredentialFetcher::ConnectionMethods
         # Initialize connection to SimpleDB
         #
         # ==== Notes
@@ -68,11 +73,9 @@ module Fog
         def initialize(options={})
           require 'fog/core/parser'
 
-          @aws_access_key_id      = options[:aws_access_key_id]
-          @aws_secret_access_key  = options[:aws_secret_access_key]
-          @aws_session_token      = options[:aws_session_token]
+          @use_iam_profile = options[:use_iam_profile]
+          setup_credentials(options)
           @connection_options     = options[:connection_options] || {}
-          @hmac       = Fog::HMAC.new('sha256', @aws_secret_access_key)
           @nil_string = options[:nil_string]|| 'nil'
 
           options[:region] ||= 'us-east-1'
@@ -90,6 +93,14 @@ module Fog
         end
 
         private
+        def setup_credentials(options)
+          @aws_access_key_id      = options[:aws_access_key_id]
+          @aws_secret_access_key  = options[:aws_secret_access_key]
+          @aws_session_token      = options[:aws_session_token]
+          @aws_credentials_expire_at = options[:aws_credentials_expire_at]
+
+          @hmac       = Fog::HMAC.new('sha256', @aws_secret_access_key)
+        end
 
         def encode_attributes(attributes, replace_attributes = [], expected_attributes = {})
           encoded_attributes = {}
@@ -149,6 +160,8 @@ module Fog
         end
 
         def request(params)
+          refresh_credentials_if_expired
+
           idempotent = params.delete(:idempotent)
           parser = params.delete(:parser)
 

data/lib/fog/aws/sns.rb

@@ -1,11 +1,12 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'aws'))
+require 'fog/aws'
 
 module Fog
   module AWS
     class SNS < Fog::Service
+      extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :host, :path, :port, :scheme, :persistent, :region
+      recognizes :host, :path, :port, :scheme, :persistent, :region, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at
 
       request_path 'fog/aws/requests/sns'
       request :add_permission
@@ -30,7 +31,7 @@ module Fog
       end
 
       class Real
-
+        include Fog::AWS::CredentialFetcher::ConnectionMethods
         # Initialize connection to SNS
         #
         # ==== Notes
@@ -49,11 +50,9 @@ module Fog
         # ==== Returns
         # * SNS object with connection to AWS.
         def initialize(options={})
-          require 'multi_json'
-          @aws_access_key_id      = options[:aws_access_key_id]
-          @aws_secret_access_key  = options[:aws_secret_access_key]
+          @use_iam_profile = options[:use_iam_profile]
+          setup_credentials(options)
           @connection_options     = options[:connection_options] || {}
-          @hmac       = Fog::HMAC.new('sha256', @aws_secret_access_key)
 
           options[:region] ||= 'us-east-1'
           @host = options[:host] || "sns.#{options[:region]}.amazonaws.com"
@@ -71,7 +70,18 @@ module Fog
 
         private
 
+        def setup_credentials(options)
+          @aws_access_key_id      = options[:aws_access_key_id]
+          @aws_secret_access_key  = options[:aws_secret_access_key]
+          @aws_session_token     = options[:aws_session_token]
+          @aws_credentials_expire_at = options[:aws_credentials_expire_at]
+
+          @hmac       = Fog::HMAC.new('sha256', @aws_secret_access_key)
+        end
+
         def request(params)
+          refresh_credentials_if_expired
+
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
@@ -79,6 +89,7 @@ module Fog
             params,
             {
               :aws_access_key_id  => @aws_access_key_id,
+              :aws_session_token  => @aws_session_token,
               :hmac               => @hmac,
               :host               => @host,
               :path               => @path,

data/lib/fog/aws/sqs.rb

@@ -1,11 +1,12 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'aws'))
+require 'fog/aws'
 
 module Fog
   module AWS
     class SQS < Fog::Service
-
+      extend Fog::AWS::CredentialFetcher::ServiceMethods
+      
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :region, :host, :path, :port, :scheme, :persistent, :aws_session_token
+      recognizes :region, :host, :path, :port, :scheme, :persistent, :aws_session_token, :use_iam_profile, :aws_credentials_expire_at
 
       request_path 'fog/aws/requests/sqs'
       request :change_message_visibility
@@ -21,7 +22,6 @@ module Fog
       class Mock
         def self.data
           @data ||= Hash.new do |hash, region|
-            owner_id = Fog::AWS::Mock.owner_id
             hash[region] = Hash.new do |region_hash, key|
               region_hash[key] = {
                 :owner_id => Fog::AWS::Mock.owner_id,
@@ -36,8 +36,8 @@ module Fog
         end
 
         def initialize(options={})
-          @aws_access_key_id = options[:aws_access_key_id]
-
+          @use_iam_profile = options[:use_iam_profile]
+          setup_credentials(options)
           @region = options[:region] || 'us-east-1'
 
           unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
@@ -53,10 +53,13 @@ module Fog
           self.class.data[@region].delete(@aws_access_key_id)
         end
 
+        def setup_credentials(options)
+          @aws_access_key_id = options[:aws_access_key_id]
+        end
       end
 
       class Real
-
+        include Fog::AWS::CredentialFetcher::ConnectionMethods
         # Initialize connection to SQS
         #
         # ==== Notes
@@ -76,11 +79,9 @@ module Fog
         # ==== Returns
         # * SQS object with connection to AWS.
         def initialize(options={})
-          @aws_access_key_id      = options[:aws_access_key_id]
-          @aws_secret_access_key  = options[:aws_secret_access_key]
-          @aws_session_token      = options[:aws_session_token]
+          @use_iam_profile = options[:use_iam_profile]
+          setup_credentials(options)
           @connection_options     = options[:connection_options] || {}
-          @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
           options[:region] ||= 'us-east-1'
           @host = options[:host] || case options[:region]
           when 'us-east-1'
@@ -101,6 +102,14 @@ module Fog
 
         private
 
+        def setup_credentials(options)
+          @aws_access_key_id      = options[:aws_access_key_id]
+          @aws_secret_access_key  = options[:aws_secret_access_key]
+          @aws_session_token      = options[:aws_session_token]
+          @aws_credentials_expire_at = options[:aws_credentials_expire_at]
+          @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
+        end
+
         def path_from_queue_url(queue_url)
           queue_url.split('.com', 2).last
         end

data/lib/fog/aws/storage.rb

@@ -1,12 +1,15 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'aws'))
+require 'fog/aws'
 require 'fog/storage'
 
 module Fog
   module Storage
     class AWS < Fog::Service
+      extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent
+      recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at
+
+      secrets    :aws_secret_access_key, :hmac
 
       model_path 'fog/aws/models/storage'
       collection  :directories
@@ -66,16 +69,17 @@ module Fog
         def cdn
           @cdn ||= Fog::AWS::CDN.new(
             :aws_access_key_id => @aws_access_key_id,
-            :aws_secret_access_key => @aws_secret_access_key
+            :aws_secret_access_key => @aws_secret_access_key,
+            :use_iam_profile => @use_iam_profile
           )
         end
 
         def http_url(params, expires)
-          "http://" << host_path_query(params, expires)
+          scheme_host_path_query(params.merge(:scheme => 'http', :port => 80), expires)
         end
 
         def https_url(params, expires)
-          "https://" << host_path_query(params, expires)
+          scheme_host_path_query(params.merge(:scheme => 'https', :port => 443), expires)
         end
 
         def url(params, expires)
@@ -85,11 +89,19 @@ module Fog
 
         private
 
-        def host_path_query(params, expires)
+        def scheme_host_path_query(params, expires)
+          params[:scheme] ||= @scheme
+          if params[:port] == 80 && params[:scheme] == 'http'
+            params.delete(:port)
+          end
+          if params[:port] == 443 && params[:scheme] == 'https'
+            params.delete(:port)
+          end
           params[:headers] ||= {}
           params[:headers]['Date'] = expires.to_i
           params[:path] = Fog::AWS.escape(params[:path]).gsub('%2F', '/')
           query = []
+          params[:headers]['x-amz-security-token'] = @aws_session_token if @aws_session_token
           if params[:query]
             for key, value in params[:query]
               query << "#{key}=#{Fog::AWS.escape(value)}"
@@ -98,7 +110,9 @@ module Fog
           query << "AWSAccessKeyId=#{@aws_access_key_id}"
           query << "Signature=#{Fog::AWS.escape(signature(params))}"
           query << "Expires=#{params[:headers]['Date']}"
-          "#{params[:host]}/#{params[:path]}?#{query.join('&')}"
+          query << "x-amz-security-token=#{Fog::AWS.escape(@aws_session_token)}" if @aws_session_token
+          port_part = params[:port] && ":#{params[:port]}"
+          "#{params[:scheme]}://#{params[:host]}#{port_part}/#{params[:path]}?#{query.join('&')}"
         end
 
       end
@@ -187,9 +201,8 @@ module Fog
 
         def initialize(options={})
           require 'mime/types'
-          require 'multi_json'
-          @aws_access_key_id = options[:aws_access_key_id]
-          @aws_secret_access_key = options[:aws_secret_access_key]
+          @use_iam_profile = options[:use_iam_profile]
+          setup_credentials(options)
           options[:region] ||= 'us-east-1'
           @host = options[:host] || case options[:region]
           when 'us-east-1'
@@ -197,6 +210,7 @@ module Fog
           else
             "s3-#{options[:region]}.amazonaws.com"
           end
+          @scheme = options[:scheme] || 'https'
           @region = options[:region]
         end
 
@@ -212,11 +226,18 @@ module Fog
           "foo"
         end
 
+        def setup_credentials(options)
+          @aws_access_key_id = options[:aws_access_key_id]
+          @aws_secret_access_key = options[:aws_secret_access_key]
+          @aws_session_token     = options[:aws_session_token]
+          @aws_credentials_expire_at = options[:aws_credentials_expire_at]
+        end
+
       end
 
       class Real
         include Utils
-
+        include Fog::AWS::CredentialFetcher::ConnectionMethods
         # Initialize connection to S3
         #
         # ==== Notes
@@ -239,10 +260,10 @@ module Fog
           require 'fog/core/parser'
           require 'mime/types'
 
-          @aws_access_key_id = options[:aws_access_key_id]
-          @aws_secret_access_key = options[:aws_secret_access_key]
+          @use_iam_profile = options[:use_iam_profile]
+          setup_credentials(options)
           @connection_options     = options[:connection_options] || {}
-          @hmac = Fog::HMAC.new('sha1', @aws_secret_access_key)
+          
           if @endpoint = options[:endpoint]
             endpoint = URI.parse(@endpoint)
             @host = endpoint.host
@@ -255,6 +276,7 @@ module Fog
             @scheme = endpoint.scheme
           else
             options[:region] ||= 'us-east-1'
+            @region = options[:region]
             @host = options[:host] || case options[:region]
             when 'us-east-1'
               's3.amazonaws.com'
@@ -262,7 +284,7 @@ module Fog
               "s3-#{options[:region]}.amazonaws.com"
             end
             @path       = options[:path]        || '/'
-            @persistent = options[:persistent]  || true
+            @persistent = options.fetch(:persistent, true)
             @port       = options[:port]        || 443
             @scheme     = options[:scheme]      || 'https'
           end
@@ -322,7 +344,7 @@ DATA
               partNumber
               policy
               requestPayment
-              reponse-cache-control
+              response-cache-control
               response-content-disposition
               response-content-encoding
               response-content-language
@@ -343,15 +365,26 @@ DATA
           string_to_sign << canonical_resource
 
           signed_string = @hmac.sign(string_to_sign)
-          signature = Base64.encode64(signed_string).chomp!
+          Base64.encode64(signed_string).chomp!
         end
 
         private
 
+        def setup_credentials(options)
+          @aws_access_key_id     = options[:aws_access_key_id]
+          @aws_secret_access_key = options[:aws_secret_access_key]
+          @aws_session_token     = options[:aws_session_token]
+          @aws_credentials_expire_at = options[:aws_credentials_expire_at]
+
+          @hmac = Fog::HMAC.new('sha1', @aws_secret_access_key)
+        end
+
         def request(params, &block)
+          refresh_credentials_if_expired
+
           params[:headers]['Date'] = Fog::Time.now.to_date_header
+          params[:headers]['x-amz-security-token'] = @aws_session_token if @aws_session_token
           params[:headers]['Authorization'] = "AWS #{@aws_access_key_id}:#{signature(params)}"
-
           # FIXME: ToHashParser should make this not needed
           original_params = params.dup