bunq-client 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc23bc27575508ac16d6b2c8d897ab8e5e6cfdbec6f01a10909c2e674f3ce3fc
-  data.tar.gz: dc072e3faf586f7dfc9a3b251a79791836157e9c8e7746310cb1ac009a5155f4
+  metadata.gz: 98dbab9b8695c2550142560443bc09a6a3f4db726bb1eb4505c42fd08142cf99
+  data.tar.gz: d473fdd5e1c2e42587678a954f030b167af21aebccd1207972f8d51e9caa2e80
 SHA512:
-  metadata.gz: 92b3bdff93c25225d6af4dee83f8b29387aa06d113ebf83cce27f6535fcf01f8abe1d1eec4c32571fceda4caf65a24479f1f0df12f009e533883e19b124b51e6
-  data.tar.gz: 3f7ea8bfd8206605e8391a0334021fe76ad122835618ab1b565c70cb8ec0e17834471accc27ce1131673702fc608cd69a1f70cc8aeb5022bd0373e09c4bf59cd
+  metadata.gz: 56ebe10bae8893b8f263347077d2731b4af09f05b5162700e0daedd6debd167d9ee5a8d3ed6d338f8a2ef5233193cbd412bf8cc2c25669393ee1aa48690ab96b
+  data.tar.gz: a114dd6b263c1674b45b4ae552b858431cd4161378b771e0383e04fa2e845d6d14deddac55b3e3ff1216ba59fdf33b56b9632052c291ff11dad7d48ef1ec0eec

data/lib/bunq/errors.rb

@@ -26,6 +26,7 @@ module Bunq
   end
 
   class UnexpectedResponse < ResponseError; end
+  class RequestSignatureRequired < ResponseError; end
   class AbsentResponseSignature < ResponseError; end
   class TooManyRequestsResponse < ResponseError; end
   class UnauthorisedResponse < ResponseError; end

data/lib/bunq/resource.rb

@@ -89,12 +89,7 @@ module Bunq
     end
 
     def sign_request(verb, params, headers, payload = nil)
-      client.signature.create(
-        verb,
-        encode_params(@path, params),
-        resource.headers.merge(headers),
-        payload
-      )
+      client.signature.create(payload)
     end
 
     def encode_params(path, params)

data/lib/bunq/signature.rb

@@ -5,9 +5,6 @@ module Bunq
     # headers in raw_headers hash in rest client are all lower case
     BUNQ_HEADER_PREFIX = 'X-Bunq-'.downcase
     BUNQ_SERVER_SIGNATURE_RESPONSE_HEADER = 'X-Bunq-Server-Signature'.downcase
-    CACHE_CONTROL_HEADER = 'Cache-Control'.downcase
-    USER_AGENT_HEADER = 'User-Agent'.downcase
-    SIGNABLE_HEADERS = [CACHE_CONTROL_HEADER, USER_AGENT_HEADER]
 
     def initialize(private_key, server_public_key)
       fail ArgumentError.new('private_key is mandatory') unless private_key
@@ -17,11 +14,8 @@ module Bunq
       @server_public_key = OpenSSL::PKey::RSA.new(server_public_key)
     end
 
-    def create(verb, path, headers, body)
-      signature = private_key.sign(
-        digest,
-        signable_input(verb, path, headers.select { |header_name, _| signable_header?(header_name) }, body)
-      )
+    def create(body)
+      signature = private_key.sign(digest, body.to_s)
 
       Base64.strict_encode64(signature)
     end
@@ -29,17 +23,20 @@ module Bunq
     def verify!(response)
       return if skip_signature_check(response.code)
 
-      sorted_bunq_headers = response.raw_headers.select(&method(:verifiable_header?)).sort.to_h.map { |k, v| "#{k.to_s.split('-').map(&:capitalize).join('-')}: #{v.first}" }
-      data = %Q{#{response.code}\n#{sorted_bunq_headers.join("\n")}\n\n#{response.body}}
-
       signature_headers = response.raw_headers.find { |k, _| k.to_s.downcase == BUNQ_SERVER_SIGNATURE_RESPONSE_HEADER }
-      fail AbsentResponseSignature.new(code: response.code, headers: response.raw_headers, body: response.body) unless signature_headers
+      unless signature_headers
+        fail AbsentResponseSignature.new(code: response.code, headers: response.raw_headers, body: response.body)
+      end
 
       signature_headers_value = signature_headers[1]
-      fail AbsentResponseSignature.new(code: response.code, headers: response.raw_headers, body: response.body) unless signature_headers_value
+      unless signature_headers_value
+        fail AbsentResponseSignature.new(code: response.code, headers: response.raw_headers, body: response.body)
+      end
 
       signature = Base64.strict_decode64(signature_headers_value.first)
-      fail UnexpectedResponse.new(code: response.code, headers: response.raw_headers, body: response.body) unless server_public_key.verify(digest, signature, data)
+      unless server_public_key.verify(digest, signature, response.body)
+        fail RequestSignatureRequired.new(code: response.code, headers: response.raw_headers, body: response.body)
+      end
     end
 
     private
@@ -50,20 +47,6 @@ module Bunq
       OpenSSL::Digest::SHA256.new
     end
 
-    def signable_input(verb, path, headers, body)
-      sortable_headers = Hash[headers.collect{ |k,v| [k.to_s, v] }]
-      head = [
-        [verb, path].join(' '),
-        sortable_headers.sort.to_h.map { |k,v| "#{k}: #{v}" }.join("\n")
-      ].join("\n")
-      "#{head}\n\n#{body}"
-    end
-
-    def signable_header?(header_name)
-      _header_name = header_name.to_s.downcase
-      SIGNABLE_HEADERS.include?(_header_name) || _header_name.start_with?(BUNQ_HEADER_PREFIX)
-    end
-
     def verifiable_header?(header_name, _)
       _header_name = header_name.to_s.downcase
       _header_name.start_with?(BUNQ_HEADER_PREFIX) && _header_name != BUNQ_SERVER_SIGNATURE_RESPONSE_HEADER

data/lib/bunq/version.rb

@@ -1,3 +1,3 @@
 module Bunq
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunq-client
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Lars Vonk
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client