simple-hmac 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f76e1464e7892a3d096d2d49450e493e8883168
-  data.tar.gz: bea317b3629c231256bd469e64c80852b113f435
+  metadata.gz: a10a8941921b21175048b5eb843a6659aa56696c
+  data.tar.gz: 24ba421c173c95419d29f53b4ab5b77419ed2033
 SHA512:
-  metadata.gz: bc2e6d1fa0f7bc91805fb872c7335b6929e395b3a96c4b22c7629408c8db2d1f1d2040e1ef58975f5458bc1b43954a4028ee0d4352368a33c7012e14c391779f
-  data.tar.gz: f7d2710c3c912e0f61dd2496182c37a3125d9c2e985adf67b2d320ada51b805030d3a4bd8b737f01d6986a4faa75955409ec828f46f643584a25754d1c328d5a
+  metadata.gz: 33f3efcfb8596e4993879f7ed782556266cb11591a78717122cc82b88001716757f9d1e4571ca21dd557f981d1e4a95c4207f6ac22c81384045b6eecd3d13469
+  data.tar.gz: 8eff9a10374382d84975e96a7e922d3fd9b5f66ef46b6c1bdaca03f82515e9fc58029f0934cccff7cac8711a4397eac741e7bde0e541ba456e5df23518abae97

data/lib/action-dispatch/request.rb

@@ -3,12 +3,18 @@ module ActionDispatch
     include SimpleHmac::Helper
 
     def hmac_api_id(auth_prefix='\w+')
-      parse_hmac(auth_prefix)[1]
-    end
-
-    def hmac_valid?(api_secret, timeout_seconds=900, auth_prefix='\w+')
-      ((Time.now.utc - Time.httpdate(timestamp).utc < timeout_seconds) rescue false) &&
-          parse_hmac(auth_prefix)[2] == hmac_token(content_type, calculate_content_md5, url, timestamp, api_secret)
+      result = parse_hmac(auth_prefix)
+      result && result[1]
+    end
+
+    def hmac_valid?(api_secret, options={})
+      options         = { timeout_seconds: 900, auth_prefix: '\w+' }.merge(options)
+      timeout_seconds = options.delete :timeout_seconds
+      auth_prefix     = options.delete :auth_prefix
+      result          = parse_hmac(auth_prefix)
+      result &&
+          ((Time.now.utc - Time.httpdate(timestamp).utc < timeout_seconds) rescue false) &&
+          result[2] == hmac_token(request_method, content_type, calculate_content_md5, url, timestamp, api_secret, options)
     end
 
     private

data/lib/rest-client/request.rb

@@ -2,18 +2,21 @@ module RestClient
   class Request
     include SimpleHmac::Helper
 
-    def sign!(api_id, api_secret, auth_prefix='APIAuth')
-      processed_headers['Content-Type'] ||= 'text/plain'
-      date                              = Time.now.utc.httpdate
+    def sign!(api_id, api_secret, options={})
+      options         = { auth_prefix: 'WIZYPAY' }.merge(options)
+      auth_prefix     = options.delete :auth_prefix
+      date = Time.now.utc.httpdate
       processed_headers.merge! 'Date' => date
-      hmac_token = hmac_token(processed_headers['Content-Type'], set_md5_header, url, date, api_secret)
+      content_type = processed_headers['Content-Type'] || 'text/plain'
+      processed_headers.merge! 'Content-Type' => content_type
+      hmac_token = hmac_token(method, content_type, set_md5_header, url, date, api_secret, options)
       processed_headers.merge! 'Authorization' => "#{auth_prefix} #{api_id}:#{hmac_token}"
     end
 
     private
 
     def set_md5_header
-      return '' unless [:post, :put, :patch].include?(@method)
+      return '' unless [:post, :put, :patch].include?(method)
       if payload
         body = payload.read
         payload.instance_variable_get(:@stream).seek(0)

data/lib/simple-hmac/helper.rb

@@ -1,8 +1,10 @@
 module SimpleHmac
   module Helper
-    def hmac_token(content_type, md5, url, date, api_secret)
-      data = [content_type, md5, url.gsub(/https?:\/\/[^(,|\?|\/)]*/, ''), date].join(',')
-      Base64.strict_encode64(OpenSSL::HMAC.digest('sha1', api_secret, data))
+    def hmac_token(verb, content_type, md5, url, date, api_secret, options={})
+      options = { separator: "\n" }.merge(options)
+      data = [content_type, md5, url.gsub(/https?:\/\/[^(,|\?|\/)]*/, ''), date]
+      data.unshift(verb.upcase) if options[:include_verb]
+      Base64.strict_encode64(OpenSSL::HMAC.digest('sha1', api_secret, data.join(options[:separator])))
     end
   end
 end

data/lib/simple-hmac/version.rb

@@ -1,4 +1,4 @@
 module SimpleHmac
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-hmac
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Chaker Nakhli