fog 1.24.0 → 1.25.0

data/lib/fog.rb

@@ -10,7 +10,6 @@ require 'fog/core'
 # data exchange specific (to be extracted and used on a per provider basis)
 require 'fog/xml'
 require 'fog/json'
-require 'fog/core/parser'
 
 # deprecation wrappers (XML wrapped version)
 require 'fog/core/deprecated/connection'
@@ -48,6 +47,7 @@ require 'fog/rage4'
 require 'fog/riakcs'
 require 'fog/openstack'
 require 'fog/ovirt'
+require 'fog/profitbricks'
 require 'fog/sakuracloud'
 require 'fog/serverlove'
 require 'fog/softlayer'

data/lib/fog/aws/auto_scaling.rb

@@ -86,10 +86,7 @@ module Fog
         # * AutoScaling object with connection to AWS.
 
         def initialize(options={})
-          require 'fog/core/parser'
-
           @use_iam_profile = options[:use_iam_profile]
-          setup_credentials(options)
 
           @connection_options = options[:connection_options] || {}
 
@@ -105,6 +102,8 @@ module Fog
           @persistent = options[:persistent]  || false
           @scheme     = options[:scheme]      || 'https'
           @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+
+          setup_credentials(options)
         end
 
         def reload
@@ -119,12 +118,13 @@ module Fog
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
-          body = AWS.signed_params(
+          body, headers = AWS.signed_params_v4(
             params,
+            { 'Content-Type' => 'application/x-www-form-urlencoded' },
             {
-              :aws_access_key_id  => @aws_access_key_id,
               :aws_session_token  => @aws_session_token,
-              :hmac               => @hmac,
+              :method             => 'POST',
+              :signer             => @signer,
               :host               => @host,
               :path               => @path,
               :port               => @port,
@@ -134,20 +134,20 @@ module Fog
 
           if @instrumentor
             @instrumentor.instrument("#{@instrumentor_name}.request", params) do
-              _request(body, idempotent, parser)
+              _request(body, headers, idempotent, parser)
             end
           else
-            _request(body, idempotent, parser)
+            _request(body,  headers, idempotent, parser)
           end
         end
 
-        def _request(body, idempotent, parser)
+        def _request(body,  headers, idempotent, parser)
           begin
             @connection.request({
               :body       => body,
               :expects    => 200,
               :idempotent => idempotent,
-              :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+              :headers    =>  headers, 
               :method     => 'POST',
               :parser     => parser
             })
@@ -173,7 +173,7 @@ module Fog
           @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)
+          @signer = Fog::AWS::SignatureV4.new( @aws_access_key_id, @aws_secret_access_key, @region, 'autoscaling')
         end
       end
 
@@ -253,7 +253,7 @@ module Fog
           setup_credentials(options)
           @region = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
+          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-central-1', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
             raise ArgumentError, "Unknown region: #{@region.inspect}"
           end
         end

data/lib/fog/aws/beanstalk.rb

@@ -64,10 +64,8 @@ module Fog
       class Real
         include Fog::AWS::CredentialFetcher::ConnectionMethods
         def initialize(options={})
-          require 'fog/core/parser'
 
           @use_iam_profile = options[:use_iam_profile]
-          setup_credentials(options)
 
           @connection_options = options[:connection_options] || {}
           options[:region] ||= 'us-east-1'
@@ -79,6 +77,9 @@ module Fog
           @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
           @instrumentor       = options[:instrumentor]
           @instrumentor_name  = options[:instrumentor_name] || 'fog.aws.beanstalk'
+
+          @region = options[:region]
+          setup_credentials(options)
         end
 
         def reload
@@ -98,7 +99,7 @@ module Fog
           @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)
+          @signer = Fog::AWS::SignatureV4.new( @aws_access_key_id, @aws_secret_access_key, @region, 'elasticbeanstalk')
         end
 
         def request(params)
@@ -107,12 +108,13 @@ module Fog
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
-          body = AWS.signed_params(
+          body, headers = AWS.signed_params_v4(
               params,
+              { 'Content-Type' => 'application/x-www-form-urlencoded' },
               {
-                  :aws_access_key_id  => @aws_access_key_id,
+                  :signer             => @signer,
                   :aws_session_token  => @aws_session_token,
-                  :hmac               => @hmac,
+                  :method             => "POST",
                   :host               => @host,
                   :path               => @path,
                   :port               => @port,
@@ -122,18 +124,18 @@ module Fog
 
           if @instrumentor
             @instrumentor.instrument("#{@instrumentor_name}.request", params) do
-              _request(body, idempotent, parser)
+              _request(body, headers, idempotent, parser)
             end
           else
-            _request(body, idempotent, parser)
+            _request(body, headers, idempotent, parser)
           end
         end
 
-        def _request(body, idempotent, parser)
+        def _request(body, headers, idempotent, parser)
           @connection.request({
               :body       => body,
               :expects    => 200,
-              :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+              :headers    => headers,
               :idempotent => idempotent,
               :method     => 'POST',
               :parser     => parser

data/lib/fog/aws/cdn.rb

@@ -142,7 +142,6 @@ EOF
         # ==== Returns
         # * cdn object with connection to aws.
         def initialize(options={})
-          require 'fog/core/parser'
 
           @use_iam_profile = options[:use_iam_profile]
           setup_credentials(options)

data/lib/fog/aws/cloud_formation.rb

@@ -46,21 +46,22 @@ module Fog
         # ==== Returns
         # * CloudFormation object with connection to AWS.
         def initialize(options={})
-          require 'fog/core/parser'
 
           @use_iam_profile = options[:use_iam_profile]
-          setup_credentials(options)
 
           @instrumentor       = options[:instrumentor]
           @instrumentor_name  = options[:instrumentor_name] || 'fog.aws.cloud_formation'
           @connection_options = options[:connection_options] || {}
           options[:region] ||= 'us-east-1'
+          @region = options[:region]
           @host = options[:host] || "cloudformation.#{options[:region]}.amazonaws.com"
           @path       = options[:path]        || '/'
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
           @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+
+          setup_credentials(options)
         end
 
         def reload
@@ -75,7 +76,7 @@ module Fog
           @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)
+          @signer = Fog::AWS::SignatureV4.new( @aws_access_key_id, @aws_secret_access_key, @region, 'cloudformation')
         end
 
         def request(params)
@@ -84,34 +85,35 @@ module Fog
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
-          body = Fog::AWS.signed_params(
+          body, headers = Fog::AWS.signed_params_v4(
             params,
+            { 'Content-Type' => 'application/x-www-form-urlencoded' },
             {
-              :aws_access_key_id  => @aws_access_key_id,
+              :signer  => @signer,
               :aws_session_token  => @aws_session_token,
-              :hmac               => @hmac,
               :host               => @host,
               :path               => @path,
               :port               => @port,
-              :version            => '2010-05-15'
+              :version            => '2010-05-15',
+              :method             => 'POST'
             }
           )
 
           if @instrumentor
             @instrumentor.instrument("#{@instrumentor_name}.request", params) do
-              _request(body, idempotent, parser)
+              _request(body, headers, idempotent, parser)
             end
           else
-            _request(body, idempotent, parser)
+            _request(body, headers, idempotent, parser)
           end
         end
 
-        def _request(body, idempotent, parser)
+        def _request(body, headers, idempotent, parser)
           @connection.request({
             :body       => body,
             :expects    => 200,
             :idempotent => idempotent,
-            :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+            :headers    => headers,
             :method     => 'POST',
             :parser     => parser
           })

data/lib/fog/aws/cloud_watch.rb

@@ -54,7 +54,7 @@ module Fog
 
           @region = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
+          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-central-1', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
             raise ArgumentError, "Unknown region: #{@region.inspect}"
           end
         end
@@ -90,7 +90,6 @@ module Fog
         # * CloudWatch object with connection to AWS.
         def initialize(options={})
           @use_iam_profile = options[:use_iam_profile]
-          setup_credentials(options)
 
           @connection_options = options[:connection_options] || {}
 
@@ -98,12 +97,15 @@ module Fog
           @instrumentor_name      = options[:instrumentor_name] || 'fog.aws.cloud_watch'
 
           options[:region] ||= 'us-east-1'
+          @region = options[:region]
           @host = options[:host] || "monitoring.#{options[:region]}.amazonaws.com"
           @path       = options[:path]        || '/'
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
           @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+
+          setup_credentials(options)
         end
 
         def reload
@@ -118,7 +120,7 @@ module Fog
           @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)
+          @signer = Fog::AWS::SignatureV4.new( @aws_access_key_id, @aws_secret_access_key,@region,'monitoring')
         end
 
         def request(params)
@@ -126,33 +128,34 @@ module Fog
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
-          body = AWS.signed_params(
+          body, headers = AWS.signed_params_v4(
             params,
+            { 'Content-Type' => 'application/x-www-form-urlencoded' },
             {
-              :aws_access_key_id  => @aws_access_key_id,
+              :signer             => @signer,
               :aws_session_token  => @aws_session_token,
-              :hmac               => @hmac,
               :host               => @host,
               :path               => @path,
               :port               => @port,
-              :version            => '2010-08-01'
+              :version            => '2010-08-01',
+              :method             => 'POST'
             }
           )
 
           if @instrumentor
             @instrumentor.instrument("#{@instrumentor_name}.request", params) do
-              _request(body, idempotent, parser)
+              _request(body, headers, idempotent, parser)
             end
           else
-            _request(body, idempotent, parser)
+            _request(body, headers, idempotent, parser)
           end
         end
 
-        def _request(body, idempotent, parser)
+        def _request(body, headers, idempotent, parser)
           @connection.request({
             :body       => body,
             :expects    => 200,
-            :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+            :headers    => headers,
             :idempotent => idempotent,
             :method     => 'POST',
             :parser     => parser

data/lib/fog/aws/compute.rb

@@ -449,16 +449,16 @@ module Fog
         attr_accessor :region
 
         def initialize(options={})
-          require 'fog/core/parser'
 
-          @use_iam_profile = options[:use_iam_profile]
-          setup_credentials(options)
           @connection_options     = options[:connection_options] || {}
           @region                 = options[:region] ||= 'us-east-1'
           @instrumentor           = options[:instrumentor]
           @instrumentor_name      = options[:instrumentor_name] || 'fog.aws.compute'
           @version                = options[:version]     ||  '2014-06-15'
 
+          @use_iam_profile = options[:use_iam_profile]
+          setup_credentials(options)
+
           if @endpoint = options[:endpoint]
             endpoint = URI.parse(@endpoint)
             @host = endpoint.host or raise InvalidURIError.new("could not parse endpoint: #{@endpoint}")
@@ -488,7 +488,7 @@ module Fog
           @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)
+          @signer = Fog::AWS::SignatureV4.new( @aws_access_key_id, @aws_secret_access_key,@region,'ec2')
         end
 
         def request(params)
@@ -496,33 +496,33 @@ module Fog
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
-          body = Fog::AWS.signed_params(
-            params,
-            {
-              :aws_access_key_id  => @aws_access_key_id,
-              :aws_session_token  => @aws_session_token,
-              :hmac               => @hmac,
-              :host               => @host,
-              :path               => @path,
-              :port               => @port,
-              :version            => @version
+          body, headers = Fog::AWS.signed_params_v4(
+             params,
+             {'Content-Type' => 'application/x-www-form-urlencoded'},
+             {
+               :host               => @host,
+               :path               => @path,
+               :port               => @port,
+               :version            => @version,
+               :signer             => @signer,
+               :aws_session_token  => @aws_session_token,
+               :method             => "POST"
             }
           )
-
           if @instrumentor
             @instrumentor.instrument("#{@instrumentor_name}.request", params) do
-              _request(body, idempotent, parser)
+              _request(body, headers, idempotent, parser)
             end
           else
-            _request(body, idempotent, parser)
+            _request(body, headers, idempotent, parser)
           end
         end
 
-        def _request(body, idempotent, parser)
+        def _request(body, headers, idempotent, parser)
           @connection.request({
               :body       => body,
               :expects    => 200,
-              :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+              :headers    => headers,
               :idempotent => idempotent,
               :method     => 'POST',
               :parser     => parser

data/lib/fog/aws/core.rb

@@ -94,6 +94,27 @@ module Fog
       }
     end
 
+    def self.signed_params_v4(params, headers, options={})
+      date = Fog::Time.now
+
+      params = params.merge('Version' => options[:version])
+
+      headers = headers.merge('Host' => options[:host], 'x-amz-date' => date.to_iso8601_basic)
+      headers['x-amz-security-token'] = options[:aws_session_token] if options[:aws_session_token]
+
+      body = ''
+      for key in params.keys.sort
+        unless (value = params[key]).nil?
+          body << "#{key}=#{escape(value.to_s)}&"
+        end
+      end
+      body.chop!
+      
+      headers['Authorization'] = options[:signer].sign({:method => options[:method], :headers => headers, :body => body, :query => {}, :path => options[:path]}, date)
+
+      return body, headers
+    end
+
     def self.signed_params(params, options = {})
       params.merge!({
         'AWSAccessKeyId'    => options[:aws_access_key_id],

data/lib/fog/aws/dns.rb

@@ -90,7 +90,6 @@ module Fog
         # ==== Returns
         # * dns object with connection to aws.
         def initialize(options={})
-          require 'fog/core/parser'
 
           @use_iam_profile = options[:use_iam_profile]
           setup_credentials(options)

data/lib/fog/aws/elasticache.rb

@@ -55,11 +55,12 @@ module Fog
         include Fog::AWS::CredentialFetcher::ConnectionMethods
         def initialize(options={})
           @use_iam_profile = options[:use_iam_profile]
-          setup_credentials(options)
 
           @instrumentor       = options[:instrumentor]
           @instrumentor_name  = options[:instrumentor_name] || 'fog.aws.elasticache'
           options[:region] ||= 'us-east-1'
+
+          @region = options[:region]
           @host = options[:host] || "elasticache.#{options[:region]}.amazonaws.com"
           @path       = options[:path]      || '/'
           @port       = options[:port]      || 443
@@ -67,6 +68,8 @@ module Fog
           @connection = Fog::XML::Connection.new(
             "#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent]
           )
+
+          setup_credentials(options)
         end
 
         def reload
@@ -81,7 +84,7 @@ module Fog
           @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)
+          @signer = Fog::AWS::SignatureV4.new( @aws_access_key_id, @aws_secret_access_key, @region, 'elasticache')
         end
 
         def request(params)
@@ -90,12 +93,13 @@ module Fog
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
-          body = Fog::AWS.signed_params(
+          body, headers = Fog::AWS.signed_params_v4(
             params,
+            { 'Content-Type' => 'application/x-www-form-urlencoded' },
             {
-            :aws_access_key_id  => @aws_access_key_id,
+            :signer             => @signer,
             :aws_session_token  => @aws_session_token,
-            :hmac               => @hmac,
+            :method             => 'POST',
             :host               => @host,
             :path               => @path,
             :port               => @port,
@@ -105,18 +109,18 @@ module Fog
 
           if @instrumentor
             @instrumentor.instrument("#{@instrumentor_name}.request", params) do
-              _request(body, idempotent, parser)
+              _request(body, headers, idempotent, parser)
             end
           else
-            _request(body, idempotent, parser)
+            _request(body, headers, idempotent, parser)
           end
         end
 
-        def _request(body, idempotent, parser)
+        def _request(body, headers, idempotent, parser)
           @connection.request({
             :body       => body,
             :expects    => 200,
-            :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+            :headers    => headers, 
             :idempotent => idempotent,
             :method     => 'POST',
             :parser     => parser