vchain_client 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0829b41adcb11895b071ca0fee7d85b5c642080
-  data.tar.gz: 343063aabd32ae247bc867f62cd699b2c536f136
+  metadata.gz: d417b56044799fb656fbe43b67a13389694df44a
+  data.tar.gz: a698819a9de360ed400cf895f31fbf8739517374
 SHA512:
-  metadata.gz: 7b5fda12a30326cd1e934b895cc0a467474edc5dd4c8196d6a30ecca8fb2127ad89fa5f05bfcf3b93a4896c9c03938908d9c58685f1a867a4efd62c0092515d7
-  data.tar.gz: 73a7bf7f62a5c17903c87bf8282f82e49cfe970077123b07adbae6e26b84311210f643ea8f2ee04f51d7570a58ecbde25a8f66d8dbe674193fe39d3b3c485c2d
+  metadata.gz: 11959aaa39c50e677b99084fe7cdd5668bb1148a3539d7a72f382ce5e434672b726983c133471e95496ef0a7ac3e2a894d8c617d70f316f21e6232f13bba932b
+  data.tar.gz: a476a96e888e458508f082bac4b62465e537c80c39ca1c0d9ef7a9764d259aefcd2acb50f2517a25ae2ab9850c41c30ddbeb553435d280e023975d31a4583d56

data/lib/vchain_client.rb

@@ -398,25 +398,17 @@ module VChainClient
 
       res = JSON.parse req.body
 
-      if res["status"] == "ERROR" || res["status"] == "error"
+      validated_verifications = {}
 
-      	return {
-          "status" => "error",
-          "reason" => res["error_reason_code"] 
-        }
+      if res.key?("document")
 
-      else
-        # success result
-
-      	res_document = res["document"]
+        res_document = res["document"]
 
         if @log.debug?
           @log.debug("[check] recieved verifications")
         end
 
-		    validated_verifications = {}
-
-		    credentials_hash = self.get_credentials_hash(document)
+        credentials_hash = self.get_credentials_hash(document)
 
         if @log.debug?
           @log.debug("[check] credentials_hash: "+ credentials_hash)
@@ -428,21 +420,21 @@ module VChainClient
 
         signaturesHelper = VChainClient::Signatures.new(@config)
 
-    		res_document.each { |field, v|
-    			if v.key?("verifications") && v["verifications"].length > 0 && field != "type"
+        res_document.each { |field, v|
+          if v.key?("verifications") && v["verifications"].length > 0 && field != "type"
             
             if @log.debug?
               @log.debug("[check] check recieved verifications for '"+ field +"', number of recieved verifications: "+ v["verifications"].length.to_s)
             end
 
-    				v["verifications"].each { |verification|
+            v["verifications"].each { |verification|
 
               if @log.debug?
                 @log.debug("[check] field '"+ field +"', verification:")
                 @log.debug(verification)
               end
 
-    					if !verification.key?("blockchain_reciepts")
+              if !verification.key?("blockchain_reciepts")
                 if @log.error?
                   @log.error("[check] not a valid verification - no blockchain_reciepts key")
                   @log.error(verification)
@@ -452,7 +444,7 @@ module VChainClient
                 next
               end
 
-    					if verification["blockchain_reciepts"].length <= 0
+              if verification["blockchain_reciepts"].length <= 0
                 if @log.error?
                   @log.error("[check] not a valid verification - blockchain_reciepts is empty")
                   @log.error("field '"+ field +"'")
@@ -463,8 +455,8 @@ module VChainClient
                 next
               end
 
-    					# 1a. check credentials_hash
-    					if credentials_hash != verification["credentials_hash"]
+              # 1a. check credentials_hash
+              if credentials_hash != verification["credentials_hash"]
                 if @log.error?
                   @log.error("[check] not a valid verification - credentials_hash mismatch ("+ credentials_hash +")")
                   @log.error("field '"+ field +"'")
@@ -475,9 +467,9 @@ module VChainClient
                 next
               end
 
-    					# 1b. check field_hash
-    					field_hash = Digest::SHA512.hexdigest(field)
-    					if field_hash != verification["field_hash"]
+              # 1b. check field_hash
+              field_hash = Digest::SHA512.hexdigest(field)
+              if field_hash != verification["field_hash"]
                 if @log.error?
                   @log.error("[check] not a valid verification - field_hash mismatch ("+ field_hash +")")
                   @log.error("field '"+ field +"'")
@@ -488,9 +480,18 @@ module VChainClient
                 next
               end
 
-    					# 1c. check data_hash
-    					data_hash = Digest::SHA512.hexdigest(document[field])
-    					if data_hash != verification["data_hash"]
+              # 1c. check data_hash
+              data_hash = Digest::SHA512.hexdigest(document[field])
+              if res.key?("document")
+                if res["document"].key?("values")
+                  if res["document"]["values"].key?(field)
+                    if res["document"]["values"][field] != document[field]
+                      data_hash = Digest::SHA512.hexdigest(res["document"]["values"][field])
+                    end
+                  end
+                end
+              end
+              if data_hash != verification["data_hash"]
                 if @log.error?
                   @log.error("[check] not a valid verification - data_hash mismatch ("+ data_hash +")")
                   @log.error("field '"+ field +"'")
@@ -501,10 +502,10 @@ module VChainClient
                 next
               end
 
-    					# 1d. check checksum
-    					checksum_to_hash = credentials_hash + field_hash + data_hash
-    					checksum = Digest::SHA512.hexdigest(checksum_to_hash)
-    					if checksum != verification["checksum"]
+              # 1d. check checksum
+              checksum_to_hash = credentials_hash + field_hash + data_hash
+              checksum = Digest::SHA512.hexdigest(checksum_to_hash)
+              if checksum != verification["checksum"]
                 if @log.error?
                   @log.error("[check] not a valid verification - checksum mismatch ("+ checksum +")")
                   @log.error("field '"+ field +"'")
@@ -518,22 +519,22 @@ module VChainClient
                 next
               end
 
-    					verification_hash = verification["verification_hash"]
+              verification_hash = verification["verification_hash"]
               if @log.debug?
                 @log.debug("[check] verification_hash: "+ verification_hash)
               end
 
-    					# 2. check verification_hash to be in target_proof's
-    					# first element
-    					reciepts_validated = 0
-    					verification["blockchain_reciepts"].each { |reciept|
+              # 2. check verification_hash to be in target_proof's
+              # first element
+              reciepts_validated = 0
+              verification["blockchain_reciepts"].each { |reciept|
 
                 if @log.debug?
                   @log.debug("reciept to check:")
                   @log.debug(reciept)
                 end
 
-    						if !reciept.key?("target_proof")
+                if !reciept.key?("target_proof")
                   if @log.error?
                     @log.error("[check] not a valid blockchain reciept - no target_proof")
                     @log.error(reciept)
@@ -545,7 +546,7 @@ module VChainClient
                   break
                 end
 
-    						if reciept["target_proof"].length <= 0
+                if reciept["target_proof"].length <= 0
                   if @log.error?
                     @log.error("[check] not a valid blockchain reciept - target_proof length is <= 0")
                     @log.error(reciept)
@@ -557,7 +558,7 @@ module VChainClient
                   break
                 end
 
-    						if reciept["target_proof"][0]["left"] != verification_hash && reciept["target_proof"][0]["right"] != verification_hash
+                if reciept["target_proof"][0]["left"] != verification_hash && reciept["target_proof"][0]["right"] != verification_hash
                   if @log.error?
                     @log.error("[check] not a valid blockchain reciept - no target element in target_proof.0")
                     @log.error(reciept)
@@ -569,26 +570,26 @@ module VChainClient
                   break
                 end
 
-    						# verification_hash is in tree
-    						# and in right position
-    						# now,
+                # verification_hash is in tree
+                # and in right position
+                # now,
 
-    						# 3. check tree convergence to root hash
-    						# and compare this computed root hash
-    						# with merkle_tree_root_hash from response
+                # 3. check tree convergence to root hash
+                # and compare this computed root hash
+                # with merkle_tree_root_hash from response
                 if @log.debug?
                   @log.debug("will now build merkle tree with")
                   @log.debug(reciept["target_proof"])
                   @log.debug(reciept["timestamp"])
                 end
 
-    						computed_tree_root_hash = self.build_merkle_tree(reciept["target_proof"], reciept["timestamp"])
+                computed_tree_root_hash = self.build_merkle_tree(reciept["target_proof"], reciept["timestamp"])
                 
                 if @log.debug?
                   @log.debug("computed tree root hash = "+ computed_tree_root_hash)
                 end
 
-    						if computed_tree_root_hash == nil
+                if computed_tree_root_hash == nil
                   if @log.error?
                     @log.error("[check] not a valid blockchain reciept - failed to compute tree root hash")
                     @log.error(reciept)
@@ -599,7 +600,7 @@ module VChainClient
 
                   break
                 end
-    						if computed_tree_root_hash != reciept["merkle_tree_root_hash"]
+                if computed_tree_root_hash != reciept["merkle_tree_root_hash"]
                   if @log.error?
                     @log.error("[check] not a valid blockchain reciept - merkle tree root hash mismatch ("+ computed_tree_root_hash +", "+ reciept["merkle_tree_root_hash"] +")")
                     @log.error(reciept)
@@ -611,9 +612,9 @@ module VChainClient
                   break
                 end
 
-    						last_proof_index = reciept["target_proof"].length - 1
-    						reciept_stored_last_parent = reciept["target_proof"][last_proof_index]["parent"]
-    						if reciept_stored_last_parent != computed_tree_root_hash
+                last_proof_index = reciept["target_proof"].length - 1
+                reciept_stored_last_parent = reciept["target_proof"][last_proof_index]["parent"]
+                if reciept_stored_last_parent != computed_tree_root_hash
                   if @log.error?
                     @log.error("[check] not a valid blockchain reciept - last stored parent != computed_tree_root_hash ("+ reciept_stored_last_parent +", "+ computed_tree_root_hash +")")
                     @log.error(reciept)
@@ -625,11 +626,11 @@ module VChainClient
                   break
                 end
 
-    						# 4. check OP_RETURN in Bitcoin's tx,
-    						# compare it to computed root hash of a tree
-    						# retrieve some info from tx to verify signature
+                # 4. check OP_RETURN in Bitcoin's tx,
+                # compare it to computed root hash of a tree
+                # retrieve some info from tx to verify signature
                 tx = nil
-    						
+                
                 begin
                   
                   tx = blockchainConnection.getTx(reciept["blockchain_txid"])
@@ -655,7 +656,7 @@ module VChainClient
                   @log.debug(tx)
                 end
 
-    						if tx == nil
+                if tx == nil
                   if @log.error?
                     @log.error("[check] not a valid blockchain reciept - failed to retrieve TX from Blockchain")
                     @log.error(reciept)
@@ -667,7 +668,7 @@ module VChainClient
                   break
                 end
 
-    						if tx["block_hash"] != reciept["blockchain_block_hash"]
+                if tx["block_hash"] != reciept["blockchain_block_hash"]
                   if @log.error?
                     @log.error("[check] not a valid blockchain reciept - block_hash mismatch")
                     @log.error(tx)
@@ -680,7 +681,7 @@ module VChainClient
                   break
                 end
 
-    						if tx["block_timestamp"] != reciept["blockchain_timestamp"]
+                if tx["block_timestamp"] != reciept["blockchain_timestamp"]
                   if @log.error?
                     @log.error("[check] not a valid blockchain reciept - timestamp mismatch")
                     @log.error(tx)
@@ -693,7 +694,7 @@ module VChainClient
                   break
                 end
 
-    						if tx["op_return"] != computed_tree_root_hash
+                if tx["op_return"] != computed_tree_root_hash
                   if @log.error?
                     @log.error("[check] not a valid blockchain reciept - op_return mismatch")
                     @log.error(computed_tree_root_hash)
@@ -707,9 +708,9 @@ module VChainClient
                   break
                 end
 
-    						blockchain_txid = reciept["blockchain_txid"];
-    						blockchain_block_hash = tx["block_hash"];
-    						blockchain_timestamp = tx["block_timestamp"];
+                blockchain_txid = reciept["blockchain_txid"];
+                blockchain_block_hash = tx["block_hash"];
+                blockchain_timestamp = tx["block_timestamp"];
                 
                 if @log.debug?
                   @log.debug(blockchain_txid)
@@ -717,14 +718,14 @@ module VChainClient
                   @log.debug(blockchain_timestamp)
                 end
 
-    						# 5. check tree signature:
-    						# a) federative server record in Blockstack (recursive)
-    						# b) tree_signature
+                # 5. check tree signature:
+                # a) federative server record in Blockstack (recursive)
+                # b) tree_signature
 
-    						# a) federative server record in Blockstack (recursive)
+                # a) federative server record in Blockstack (recursive)
                 begin
 
-      						if !blockstackClient.checkFederativeServer(reciept["federative_server_id"])
+                  if !blockstackClient.checkFederativeServer(reciept["federative_server_id"])
                     if @log.error?
                       @log.error("[check] not a valid blockchain reciept - failed to check federative server")
                       @log.error("-> client_id: #{client_id}")
@@ -753,11 +754,11 @@ module VChainClient
                   raise e
                 end
 
-    						# b) check tree signature
+                # b) check tree signature
                 federative_server_pubkey = nil
 
                 begin
-    						  
+                  
                   federative_server_pubkey = blockstackClient.getPublicKey(reciept["federative_server_id"])
 
                 rescue => e
@@ -796,7 +797,7 @@ module VChainClient
 
                 begin
 
-      						if !signaturesHelper.checkTreeSignature(computed_tree_root_hash, blockchain_txid, blockchain_block_hash, blockchain_timestamp, reciept["federative_server_id"], reciept["federative_server_version"], Base64.decode64(reciept["tree_signature"]), federative_server_pubkey)
+                  if !signaturesHelper.checkTreeSignature(computed_tree_root_hash, blockchain_txid, blockchain_block_hash, blockchain_timestamp, reciept["federative_server_id"], reciept["federative_server_version"], Base64.decode64(reciept["tree_signature"]), federative_server_pubkey)
                     if @log.error?
                       @log.error("[check] not a valid blockchain reciept - failed to verify tree signature")
                       @log.error("-> client_id: #{client_id}")
@@ -839,10 +840,10 @@ module VChainClient
                   raise e
                 end
 
-    						reciepts_validated += 1
-    					}
+                reciepts_validated += 1
+              }
 
-    					if reciepts_validated != verification["blockchain_reciepts"].length
+              if reciepts_validated != verification["blockchain_reciepts"].length
                 if @log.error?
                   @log.error("[check] not a valid verification - not every reciept were validated")
                   @log.error("field '"+ field +"'")
@@ -853,16 +854,16 @@ module VChainClient
                 next
               end
 
-    					# 6. check verification signatures:
-    					# a) check verificator record in Blockstack (recursive)
-    					# b) check validator record in Blockstack (recursive)
-    					# c) verificator_sig
-    					# d) validtor_sig
-    					
-    					# a) check verificator record in Blockstack (recursive)
+              # 6. check verification signatures:
+              # a) check verificator record in Blockstack (recursive)
+              # b) check validator record in Blockstack (recursive)
+              # c) verificator_sig
+              # d) validtor_sig
+              
+              # a) check verificator record in Blockstack (recursive)
               begin
 
-      					if !blockstackClient.checkVerificator(verification["verificator_id"])
+                if !blockstackClient.checkVerificator(verification["verificator_id"])
                   if @log.error?
                     @log.error("[check] not a valid verification - failed to check verificator record")
                     @log.error("-> client_id: #{client_id}")
@@ -891,10 +892,10 @@ module VChainClient
                 raise e
               end
 
-    					# b) check validator record in Blockstack (recursive)
+              # b) check validator record in Blockstack (recursive)
               begin
 
-      					if !blockstackClient.checkValidator(verification["validator_id"])
+                if !blockstackClient.checkValidator(verification["validator_id"])
                   if @log.error?
                     @log.error("[check] not a valid verification - failed to check validator record")
                     @log.error("-> client_id: #{client_id}")
@@ -923,7 +924,7 @@ module VChainClient
                 raise e
               end
 
-    					# c) check verificator's signature
+              # c) check verificator's signature
               verificator_pubkey = nil
 
               begin
@@ -966,7 +967,7 @@ module VChainClient
 
               begin
 
-      					if !signaturesHelper.checkVerificationSignature(field_hash, data_hash, verification["type"], verification["timestamp"], verification["verificator_id"], verificator_pubkey, Base64.decode64(verification["verificator_sig"]))
+                if !signaturesHelper.checkVerificationSignature(field_hash, data_hash, verification["type"], verification["timestamp"], verification["verificator_id"], verificator_pubkey, Base64.decode64(verification["verificator_sig"]))
                   if @log.error?
                     @log.error("[check] not a valid verification - failed to check verificator signature")
                     @log.error("-> client_id: #{client_id}")
@@ -1007,12 +1008,12 @@ module VChainClient
                 raise e
               end
 
-    					# d) check validator's signature
+              # d) check validator's signature
               validator_pubkey = nil
 
               begin
 
-    					 validator_pubkey = blockstackClient.getPublicKey(verification["validator_id"])
+               validator_pubkey = blockstackClient.getPublicKey(verification["validator_id"])
 
               rescue => e
                 if @log.error?
@@ -1050,7 +1051,7 @@ module VChainClient
 
               begin
 
-      					if !signaturesHelper.checkVerificationSignature(field_hash, data_hash, verification["type"], verification["timestamp"], verification["validator_id"], validator_pubkey, Base64.decode64(verification["validator_sig"]))
+                if !signaturesHelper.checkVerificationSignature(field_hash, data_hash, verification["type"], verification["timestamp"], verification["validator_id"], validator_pubkey, Base64.decode64(verification["validator_sig"]))
                   if @log.error?
                     @log.error("[check] not a valid verification - failed to check verificator signature")
                     @log.error("-> client_id: #{client_id}")
@@ -1091,15 +1092,15 @@ module VChainClient
                 raise e
               end
 
-    					# 7. timestamps checking
-    					# TODO
+              # 7. timestamps checking
+              # TODO
 
 
-    					if !validated_verifications.key?(field)
-    						validated_verifications[field] = 0
-    					end
-    					validated_verifications[field] = validated_verifications[field] + 1
-    				}
+              if !validated_verifications.key?(field)
+                validated_verifications[field] = 0
+              end
+              validated_verifications[field] = validated_verifications[field] + 1
+            }
 
           else
             if @log.debug?  
@@ -1110,29 +1111,50 @@ module VChainClient
 
               @log.debug("[check] skip '"+ field +"', number of recieved verifications: "+ vers_count.to_s)
             end
-    			end 
-    		}
+          end 
+        }
 
         if @log.debug?
           @log.debug("[check] temp validated verifications:")
           @log.debug(validated_verifications)
         end
 
-    		# check input fields
-    		input.each_with_index { |field,index|
-    			if field[0] != 'type' && field[0] != 'client_id'
-    				if !validated_verifications.key?(field[0])
-    					validated_verifications[field[0]] = 0
-    				end
-    			end
-    		}
+        # check input fields
+        input.each_with_index { |field,index|
+          if field[0] != 'type' && field[0] != 'client_id'
+            if !validated_verifications.key?(field[0])
+              validated_verifications[field[0]] = 0
+            end
+          end
+        }
 
         if @log.debug?
           @log.debug("[check] resulted validated verifications:")
           @log.debug(validated_verifications)
         end
+      end
+
+      if res["status"] == "ERROR" || res["status"] == "error"
+
+        if res["error_reason_code"] == "DOCUMENT_POSSIBLE_MISTAKES"
+          if res.key?("possible_mistakes")
+            res["possible_mistakes"].each_with_index { |field,index|
+              res["possible_mistakes"][index] = validated_verifications[index]
+
+              validated_verifications.delete_at(index)
+            }
+          end
+        end
 
+      	return {
+          "status" => "error",
+          "reason" => res["error_reason_code"] 
+        }
+
+      else
+        # success result
     		return validated_verifications
+
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vchain_client
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Aleksandr Gorelik