oydid 0.6.7 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8b1fc642be72b8b9a92b137f995360b5d4e68742b5a9744b59b3e88649976bb
-  data.tar.gz: 291e766737dec1b5756de3408097f5f243b02d3119ab3be2a29444957e82e9af
+  metadata.gz: e119ee021cb7e09dd4c7ee6273a4ee778bae850e31b6360a31044c11e674df4c
+  data.tar.gz: 9be71c4690f1e6476c6a339a49172575eac79c11406c6a1ac8a49e66c804ee6e
 SHA512:
-  metadata.gz: 04bf2f70fcfe5200ed15417dbcd57734b3fe33603bb36eb4dc5007821d6c27af135a3b37552fd75c42a9a1feb02453411a47106340b9abb836496df679ec7b99
-  data.tar.gz: fd8d594757ecf3119c409b0d6169e607a823b1a575fcb1b5599625c2f305f580e51dee886a3112217272695b69e1da9ca65d1b3b1599a5908f916bce12aaacc1
+  metadata.gz: fa57e8c74580e2afa7e6adae48528fd8d43fd306176eb9039a1531c9db46c0090702eef2d036ddaee3aef09e568ef8ad2714c990e6745b2dff4ed080d5e18874
+  data.tar.gz: 4608b92f08da163850832144c89a9495c182a065155727a8d10bacb83ee00fd47951b442420e9ee24582a5804938349e55649b57fe0e699082aa3311fbc57729

data/VERSION

@@ -1 +1 @@
-0.6.7
+0.8.0

data/lib/oydid/basic.rb

@@ -35,6 +35,9 @@ class Oydid
 
     def self.multi_hash(message, options)
         method = options[:digest] || DEFAULT_DIGEST
+        # only set within the case statement for digests that are not looked up
+        # in the multicodec registry (see BLAKE2B_EXTRA_CODES)
+        code = nil
         case method.to_s
         when "sha2-256"
             digest = RbNaCl::Hash.sha256(message)
@@ -44,6 +47,11 @@ class Oydid
             digest = OpenSSL::Digest.digest(method, message)
         when "blake2b-16"
             digest = RbNaCl::Hash.blake2b(message, {digest_size: 16})
+        when "blake2b-17", "blake2b-18", "blake2b-19", "blake2b-20",
+             "blake2b-21", "blake2b-22", "blake2b-23"
+            digest_size = method.to_s.split("-").last.to_i
+            digest = RbNaCl::Hash.blake2b(message, {digest_size: digest_size})
+            code = BLAKE2B_EXTRA_CODES[digest_size]
         when "blake2b-32"
             digest = RbNaCl::Hash.blake2b(message, {digest_size: 32})
         when "blake2b-64"
@@ -51,7 +59,7 @@ class Oydid
         else
             return [nil, "unsupported digest: '" + method.to_s + "'"]
         end
-        code = Multicodecs[method].code
+        code = Multicodecs[method].code if code.nil?
         length = digest.bytesize
         encoded = multi_encode([code, length, digest].pack("CCa#{length}"), options)
         # encoded = multi_encode(Multihashes.encode(digest, method.to_s), options)
@@ -80,6 +88,13 @@ class Oydid
             return ["blake2b-64", ""]
         else
             code, length, digest = decoded_message.unpack('CCa*')
+            # intermediate BLAKE2b sizes carry a code outside the multicodec
+            # registry; require the length byte to match so a stray code
+            # cannot be mistaken for one of them
+            blake2b_size = BLAKE2B_EXTRA_CODES.key(code)
+            if !blake2b_size.nil? && length == blake2b_size
+                return ["blake2b-" + blake2b_size.to_s, ""]
+            end
             retVal = Multicodecs[code].name rescue nil
             if !retVal.nil?
                 return [retVal, ""]
@@ -1264,6 +1279,19 @@ class Oydid
         doc_hash = doc_hash.split(LOCATION_PREFIX).first.split(CGI.escape LOCATION_PREFIX).first rescue doc_hash
         doc_hash = doc_hash.delete_prefix("did:oyd:")
 
+        # in-process callers (e.g. a repository holding DIDs in its own database)
+        # can supply a store object responding to #get(doc_hash) that returns
+        # {"doc" => <did document>, "log" => [<log entries>]} or nil. Unlike
+        # options[:local_doc] this resolves *per hash*: dag_update walks several
+        # different documents along an update chain, so a single document must
+        # not be handed back for every hash it asks for.
+        if options[:local_store]
+            local_obj = options[:local_store].get(doc_hash)
+            if !local_obj.nil?
+                return [local_obj, ""]
+            end
+        end
+
         if doc_location == ""
             doc_location = DEFAULT_LOCATION
         end

data/lib/oydid/log.rb

@@ -297,7 +297,10 @@ class Oydid
                 did_hash = did_hash.split(LOCATION_PREFIX).first.split(CGI.escape LOCATION_PREFIX).first
                 did10 = did_hash[0,10]
 
-                doc = retrieve_document_raw(doc_did, did10 + ".doc", doc_location, {})
+                # pass options through: without them options[:local_store] is lost
+                # and the lookup falls back to HTTP against DEFAULT_LOCATION, which
+                # breaks every in-process caller that keeps its DIDs locally
+                doc = retrieve_document_raw(doc_did, did10 + ".doc", doc_location, options)
                 if doc.first.nil?
                     currentDID["error"] = 2
                     msg = doc.last.to_s
@@ -309,13 +312,27 @@ class Oydid
                 end
                 doc = doc.first["doc"]
                 if el["op"] == 2 # CREATE
-                    # signature for CREATE is optional (due to CMSM)
-                    if !el["sig"].nil?
-                        if !match_log_did?(el, doc)
+                    # The CREATE signature used to be unobtainable in the
+                    # Client-Managed-Secret-Mode: its payload l1_doc is the hash
+                    # of a DID document that already contains the TERMINATE
+                    # signature, so it can only be collected in a phase of its
+                    # own. CMSM has that phase now and new DIDs always carry the
+                    # signature - but DIDs created before it do not, and
+                    # rejecting them would make them unresolvable.
+                    #
+                    # The check is therefore tolerant by default and strict on
+                    # request: a relying party that only accepts DIDs created
+                    # with a signed CREATE entry sets options[:strict_create_sig].
+                    if el["sig"].nil?
+                        if options[:strict_create_sig]
                             currentDID["error"] = 1
-                            currentDID["message"] = "Signatures in log don't match"
+                            currentDID["message"] = "missing signature in CREATE log entry"
                             return currentDID
                         end
+                    elsif !match_log_did?(el, doc)
+                        currentDID["error"] = 1
+                        currentDID["message"] = "Signatures in log don't match"
+                        return currentDID
                     end
                 end
                 currentDID["did"] = doc_did
@@ -353,7 +370,10 @@ class Oydid
                 did_hash = doc_did.delete_prefix("did:oyd:")
                 did_hash = did_hash.split(LOCATION_PREFIX).first.split(CGI.escape LOCATION_PREFIX).first
                 did10 = did_hash[0,10]
-                doc = retrieve_document_raw(doc_did, did10 + ".doc", doc_location, {})
+                # pass options through: without them options[:local_store] is lost
+                # and the lookup falls back to HTTP against DEFAULT_LOCATION, which
+                # breaks every in-process caller that keeps its DIDs locally
+                doc = retrieve_document_raw(doc_did, did10 + ".doc", doc_location, options)
                 doc = doc.first["doc"]
 
                 if !Oydid.match_log_did?(el, doc)
@@ -479,7 +499,7 @@ class Oydid
                                         next_did_hash = next_doc_did.delete_prefix("did:oyd:")
                                         next_did_hash = next_did_hash.split(LOCATION_PREFIX).first.split(CGI.escape LOCATION_PREFIX).first
                                         next_did10 = next_did_hash[0,10]
-                                        next_doc = retrieve_document_raw(next_doc_did, next_did10 + ".doc", next_doc_location, {})
+                                        next_doc = retrieve_document_raw(next_doc_did, next_did10 + ".doc", next_doc_location, options)
                                         if next_doc.first.nil?
                                             currentDID["error"] = 2
                                             currentDID["message"] = next_doc.last