vchain_client 1.0.19 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10de221cf0aacee3a81893294d59c0130a9a15a2
-  data.tar.gz: 70d5234b7a43295a03cd48ef89d43613fd6710f9
+  metadata.gz: 7d0643ce1c08e5014d3a479f4651d2d5975df222
+  data.tar.gz: 642a3199f3b8f94fe31368f634c26da0ebc1f960
 SHA512:
-  metadata.gz: 24db1ae389d4221c1ba41ca9fa591d8c4f4b343b210e092ac5defe17c00da6e71bf045fc63ee8a505611b2182fcef42a6364ae3bf213cf78e87f9af6726263c0
-  data.tar.gz: a4c9c63f6dca6323f45a80738d72145cc693b9fc9467f0516246de5d5349e9961dbf3cc9a490160f2df52cec45c0aa38408575ff0a798c08dfb1984ebf32af87
+  metadata.gz: 4b940cde7cb711e3b4e67c64183c381caf2f3066d122c88961445d73b021fd23102689d3e22c758595423d738c785a952417c5d79bb64996c4148bc1924f36ab
+  data.tar.gz: 372e92c6084f56262a11ded5d8f5e737b8c64bcdaefd19144ae503026978c4b2423c76ef54a9c8ef6908410dd17d7a07b9aa4046d9140bd19fe02453ec505162

data/lib/vchain_client.rb

@@ -34,8 +34,12 @@ module VChainClient
     end 
 
   	def hash(arr)
-      arr.each { |k, v| 
-      	arr[k] = Digest::SHA512.hexdigest(v.downcase)
+      arr.each { |k, v|
+        if k != "surname" && k != "given_names"
+      	  arr[k] = Digest::SHA512.hexdigest(v.downcase)
+        else
+          arr[k] = Digest::SHA512.hexdigest(v)
+        end
       }
   	end
 
@@ -56,7 +60,7 @@ module VChainClient
     def cut(arr)
       arr.each { |k, v|
         if arr["type"] == FIELD_TYPE_TRAVEL_DOCUMENT_HASHED
-          if k == "type" || k == "citizenship" || k == "first_name" || k == "last_name" || k == "birthdate" || k == "number" || k == "sex"
+          if k == "type" || k == "country_code" || k == "number" || k == "surname" || k == "given_names" || k == "birthdate" || k == "nationality" || k == "sex" || k == "birthplace" || k == "issue_date" || k == "expiry_date" || k == "authority"
             arr[k] = v
           else
             arr.delete(k)
@@ -76,13 +80,31 @@ module VChainClient
     def get_doc_hash(arr)
       if arr["type"] == FIELD_TYPE_TRAVEL_DOCUMENT_HASHED
         
-        what_to_hash = arr["type"] + arr["citizenship"] + arr["number"] + arr["first_name"] + arr["last_name"] + arr["birthdate"] + arr["sex"]
+        what_to_hash = ""
+        what_to_hash += arr["type"] if arr.key?("type")
+        what_to_hash += arr["country_code"] if arr.key?("country_code")
+        what_to_hash += arr["number"] if arr.key?("number")
+        what_to_hash += arr["surname"] if arr.key?("surname")
+        what_to_hash += arr["given_names"] if arr.key?("given_names")
+        what_to_hash += arr["birthdate"] if arr.key?("birthdate")
+        what_to_hash += arr["nationality"] if arr.key?("nationality")
+        what_to_hash += arr["sex"] if arr.key?("sex")
+        what_to_hash += arr["birthplace"] if arr.key?("birthplace")
+        what_to_hash += arr["issue_date"] if arr.key?("issue_date")
+        what_to_hash += arr["expiry_date"] if arr.key?("expiry_date")
+        what_to_hash += arr["authority"] if arr.key?("authority")
 
         return Digest::SHA512.hexdigest(what_to_hash)
 
       elsif arr["type"] == FIELD_TYPE_TEST_DOCUMENT_HASHED
 
-        what_to_hash = arr["type"] + arr["a"] + arr["b"] + arr["c"] + arr["d"] + arr["e"]
+        what_to_hash = ""
+        what_to_hash += arr["type"] if arr.key?("type")
+        what_to_hash += arr["a"] if arr.key?("a")
+        what_to_hash += arr["b"] if arr.key?("b")
+        what_to_hash += arr["c"] if arr.key?("c")
+        what_to_hash += arr["d"] if arr.key?("d")
+        what_to_hash += arr["e"] if arr.key?("e")
 
         return Digest::SHA512.hexdigest(what_to_hash)
 
@@ -91,7 +113,7 @@ module VChainClient
 
     def get_credentials_fields(type)
       if type == FIELD_TYPE_TRAVEL_DOCUMENT_HASHED
-        return ["type", "citizenship", "number", "first_name", "last_name", "birthdate"]
+        return ["type", "number", "given_names", "surname", "birthdate"]
 
       elsif type == FIELD_TYPE_TEST_DOCUMENT_HASHED
         return ["type", "a", "b", "c"]
@@ -108,16 +130,13 @@ module VChainClient
     def get_similar_credential_sets(type)
       if type == FIELD_TYPE_TRAVEL_DOCUMENT_HASHED
         output = []
-        output.push(["type", "last_name", "birthdate", "number", "citizenship"])
-        output.push(["type", "first_name", "birthdate", "number", "citizenship"])
-        output.push(["type", "first_name", "last_name", "birthdate", "number"])
-        output.push(["type", "first_name", "last_name", "birthdate", "citizenship"])
-        output.push(["type", "first_name", "last_name", "number", "citizenship"])
-        output.push(["type", "last_name", "number", "citizenship"])
-        output.push(["type", "first_name", "number", "citizenship"])
-        output.push(["type", "birthdate", "number", "citizenship"])
-        output.push(["type", "first_name", "last_name", "birthdate"])
-        output.push(["type", "number", "citizenship"])
+        output.push(["type", "number", "surname", "birthdate"])
+        output.push(["type", "number", "given_names", "birthdate"])
+        output.push(["type", "given_names", "surname", "birthdate"])
+        output.push(["type", "number", "given_names", "surname"])
+        output.push(["type", "number", "surname"])
+        output.push(["type", "number", "given_names"])
+        output.push(["type", "number", "birthdate"])
         return output
 
       elsif type == FIELD_TYPE_TEST_DOCUMENT_HASHED
@@ -138,7 +157,7 @@ module VChainClient
 
   	def get_credentials_hash(document)
   		if document["type"] == FIELD_TYPE_TRAVEL_DOCUMENT_HASHED
-  			what_to_hash = document["type"] + document["citizenship"] + document["number"] + document["first_name"] + document["last_name"] + document["birthdate"]
+  			what_to_hash = document["type"] + document["number"] + document["given_names"] + document["surname"] + document["birthdate"]
 
   			return Digest::SHA512.hexdigest(what_to_hash)
 
@@ -205,9 +224,32 @@ module VChainClient
 	  	timestamp = time.to_i
 
 	    document = input
+
+      # work with names before hashing
+      surnames_arr = document["surname"].split
+      given_names_arr = document["given_names"].split
+
+      hashed_surname = ""
+      sep = ""
+      surnames_arr.each { |surname_part|
+        hashed_surname += sep
+        hashed_surname += Digest::SHA512.hexdigest(surname_part.downcase)
+        sep = " "
+      }
+
+      hashed_given_names = ""
+      sep = ""
+      given_names_arr.each { |given_names_part|
+        hashed_given_names += sep
+        hashed_given_names += Digest::SHA512.hexdigest(given_names_part.downcase)
+        sep = " "
+      }
+
+      document["given_names"] = hashed_given_names
+      document["surname"] = hashed_surname
 	    
       document = self.hash(document)
-      
+
       document = self.cut(document)
 
       doc_hash = self.get_doc_hash(document)
@@ -398,12 +440,25 @@ module VChainClient
 
       document = input
 
+      names = {}
+      if document["type"] == FIELD_TYPE_TRAVEL_DOCUMENT
+        names = document["names"]
+        document.delete("names")
+      end
+
       if (!is_already_hashed)
         document = self.hash(document)
       end
 
       document = self.cut(document)
 
+      if document["type"] == FIELD_TYPE_TRAVEL_DOCUMENT_HASHED
+        document["names"] = []
+        names.each { |name|
+          document["names"].push(Digest::SHA512.hexdigest(name.downcase))
+        }
+      end
+
       sent_document = document.clone
 
       document["client_id"] = client_id
@@ -470,18 +525,37 @@ module VChainClient
 
         # success result
 
-        res_docs_index = {}
+        if sent_document.key?("names")
 
-        res["docs"].each { |res_doc|
+          real_surname = ""
 
-          res_doc_credentials_hash = self.get_credentials_hash(res_doc)
+          real_given_name = ""
+          
+          if res.key?("names") && res["names"].is_a?(Hash)
+
+            if res["names"].key?("given_names")
+              sep = "";
+              res["names"]["given_names"].each { |found_given_name|
+                real_given_name += sep + found_given_name
+                sep = " "
+              }
+            end
+
+            if res["names"].key?("surname")
+              sep = "";
+              res["names"]["surname"].each { |found_surname|
+                real_surname += sep + found_surname
+                sep = " "
+              }
+            end
 
-          if !res_docs_index.key?(res_doc_credentials_hash)
-            res_docs_index[res_doc_credentials_hash] = []
           end
 
-          res_docs_index[res_doc_credentials_hash].push(res_doc)
-        }
+          sent_document["given_names"] = Digest::SHA512.hexdigest(real_given_name)
+          sent_document["surname"] = Digest::SHA512.hexdigest(real_surname)
+
+          sent_document.delete("names")
+        end
 
         validated_data_points = self.validate_data_points(res["data_points"], res["docs"])
 
@@ -504,6 +578,40 @@ module VChainClient
 
         # analyse
 
+        new_res_docs = []
+
+        res_docs_index = {}
+
+        # cut and index
+        res["docs"].each { |res_doc|
+
+          full_doc_hash = self.get_doc_hash(res_doc)
+
+          play_doc = {}
+          res_doc.each { |field, value|
+            if sent_document.key?(field)
+              play_doc[field] = value
+            end
+          }
+
+          res_doc_credentials_hash = self.get_credentials_hash(play_doc)
+
+          if !res_docs_index.key?(res_doc_credentials_hash)
+            res_docs_index[res_doc_credentials_hash] = []
+          end
+
+          play_doc["doc_hash"]      = self.get_doc_hash(play_doc)
+
+          play_doc["full_doc_hash"] = full_doc_hash
+
+          res_docs_index[res_doc_credentials_hash].push(play_doc)
+
+          new_res_docs.push(play_doc)
+        }
+
+        res["docs"] = new_res_docs
+
+
         sent_doc_hash = self.get_doc_hash(sent_document)
 
         sent_credentials_hash = self.get_credentials_hash(sent_document)
@@ -566,7 +674,7 @@ module VChainClient
 
             found_docs.each { |cred_doc|
 
-              cred_doc_hash = self.get_doc_hash(cred_doc)
+              cred_doc_hash = cred_doc["full_doc_hash"]#self.get_doc_hash(cred_doc)
               cred_doc_hash = Digest::SHA512.hexdigest(cred_doc_hash)
 
               cred_doc_exact_match = validated_data_points[cred_doc_hash]
@@ -613,18 +721,22 @@ module VChainClient
 
             non_cred_fields_index.each { |field, values|
 
-              if values.length == 1
+              if sent_document.key?(field)
 
-                values.take(1).each { |value, validated_count|
-                  if value == sent_document[field]
-                    result[field] = validated_count
-                  else
-                    possible_mistakes.push(field)
-                  end
-                }
+                if values.length == 1
+
+                  values.take(1).each { |value, validated_count|
+                    if value == sent_document[field]
+                      result[field] = validated_count
+                    else
+                      possible_mistakes.push(field)
+                    end
+                  }
+
+                else
+                  possible_mistakes.push(field)
+                end
 
-              else
-                possible_mistakes.push(field)
               end
 
             }
@@ -711,18 +823,22 @@ module VChainClient
 
             other_fields_index.each { |field, values|
 
-              if values.length == 1
+              if sent_document.key?(field)
 
-                values.take(1).each { |value, validated_count|
-                  if value == sent_document[field]
-                    result[field] = validated_count
-                  else
-                    possible_mistakes.push(field)
-                  end
-                }
+                if values.length == 1
+
+                  values.take(1).each { |value, validated_count|
+                    if value == sent_document[field]
+                      result[field] = validated_count
+                    else
+                      possible_mistakes.push(field)
+                    end
+                  }
+
+                else
+                  possible_mistakes.push(field)
+                end
 
-              else
-                possible_mistakes.push(field)
               end
 
             }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vchain_client
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.0.20
 platform: ruby
 authors:
 - Aleksandr Gorelik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r