aliquot 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aef4508df550d2c0646e46e3c9af7ec424ac424bf2ac83df5f2d58185a5b776f
-  data.tar.gz: 89e191121749427cca2a0514ab667e35866db81fd331f61df583d9ac089084db
+  metadata.gz: 54635adaeefcc42d7fb42a854825fb7f88472ab34be2992813d899581f278969
+  data.tar.gz: 3f66d3b5d5cc20d3a58e0c0e64958906beee8e80f07af26a4868ad27efa68e2d
 SHA512:
-  metadata.gz: 29a5aa707b1125ea0c9f9855aa023e862d5b05f8adb32b3d9752cef4606686059d3de09c1ac763d6aa874e514fa006b5585f719d2de50d6dd0a586205da95397
-  data.tar.gz: 3a41488d17b8dceac58285802de953422bdd9853490b2bf943101a45c11dc2b09d76c2e3200f1db7b8c8e33dcf89fd9abedd62a2550eb7a580af315298a633e7
+  metadata.gz: 23548bcc9c7e7a5ad77353bae8eab0283bd7593b3a9cf536298961d501a0b1b3181b722bf3e75ae0805d9c9dfa336d71a037ed5553eb57d0082b69a7e62aa60b
+  data.tar.gz: a14a66a56577b6de570fa4164f30d2ca96c3a23b5b6b915d136dfd7d825242c0ae6a403cc138ff97e26f76dcad1450ba67d8a733f7b45611141ba46241fafdb8

data/lib/aliquot/payment.rb

@@ -26,7 +26,7 @@ module Aliquot
         validation = Aliquot::Validator::Token.new(JSON.parse(token_string))
         validation.validate
       rescue JSON::JSONError => e
-        raise InputError, "token JSON invalid, #{e.message}"
+        raise InputError, "invalid token JSON, #{e.message}"
       end
 
       @token = validation.output
@@ -49,7 +49,7 @@ module Aliquot
 
       if protocol_version == 'ECv2'
         @intermediate_key = validate_intermediate_key
-        raise InvalidSignatureError, 'intermediate certificate expired' if intermediate_key_expired?
+        raise InvalidSignatureError, 'intermediate certificate has expired' if intermediate_key_expired?
       end
 
       check_signature
@@ -62,19 +62,19 @@ module Aliquot
         raise KeyDerivationError, "unable to derive keys, #{e.message}"
       end
 
-      raise InvalidMacError unless valid_mac?(mac_key)
+      raise InvalidMacError, 'MAC did not match' unless valid_mac?(mac_key)
 
       begin
         @message = JSON.parse(decrypt(aes_key, @signed_message[:encryptedMessage]))
       rescue JSON::JSONError => e
-        raise InputError, "encryptedMessage JSON invalid, #{e.message}"
+        raise InputError, "invalid encryptedMessage JSON, #{e.message}"
       rescue => e
         raise DecryptionError, "decryption failed, #{e.message}"
       end
 
       @message = validate_message
 
-      raise TokenExpiredError if expired?
+      raise TokenExpiredError, 'token has expired' if expired?
 
       @message
     end
@@ -103,7 +103,7 @@ module Aliquot
     end
 
     def validate_merchant_id
-      raise InvalidMerchantIDError unless /[[:graph:]]/ =~ @merchant_id
+      raise InvalidMerchantIDError unless /\A[[:graph:]]+\z/ =~ @merchant_id
       "merchant:#{@merchant_id}"
     end
 
@@ -133,7 +133,7 @@ module Aliquot
             key.verify(new_digest, message_signature, signed_string_message)
           end.any?
 
-        raise InvalidSignatureError unless success
+        raise InvalidSignatureError, 'signature of signedMessage did not match' unless success
       when 'ECv2'
         signed_key_signature = ['Google', 'ECv2', @token[:intermediateSigningKey][:signedKey]].map do |str|
           [str.length].pack('V') + str
@@ -141,7 +141,7 @@ module Aliquot
 
         # Check that the intermediate key signed the message
         pkey = OpenSSL::PKey::EC.new(Base64.strict_decode64(@intermediate_key[:keyValue]))
-        raise InvalidSignatureError, 'intermediate did not sign message' unless pkey.verify(new_digest, message_signature, signed_string_message)
+        raise InvalidSignatureError, 'signature of signedMessage did not match' unless pkey.verify(new_digest, message_signature, signed_string_message)
 
         intermediate_signatures = @token[:intermediateSigningKey][:signatures]
 
@@ -152,12 +152,12 @@ module Aliquot
           signed_key_signature
         )
 
-        raise InvalidSignatureError, 'intermediate not signed' unless success
+        raise InvalidSignatureError, 'no valid signature of intermediate key found' unless success
       end
     rescue OpenSSL::PKey::PKeyError => e
       # Catches problems with verifying signature. Can be caused by signature
       # being valid ASN1 but having invalid structure.
-      raise InvalidSignatureError, e.message
+      raise InvalidSignatureError, "error verifying signature, #{e.message}"
     end
 
     def root_keys

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliquot
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Clearhaus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-14 00:00:00.000000000 Z
+date: 2019-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-validation