mobile_id 0.0.5 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a39f8c3482b16724603fe8f0d104e9cab10e154be69a30a81cf2cec0b5cfc33
-  data.tar.gz: 3a96e0f7adae83b23d357bc3ab17dffbf921e66e8f2b422830226f56c67654aa
+  metadata.gz: 767c9aaf0c78977780884eddd2fbe57198997c3db605953bf1b908f520ae4629
+  data.tar.gz: babe39c29111e4b2255e35f2687692ce4c9c4d7a13c4d80f6ebd85962f80165d
 SHA512:
-  metadata.gz: 8bacbcf4ddd115634ced32037fd54f2f0109cf9329a75f1c4525ce337c65bcf197fe942cf9ba7ce0e3fe2a148eb1937c3b262ce365eb44656a88f51fee66df31
-  data.tar.gz: 65e6235749c5017fc3b263a95d0d6aa18c399a49b511dd35f6bfdbc58ecddb151374e3cac3f23b7a13cfda54856da19197ac5128244923961ba0c9faf76d9473
+  metadata.gz: ee9c28389f3b3c06de013c6dc637a3a3bbd5411303dd65dbe92fdf2b0bd468b3a8403b5734338ce78879f13b73262497315945b9f443c09eb15c55679ac8c595
+  data.tar.gz: e76de10eac908181f628d30728f24378306df13aff38a4da086735c2f84e78f2d8373c20b55a5f74fe3f6c8ca6adca2bfd4ab3e638de50f313b40a6d08c8108b

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+Release 0.0.10
+* Allow live certs verification in test env
+
+Release 0.0.9
+* Fixed verification code
+
+Release 0.0.8
+* Release cleanup
+
+Release 0.0.7
+* Cert cleanup
+
+Release 0.0.6
+* Cert path fix
+
 Release 0.0.5
 * Added user certificate validation 
 

data/lib/mobile_id/auth.rb

@@ -16,13 +16,12 @@ module MobileId
       self.uuid = live == true ? uuid : TEST_UUID
       self.name = live == true ? name : TEST_NAME
       self.live = live
-      init_doc(SecureRandom.uuid)
+      init_doc(SecureRandom.hex(40))
     end
 
     def init_doc(doc)
       self.doc = doc
-
-      self.hash = Digest::SHA256.base64digest(self.doc)
+      self.hash = Digest::SHA256.digest(doc)
     end
 
     def authenticate!(phone_calling_code: nil, phone:, personal_code:, language: nil, display_text: nil)
@@ -51,7 +50,7 @@ module MobileId
           relyingPartyName: name,
           phoneNumber: full_phone.to_s.strip,
           nationalIdentityNumber: personal_code.to_s.strip,
-          hash: hash,
+          hash: Base64.strict_encode64(hash),
           hashType: 'SHA256',
           language: language,
           displayText: display_text,
@@ -114,7 +113,8 @@ module MobileId
     end
 
     def verification_code
-      format("%04d", (Digest::SHA2.new(256).digest(Base64.decode64(hash))[-2..-1].unpack1('n') % 10000))
+      binary = hash.unpack('B*').first
+      "%04d" % (binary[0...6] + binary[-7..-1]).to_i(2)
     end
 
     def given_name

data/lib/mobile_id/cert.rb

@@ -4,22 +4,22 @@ module MobileId
   class Cert
     class << self
       def root_path
-        @root_path ||= (File.expand_path('lib/mobile_id/certs/') + '/')
+        @root_path ||= File.expand_path('certs', __dir__)
       end
 
       def live_store
         @live_store ||= 
           build_store([
-            root_path + 'EE_Certification_Centre_Root_CA.pem.crt',
-            root_path + 'ESTEID-SK_2015.pem.crt'
+            File.join(root_path, 'EE_Certification_Centre_Root_CA.pem.crt'),
+            File.join(root_path, 'ESTEID-SK_2015.pem.crt')
           ])
       end
 
       def test_store
         @test_store ||= 
           build_store([
-            root_path + 'TEST_of_EE_Certification_Centre_Root_CA.pem.crt',
-            root_path + 'TEST_of_ESTEID-SK_2015.pem.crt'
+            File.join(root_path, 'TEST_of_EE_Certification_Centre_Root_CA.pem.crt'),
+            File.join(root_path, 'TEST_of_ESTEID-SK_2015.pem.crt')
           ])
       end
 
@@ -39,17 +39,26 @@ module MobileId
     end
 
     def verify!(cert, live:)
-      store = live == true ? self.class.live_store : self.class.test_store
-      raise Error, 'User certificate is not valid' unless store.verify(cert)
-      raise Error, 'User certificate is not valid' unless cert.public_key.check_key
+      if live == true
+        raise Error, 'User certificate is not valid' unless self.class.live_store.verify(cert)
+      else
+        raise Error, 'User certificate is not valid' unless self.class.test_store.verify(cert) || self.class.live_store.verify(cert)
+      end
+
+      raise Error, 'User certificate is not valid [check_key]' unless cert.public_key.check_key
       raise Error, 'User certificate is expired' unless (cert.not_before..cert.not_after) === Time.now
 
       true
     end
 
-    def verify_signature!(signature, doc)
-      # TODO OpenSSL does not parse signature
-      # cert.public_key.verify(OpenSSL::Digest::SHA256.new, signature, doc)
+    def verify_signature!(signature_base64, doc)
+      signature = Base64.decode64(signature_base64)
+      digest = OpenSSL::Digest::SHA256.new(doc)
+
+      # cert.public_key.verify(digest, signature, doc)
+
+      # TODO OpenSSL does not parse signature correctly
+      # OpenSSL::PKey::PKeyError: EVP_VerifyFinal: nested asn1 error
     end
 
     def given_name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobile_id
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.10
 platform: ruby
 authors:
 - Priit Tark