ace-client 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/ace-client/base.rb

@@ -42,5 +42,10 @@ module AceClient
       @last_response_time = Time.now - start_time
       @last_response
     end
+
+    def endpoint_url
+      protocol = use_ssl ? 'https' : 'http' 
+      protocol + '://' + endpoint
+    end
   end
 end

data/lib/ace-client/query2.rb

@@ -97,11 +97,6 @@ module AceClient
       @sampler[:output].puts Nokogiri::XML(response.body).to_xml(:indent => 4)
     end
 
-    def endpoint_url
-      protocol = use_ssl ? 'https' : 'http' 
-      protocol + '://' + endpoint
-    end
-
     def create_signature
       digest = OpenSSL::Digest::Digest.new(@signature_method.downcase.gsub(/hmac/, ''))
       Base64.encode64(OpenSSL::HMAC.digest(digest, secret_access_key, string_to_sign)).strip

data/lib/ace-client/query4.rb

@@ -1,5 +1,187 @@
 module AceClient
   class Query4 < Base
-    # not implemented yet
+    attr_accessor :headers
+    attr_accessor :region
+    attr_accessor :body
+    attr_accessor :service
+    attr_accessor :datetime
+    attr_accessor :query
+
+    format :xml
+    #debug_output $stdout
+
+    def initialize(options)
+      super(options)
+      @service = options[:service]
+      @region = options[:region]
+    end
+
+    def action(action, params={})
+      params.update('Action' => action)
+      execute(params)
+    end
+
+    def execute(params)
+      @datetime = Time.now.utc.strftime("%Y%m%dT%H%M%SZ")
+      if http_method == :get
+        execute_get(params)
+      else http_method == :post
+        execute_post(params)
+      end
+    end
+
+    def execute_get(params)
+      @headers = {}
+      @headers['host'] = @endpoint
+
+      @params = params
+      @params['Version'] = @version if @version
+      @params.update(
+        'X-Amz-Algorithm' => 'AWS4-HMAC-SHA256',
+        'X-Amz-Credential' => access_key_id + '/' + credential_string(datetime),
+        'X-Amz-Date' => datetime,
+        'X-Amz-SignedHeaders' => signed_headers
+      )
+      options = self.class.default_options.dup
+      options[:query] = @params
+      request = HTTParty::Request.new(Net::HTTP::Get, endpoint_url + @path, options)
+      @query = request.send(:normalize_query, options[:query])
+
+      @params.update('X-Amz-Signature' => signature(datetime))
+
+      @body = ''
+
+      request = HTTParty::Request.new(Net::HTTP::Get, endpoint_url + @path, options)
+      request.perform
+    end
+
+    def execute_post(params)
+      @params = params
+      options = {}
+      options = self.class.default_options.dup
+      options[:body] = @params
+      request = HTTParty::Request.new(Net::HTTP::Post, endpoint_url + @path, options)
+      @body = request.send(:normalize_query, options[:body])
+
+      @headers = {}
+      add_authorization!
+      options[:headers] = headers
+
+      request = HTTParty::Request.new(Net::HTTP::Post, endpoint_url + @path, options)
+      request.perform
+    end
+
+    def querystring
+      if http_method == :post
+        ''
+      elsif http_method == :get
+        @params.sort.collect { |param|
+          "#{CGI::escape(param[0])}=#{CGI::escape(param[1])}"
+        }.join("&").gsub('+', '%20').gsub('%7E', '~')
+      end
+    end
+
+    def add_authorization!
+      headers['content-type'] ||= 'application/x-www-form-urlencoded'
+      headers['host'] = endpoint
+      headers['x-amz-date'] = datetime
+      #headers['x-amz-security-token'] = credentials.session_token if credentials.session_token
+      headers['x-amz-content-sha256'] ||= hexdigest(body || '')
+      headers['authorization'] = authorization(datetime)
+    end
+
+    protected
+
+    def authorization datetime
+      parts = []
+      parts << "AWS4-HMAC-SHA256 Credential=#{access_key_id}/#{credential_string(datetime)}"
+      parts << "SignedHeaders=#{signed_headers}"
+      parts << "Signature=#{signature(datetime)}"
+      parts.join(', ')
+    end
+
+    def signature datetime
+      k_secret = secret_access_key
+      k_date = hmac("AWS4" + k_secret, datetime[0,8])
+      k_region = hmac(k_date, region)
+      k_service = hmac(k_region, service)
+      k_credentials = hmac(k_service, 'aws4_request')
+      hexhmac(k_credentials, string_to_sign(datetime))
+    end
+
+    def string_to_sign datetime
+      parts = []
+      parts << 'AWS4-HMAC-SHA256'
+      parts << datetime
+      parts << credential_string(datetime)
+      parts << hexdigest(canonical_request)
+      parts.join("\n")
+    end
+
+    def credential_string datetime
+      parts = []
+      parts << datetime[0,8]
+      parts << region
+      parts << service
+      parts << 'aws4_request'
+      parts.join("/")
+    end
+
+    def canonical_request
+      parts = []
+      parts << http_method.to_s.upcase
+      parts << @path
+      parts << querystring
+      parts << canonical_headers + "\n"
+      parts << signed_headers
+      if http_method == :post
+        parts << headers['x-amz-content-sha256']
+      else
+        parts << hexdigest('')
+      end
+      parts.join("\n")
+    end
+
+    def signed_headers
+      to_sign = headers.keys.map{|k| k.to_s.downcase }
+      to_sign.delete('authorization')
+      to_sign.sort.join(";")
+    end
+
+    def canonical_headers
+      headers = []
+      self.headers.each_pair do |k,v|
+        headers << [k,v] unless k == 'authorization'
+      end
+      headers = headers.sort_by(&:first)
+      headers.map{|k,v| "#{k}:#{canonical_header_values(v)}" }.join("\n")
+    end
+
+    def canonical_header_values values
+      values = [values] unless values.is_a?(Array)
+      values.map(&:to_s).join(',').gsub(/\s+/, ' ').strip
+    end
+
+    def hexdigest value
+      digest = Digest::SHA256.new
+      if value.respond_to?(:read)
+        chunk = nil
+        chunk_size = 1024 * 1024 # 1 megabyte
+        digest.update(chunk) while chunk = value.read(chunk_size)
+        value.rewind
+      else
+        digest.update(value)
+      end
+      digest.hexdigest
+    end
+
+    def hmac key, value
+      OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha256'), key, value)
+    end
+
+    def hexhmac key, value
+      OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new('sha256'), key, value)
+    end
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ace-client
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000Z
+date: 2013-11-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &46499740 !ruby/object:Gem::Requirement
+  requirement: &176407020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *46499740
+  version_requirements: *176407020
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &46498620 !ruby/object:Gem::Requirement
+  requirement: &176405860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *46498620
+  version_requirements: *176405860
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &46497540 !ruby/object:Gem::Requirement
+  requirement: &176404700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *46497540
+  version_requirements: *176404700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &46496500 !ruby/object:Gem::Requirement
+  requirement: &176403740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *46496500
+  version_requirements: *176403740
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &46495600 !ruby/object:Gem::Requirement
+  requirement: &176402780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *46495600
+  version_requirements: *176402780
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &46494460 !ruby/object:Gem::Requirement
+  requirement: &176401640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *46494460
+  version_requirements: *176401640
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &46493700 !ruby/object:Gem::Requirement
+  requirement: &176398580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: 1.8.7
   type: :development
   prerelease: false
-  version_requirements: *46493700
+  version_requirements: *176398580
 description: Simple ACE(Amazon Compatible Environment) Client
 email: tily05@gmail.com
 executables:
@@ -125,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2035499270960156883
+      hash: -1538802367424369011
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: