aliquot 0.15.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54635adaeefcc42d7fb42a854825fb7f88472ab34be2992813d899581f278969
-  data.tar.gz: 3f66d3b5d5cc20d3a58e0c0e64958906beee8e80f07af26a4868ad27efa68e2d
+  metadata.gz: 0cdd20926e96b21c0fb8c494b13fe34995c59646285d71416c33045e907b830a
+  data.tar.gz: 32d7e64f5ef20f37404bcc5293672dbaa43f6d299bd0701e49b859ad2e9c1a25
 SHA512:
-  metadata.gz: 23548bcc9c7e7a5ad77353bae8eab0283bd7593b3a9cf536298961d501a0b1b3181b722bf3e75ae0805d9c9dfa336d71a037ed5553eb57d0082b69a7e62aa60b
-  data.tar.gz: a14a66a56577b6de570fa4164f30d2ca96c3a23b5b6b915d136dfd7d825242c0ae6a403cc138ff97e26f76dcad1450ba67d8a733f7b45611141ba46241fafdb8
+  metadata.gz: 1b555a97041aaaf6e4cd3e3aaf82c17a94112627f36cc3e0835a4708c28eef8e8f6a4f20e51b978876cc77a1ced87b6a4b6066a7effd52e2a027c5d152a78995
+  data.tar.gz: ee081263c8ad3869eaa53127ec7ed300f9bba4c67619c548ed83099932cf0978cf3e0ec48dbca47e054a01f79f747c261a0e96eb84d26e9665846dbfed5a2025

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, "invalid token JSON, #{e.message}"
+        raise InputError, "token JSON is invalid, #{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 has expired' if intermediate_key_expired?
+        raise InvalidSignatureError, 'intermediate certificate is expired' if intermediate_key_expired?
       end
 
       check_signature
@@ -59,22 +59,22 @@ module Aliquot
       begin
         aes_key, mac_key = derive_keys(@signed_message[:ephemeralPublicKey], @shared_secret, 'Google')
       rescue => e
-        raise KeyDerivationError, "unable to derive keys, #{e.message}"
+        raise KeyDerivationError, "cannot derive keys, #{e.message}"
       end
 
-      raise InvalidMacError, 'MAC did not match' unless valid_mac?(mac_key)
+      raise InvalidMacError, 'MAC does not match' unless valid_mac?(mac_key)
 
       begin
         @message = JSON.parse(decrypt(aes_key, @signed_message[:encryptedMessage]))
       rescue JSON::JSONError => e
-        raise InputError, "invalid encryptedMessage JSON, #{e.message}"
+        raise InputError, "encryptedMessage JSON is invalid, #{e.message}"
       rescue => e
         raise DecryptionError, "decryption failed, #{e.message}"
       end
 
       @message = validate_message
 
-      raise TokenExpiredError, 'token has expired' if expired?
+      raise TokenExpiredError, 'token is expired' if expired?
 
       @message
     end
@@ -133,7 +133,7 @@ module Aliquot
             key.verify(new_digest, message_signature, signed_string_message)
           end.any?
 
-        raise InvalidSignatureError, 'signature of signedMessage did not match' unless success
+        raise InvalidSignatureError, 'signature of signedMessage does 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, 'signature of signedMessage did not match' unless pkey.verify(new_digest, message_signature, signed_string_message)
+        raise InvalidSignatureError, 'signature of signedMessage does not match' unless pkey.verify(new_digest, message_signature, signed_string_message)
 
         intermediate_signatures = @token[:intermediateSigningKey][:signatures]
 
@@ -152,7 +152,7 @@ module Aliquot
           signed_key_signature
         )
 
-        raise InvalidSignatureError, 'no valid signature of intermediate key found' unless success
+        raise InvalidSignatureError, 'no valid signature of intermediate key' unless success
       end
     rescue OpenSSL::PKey::PKeyError => e
       # Catches problems with verifying signature. Can be caused by signature

data/lib/aliquot/validator.rb

@@ -22,6 +22,7 @@ module Aliquot
         month?:           'must be a month (1..12)',
         year?:            'must be a year (2000..3000)',
         base64_asn1?:     'must be base64 encoded asn1 value',
+        json_object?:     'must be a JSON object',
 
         authMethodCryptogram3DS: 'authMethod CRYPTOGRAM_3DS requires eciIndicator',
         authMethodCard:          'eciIndicator/cryptogram must be omitted when PAN_ONLY',
@@ -64,6 +65,8 @@ module Aliquot
       predicate(:year?) { |x| x.between?(2000, 3000) }
 
       predicate(:base64_asn1?) { |x| OpenSSL::ASN1.decode(Base64.strict_decode64(x)) rescue false }
+
+      predicate(:json_object?) { |x| hash?(x) }
     end
 
     # Base for DRY-Validation schemas used in Aliquot.
@@ -78,7 +81,6 @@ module Aliquot
     IntermediateSigningKeySchema = Dry::Validation.Schema(BaseSchema) do
       required(:signedKey).filled(:str?, :json_string?)
 
-      # TODO: Check if elements of array are valid signatures
       required(:signatures).filled(:array?) { each { base64? & base64_asn1? } }
     end
 
@@ -91,21 +93,19 @@ module Aliquot
     TokenSchema = Dry::Validation.Schema(BaseSchema) do
       required(:signature).filled(:str?, :base64?, :base64_asn1?)
 
-      # Currently supposed to be ECv1, but may evolve.
-      required(:protocolVersion).filled(:str?)
-      required(:signedMessage).filled(:str?, :json_string?)
+      required(:protocolVersion).filled(:str?).when(eql?: 'ECv2') do
+        required(:intermediateSigningKey)
+      end
 
-      optional(:intermediateSigningKey).schema(IntermediateSigningKeySchema)
+      required(:signedMessage).filled(:str?, :json_string?)
 
-      rule('ECv2 implies intermediateSigningKey': %i[protocolVersion intermediateSigningKey]) do |version, intermediatekey|
-        version.eql?('ECv2') > intermediatekey.filled?
-      end
+      optional(:intermediateSigningKey).value(:json_object?) { schema(IntermediateSigningKeySchema) }
     end
 
     # DRY-Validation schema for signedMessage component Google Pay token
     SignedMessageSchema = Dry::Validation.Schema(BaseSchema) do
       required(:encryptedMessage).filled(:str?, :base64?)
-      required(:ephemeralPublicKey).filled(:str?, :base64?).value(size?: 44)
+      required(:ephemeralPublicKey).filled(:str?, :base64?)
       required(:tag).filled(:str?, :base64?)
     end
 
@@ -119,15 +119,15 @@ module Aliquot
       optional(:cryptogram).filled(:str?)
       optional(:eciIndicator).filled(:str?, :eci?)
 
-      rule('when authMethod is CRYPTOGRAM_3DS, cryptogram': %i[authMethod cryptogram]) do |method, cryptogram|
-        method.eql?('CRYPTOGRAM_3DS') > cryptogram.filled?
+      rule(cryptogram: %i[authMethod cryptogram]) do |method, cryptogram|
+        method.eql?('CRYPTOGRAM_3DS') > required(:cryptogram)
       end
 
-      rule('when authMethod is PAN_ONLY, eciIndicator': %i[authMethod eciIndicator]) do |method, eci|
+      rule(eciIndicator: %i[authMethod eciIndicator]) do |method, eci|
         method.eql?('PAN_ONLY').then(eci.none?)
       end
 
-      rule('when authMethod is PAN_ONLY, cryptogram': %i[authMethod cryptogram]) do |method, cryptogram|
+      rule(cryptogram: %i[authMethod cryptogram]) do |method, cryptogram|
         method.eql?('PAN_ONLY').then(cryptogram.none?)
       end
     end
@@ -137,7 +137,7 @@ module Aliquot
       required(:messageExpiration).filled(:str?, :integer_string?)
       required(:messageId).filled(:str?)
       required(:paymentMethod).filled(:str?, eql?: 'CARD')
-      required(:paymentMethodDetails).schema(PaymentMethodDetailsSchema)
+      required(:paymentMethodDetails).value(:json_object?) { schema PaymentMethodDetailsSchema }
     end
 
     module InstanceMethods

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliquot
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Clearhaus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2019-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-validation
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement