oydid 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a02a41e3567cca1fb47d9f5577892707d4a3841d9505138d1164aa5e84ced98
-  data.tar.gz: 519f74a4640ebe9b8936ab1b9bc60fcd84601c6b9ee750538f28c8e1fd2b3990
+  metadata.gz: e6e4098a11373a9b648447adbc7f6ec7b89d0efced1bb920080797dfdc5d17de
+  data.tar.gz: bf33e0ddd9abd26a04d92fa945db9183f87000e246f154aa509c55e9b5f4aefd
 SHA512:
-  metadata.gz: 54a1637fd933c8f077eead73351ebca631a8d33992d72870e8e08d6776d034b54ca9bf0350c630b85b0b69afcb6e3840ce01096f4806beabc7a3019897c193d3
-  data.tar.gz: 2b4d266c2bd558aea5be65c8579567e135ce05ff4277c3ae0ef0727ee65214c86149f7e2a3ec31288b783543327416817764ccda6364f42f270470482f5c6aad
+  metadata.gz: 6175bb5b1d28443b26573754dd92f97094a7c139d032252c541a73dbd5019028466847b9602b380cd1ca814eeb3e7843576f7a86a77808a5268af62fe89dfba7
+  data.tar.gz: a719e0d4c5530340be4ad4a284ffadd46924db95a81c0212fb61e38243cac6a133bf8568ed6407a54d026502048bb06394f5e737f12e0ad588b65c43411bb046

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.5.6

data/lib/oydid/basic.rb

@@ -1,10 +1,16 @@
 # -*- encoding: utf-8 -*-
 # frozen_string_literal: true
 
+class Hash
+    def except(*keys)
+        self.reject { |key, _| keys.include?(key) }
+    end
+end
+
 class Oydid
 
     # basic functions ---------------------------
-    # %w[multibases multihashes rbnacl json].each { |f| require f }
+    # %w[multibases multihashes rbnacl json multicodecs].each { |f| require f }
     def self.multi_encode(message, options)
         method = options[:encode] || DEFAULT_ENCODING rescue DEFAULT_ENCODING
         case method
@@ -98,7 +104,7 @@ class Oydid
     end
 
     # key management ----------------------------
-    def self.generate_private_key(input, method = "ed25519-priv", options)
+    def self.generate_private_key(input, method = "ed25519-priv", options = {})
         begin
             omc = Multicodecs[method].code
         rescue
@@ -108,15 +114,18 @@ class Oydid
         case Multicodecs[method].name 
         when 'ed25519-priv'
             if input != ""
-                raw_key = Ed25519::SigningKey.new(RbNaCl::Hash.sha256(input)).to_bytes
+                raw_key = Ed25519::SigningKey.new(RbNaCl::Hash.sha256(input))
             else
-                raw_key = Ed25519::SigningKey.generate.to_bytes
+                raw_key = Ed25519::SigningKey.generate
             end
+            raw_key = raw_key.to_bytes
+            length = raw_key.bytesize
         else
             return [nil, "unsupported key codec"]
         end
-        length = raw_key.bytesize
+        
         encoded = multi_encode([omc, length, raw_key].pack("SCa#{length}"), options)
+        # encoded = multi_encode(raw_key.to_bytes, options)
         if encoded.first.nil?
             return [nil, encoded.last]
         else
@@ -124,7 +133,7 @@ class Oydid
         end
     end
 
-    def self.public_key(private_key, options, method = "ed25519-pub")
+    def self.public_key(private_key, options = {}, method = "ed25519-pub")
         code, length, digest = multi_decode(private_key).first.unpack('SCa*')
         case Multicodecs[code].name
         when 'ed25519-priv'
@@ -136,6 +145,7 @@ class Oydid
             else
                 return [nil, "unsupported key codec"]
             end
+            # encoded = multi_encode(public_key.to_bytes, options)
             length = public_key.to_bytes.bytesize
             encoded = multi_encode([Multicodecs[method].code, length, public_key].pack("CCa#{length}"), options)
             if encoded.first.nil?
@@ -323,10 +333,160 @@ class Oydid
         end
     end
 
+    # key="812b578d2e357270cbbd26a9dd44f93e5c8a3b44462e271348ce8f742dfe08144d06fd1f64d5a15c5b21564695d0dca9d65af322e8f96ef394400fe255d288cf"
+    def jweh(key)
+        pub_key=key[-64..-1]
+        prv_key=key[0..-65]
+        
+        hex_pub=pub_key
+        bin_pub=[hex_pub].pack('H*')
+        int_pub=RbNaCl::PublicKey.new(bin_pub)
+        len_pub=int_pub.to_bytes.bytesize
+        enc_pub=Oydid.multi_encode([Multicodecs["x25519-pub"].code,len_pub,int_pub].pack("CCa#{len_pub}"),{}).first
+
+        hex_prv=prv_key
+        bin_prv=[hex_prv].pack('H*')
+        int_prv=RbNaCl::PrivateKey.new(bin_prv)
+        len_prv=int_prv.to_bytes.bytesize
+        enc_prv=Oydid.multi_encode([Multicodecs["ed25519-priv"].code,len_prv,int_prv].pack("SCa#{len_prv}"),{}).first
+        return [enc_pub, enc_prv]
+    end
+
+    # public_key=jweh(key).first
+    # require 'oydid'
+    # message="hallo"
+    # public_key="z6Mv4uEoFYJ369NoE9xUzxG5sm8KpPnvHX6YH6GsYFGSQ32J"
+    # jwe=Oydid.encryptJWE(message, public_key).first
+    def self.encryptJWE(message, public_key, options = {})
+
+        jwe_header = {"enc":"XC20P"}
+        recipient_alg = 'ECDH-ES+XC20PKW'
+
+        # Content Encryption ---
+        # random nonce for XChaCha20-Poly1305: uses a 192-bit nonce (24 bytes)
+        cnt_nnc = RbNaCl::Random.random_bytes(RbNaCl::AEAD::XChaCha20Poly1305IETF.nonce_bytes)
+        # random key for XChaCha20-Poly1305: uses a 256-bit key (32 bytes)
+        cnt_key = RbNaCl::Random.random_bytes(RbNaCl::AEAD::XChaCha20Poly1305IETF.key_bytes)
+        # addtional data
+        cnt_aad = jwe_header.to_json
+        # setup XChaCha20-Poly1305 for Authenticated Encryption with Associated Data (AEAD)
+        cnt_aead = RbNaCl::AEAD::XChaCha20Poly1305IETF.new(cnt_key)
+        # encrypt
+        msg_enc = cnt_aead.encrypt(cnt_nnc, message, cnt_aad)
+        cnt_enc = msg_enc[0...-cnt_aead.tag_bytes]
+        cnt_tag = msg_enc[-cnt_aead.tag_bytes .. -1]
+
+        # Key Encryption ---
+        snd_prv = RbNaCl::PrivateKey.generate
+        code, length, digest = Oydid.multi_decode(public_key).first.unpack('CCa*')
+        buffer = RbNaCl::Util.zeros(RbNaCl::Boxes::Curve25519XSalsa20Poly1305::PublicKey::BYTES)
+        RbNaCl::Signatures::Ed25519::VerifyKey.crypto_sign_ed25519_pk_to_curve25519(buffer, digest)
+        shared_secret = RbNaCl::GroupElement.new(buffer).mult(snd_prv.to_bytes)
+        jwe_const = [0, 0, 0, 1] + 
+            shared_secret.to_bytes.unpack('C*') + 
+            [0,0,0,15] + 
+            recipient_alg.bytes + 
+            [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0]
+        kek = RbNaCl::Hash.sha256(jwe_const.pack('C*'))
+        snd_nnc = RbNaCl::Random.random_bytes(RbNaCl::AEAD::XChaCha20Poly1305IETF.nonce_bytes)
+        snd_aead = RbNaCl::AEAD::XChaCha20Poly1305IETF.new(kek)
+        snd_enc = snd_aead.encrypt(snd_nnc, cnt_key, nil)
+        snd_key = snd_enc[0...-snd_aead.tag_bytes]
+        snd_aut = snd_enc[-snd_aead.tag_bytes .. -1]
+
+        # create JWE ---
+        jwe_protected = Base64.urlsafe_encode64(jwe_header.to_json).delete("=")
+        jwe_encrypted_key = Base64.urlsafe_encode64(snd_key).delete("=")
+        jwe_init_vector = Base64.urlsafe_encode64(cnt_nnc).delete("=")
+        jwe_cipher_text = Base64.urlsafe_encode64(cnt_enc).delete("=")
+        jwe_auth_tag = Base64.urlsafe_encode64(cnt_tag).delete("=")
+        rcp_nnc_enc = Base64.urlsafe_encode64(snd_nnc).delete("=")
+        rcp_tag_enc = Base64.urlsafe_encode64(snd_aut).delete("=")
+
+        jwe_full = {
+            protected: jwe_protected,
+            iv: jwe_init_vector,
+            ciphertext: jwe_cipher_text,
+            tag: jwe_auth_tag,
+            recipients: [
+                {
+                    encrypted_key: jwe_encrypted_key,
+                    header: {
+                        alg: recipient_alg,
+                        iv: rcp_nnc_enc,
+                        tag: rcp_tag_enc,
+                        epk: {
+                            kty: "OKP",
+                            crv: "X25519",
+                            x: Base64.urlsafe_encode64(snd_prv.public_key.to_bytes).delete("=")
+                        }
+                    }
+                }
+            ]
+        }
+
+        jwe = jwe_protected
+        jwe += "." + jwe_encrypted_key
+        jwe += "." + jwe_init_vector
+        jwe += "." + jwe_cipher_text
+        jwe += "." + jwe_auth_tag
+
+        return [jwe_full, ""]
+    end
+
+    # require 'oydid'
+    # message = '{"protected":"eyJlbmMiOiJYQzIwUCJ9","iv":"G24pK06HSbL0vTlRZMIEBLfa074tJ1tq","ciphertext":"N5bgUr8","tag":"CJeq8cuaercgoBZmrYoGUA","recipients":[{"encrypted_key":"chR8HQh1CRYRU4TdlfBbvon4fcb5PKfWPSo0SgkMC_8","header":{"alg":"ECDH-ES+XC20PKW","iv":"K7lUo8shyJhxC7Nl45VlXes4tbDeZyBL","tag":"2sLCGRv70ESqEAqos3ZhSg","epk":{"kty":"OKP","crv":"X25519","x":"ZpnKcI7Kac6HPwVAGwM0PBweTFKM6wHHVljTHMRWpD4"}}}]}'
+    # message = jwe.to_json
+    # private_key = "z1S5USmDosHvi2giCLHCCgcq3Cd31mrhMcUy2fcfszxxLkD7"
+    # Oydid.decryptJWE(jwe.to_json, private_key)
+    def self.decryptJWE(message, private_key, options = {})
+
+        # JWE parsing
+        jwe_full = JSON.parse(message)
+        snd_pub_enc = jwe_full["recipients"].first["header"]["epk"]["x"]
+        snd_key_enc = jwe_full["recipients"].first["encrypted_key"]
+        snd_nnc_enc = jwe_full["recipients"].first["header"]["iv"]
+        snd_tag_enc = jwe_full["recipients"].first["header"]["tag"]
+        cnt_cip_enc = jwe_full["ciphertext"]
+        cnt_tag_enc = jwe_full["tag"]
+        cnt_nnc_enc = jwe_full["iv"]
+        cnt_aad_enc = jwe_full["protected"]
+        recipient_alg = jwe_full["recipients"].first["header"]["alg"]
+
+        snd_pub = Base64.urlsafe_decode64(snd_pub_enc)
+        snd_nnc = Base64.urlsafe_decode64(snd_nnc_enc)
+        snd_key = Base64.urlsafe_decode64(snd_key_enc)
+        snd_tag = Base64.urlsafe_decode64(snd_tag_enc)
+        cnt_nnc = Base64.urlsafe_decode64(cnt_nnc_enc)
+        cnt_cip = Base64.urlsafe_decode64(cnt_cip_enc)
+        cnt_tag = Base64.urlsafe_decode64(cnt_tag_enc)
+        cnt_aad = Base64.urlsafe_decode64(cnt_aad_enc)
+
+        # Key Decryption
+        code, length, digest = Oydid.multi_decode(private_key).first.unpack('SCa*')
+        buffer = RbNaCl::Util.zeros(RbNaCl::Boxes::Curve25519XSalsa20Poly1305::PublicKey::BYTES)
+        RbNaCl::Signatures::Ed25519::SigningKey.crypto_sign_ed25519_sk_to_curve25519(buffer, digest)
+        shared_secret = RbNaCl::GroupElement.new(snd_pub).mult(buffer)
+        jwe_const = [0, 0, 0, 1] + 
+            shared_secret.to_bytes.unpack('C*') + 
+            [0,0,0,15] + 
+            recipient_alg.bytes + 
+            [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0]
+        kek = RbNaCl::Hash.sha256(jwe_const.pack('C*'))
+        snd_aead = RbNaCl::AEAD::XChaCha20Poly1305IETF.new(kek)
+        cnt_key = snd_aead.decrypt(snd_nnc, snd_key+snd_tag, nil)
+
+        # Content Decryption
+        cnt_aead = RbNaCl::AEAD::XChaCha20Poly1305IETF.new(cnt_key)
+        cnt_dec = cnt_aead.decrypt(cnt_nnc, cnt_cip+cnt_tag, cnt_aad)
+
+        return [cnt_dec, ""]
+    end
+
     def self.read_private_key(filename, options)
         begin
             f = File.open(filename)
-            key_encoded = f.read
+            key_encoded = f.read.strip
             f.close
         rescue
             return [nil, "cannot read file"]
@@ -357,6 +517,9 @@ class Oydid
             when 'ed25519-pub'
                 verify_key = Ed25519::VerifyKey.new(digest)
                 return [verify_key, ""]
+            when 'x25519-pub'
+                pub_key = RbNaCl::PublicKey.new(digest)
+                return [pub_key, ""]
             else
                 return [nil, "unsupported key codec"]
             end
@@ -404,7 +567,11 @@ class Oydid
         case doc_location
         when /^http/
             doc_location = doc_location.sub("%3A%2F%2F","://").sub("%3A", ":")
-            retVal = HTTParty.get(doc_location + "/doc/" + doc_identifier)
+            option_str = ""
+            if options[:followAlsoKnownAs]
+                option_str = "?followAlsoKnownAs=true"
+            end
+            retVal = HTTParty.get(doc_location + "/doc/" + doc_identifier + option_str)
             if retVal.code != 200
                 msg = retVal.parsed_response["error"].to_s rescue ""
                 if msg.to_s == ""

data/lib/oydid/log.rb

@@ -137,17 +137,26 @@ class Oydid
         terminate_overall = 0
         terminate_index = nil
         logs.each do |el|
-            if el["op"].to_i == 0
+            if el["op"].to_i == 0 # TERMINATE
                 if dag.vertices[i].successors.length == 0
                     terminate_entries += 1
                     terminate_index = i
                 end
                 terminate_overall += 1
+            elsif el["op"].to_i == 1 # REVOKE
+                # get terminate_index for revoked DIDs
+                if dag.vertices[i].successors.length == 0
+                    dag.vertices[i].predecessors.each do |l|
+                        if logs[l[:id]]["op"].to_i == 0 # TERMINATE
+                            terminate_index = l[:id]
+                        end
+                    end
+                end
             end
             i += 1
         end unless logs.nil?
 
-        if terminate_entries != 1 && !options[:log_complete]
+        if terminate_entries != 1 && !options[:log_complete] && !options[:followAlsoKnownAs]
             if options[:silent].nil? || !options[:silent]
                 return [nil, nil, nil, "cannot resolve DID" ]
             end
@@ -217,7 +226,7 @@ class Oydid
             end unless s.predecessors.length < 2
             dag2array(dag, log_array, s[:id], result, options)
         end unless dag.vertices[index].successors.count == 0
-        result
+        result.uniq
     end
 
     def self.dag2array_terminate(dag, log_array, index, result, options)
@@ -237,7 +246,7 @@ class Oydid
             end
         end unless dag.vertices[index].nil?
         result << log_array[index]
-        result
+        result.uniq
     end
 
     def self.dag_update(currentDID, options)
@@ -490,7 +499,45 @@ class Oydid
                     break
                 end
             when 1 # revocation log entry
-                # do nothing
+                # handle DID Rotation
+                if (i == (currentDID["log"].length-1))
+                    if options[:followAlsoKnownAs]
+                        current_doc = currentDID["doc"]
+                        if current_doc["doc"].transform_keys(&:to_s).has_key?("alsoKnownAs")
+                            rotate_DID = current_doc["doc"].transform_keys(&:to_s)["alsoKnownAs"]
+                            if rotate_DID.start_with?("did:")
+                                rotate_DID_method = rotate_DID.split(":").take(2).join(":")
+                                did_orig = currentDID["did"]
+                                if !did_orig.start_with?("did:oyd")
+                                    did_orig = "did:oyd:" + did_orig
+                                end
+                                case rotate_DID_method
+                                when "did:ebsi"
+                                    public_resolver = DEFAULT_PUBLIC_RESOLVER
+                                    rotate_DID_Document = HTTParty.get(public_resolver + rotate_DID)
+                                    rotate_ddoc = JSON.parse(rotate_DID_Document.parsed_response)
+                                    rotate_ddoc = rotate_ddoc.except("didDocumentMetadata", "didResolutionMetadata")
+
+                                    # checks
+                                    # 1) is original DID revoked -> fulfilled, otherwise we would not be in this branch
+                                    # 2) das new DID reference back original DID
+                                    currentDID["did"] = rotate_DID
+                                    currentDID["doc"]["doc"] = rotate_ddoc
+                                    if verification_output
+                                        currentDID["verification"] += "DID rotation to: " + rotate_DID.to_s + "\n"
+                                        currentDID["verification"] += "✅ original DID (" + did_orig + ") revoked and referenced in alsoKnownAs\n"
+                                        currentDID["verification"] += "(Details: https://ownyourdata.github.io/oydid/#did_rotation)" + "\n\n"
+                                    end
+                                when "did:oyd"
+                                    puts "try to resolve did:oyd with our own resolver"
+                                    puts "add verification text"
+                                else
+                                    # do nothing: DID Rotation is not supported for this DID method yet
+                                end
+                            end
+                        end
+                    end
+                end
             when 5 # DELEGATE
                 # do nothing
             else

data/lib/oydid.rb

@@ -24,10 +24,14 @@ class Oydid
     DEFAULT_ENCODING = "base58btc"
     SUPPORTED_ENCODINGS = ["base16", "base32", "base58btc", "base64"]
     LOG_HASH_OPTIONS = {:digest => "sha2-256", :encode => "base58btc"}
+    DEFAULT_PUBLIC_RESOLVER = "https://dev.uniresolver.io/1.0/identifiers/"
+
+    # full Multicodecs table: https://github.com/multiformats/multicodec/blob/master/table.csv
+    # Multicodecs.register(code: 0x1305, name: 'rsa-priv', tag: 'key')
+    # Multicodecs.register(code: 0x1205, name: 'rsa-pub', tag: 'key')
 
     # expected DID format: did:oyd:123
     def self.read(did, options)
-
         if did.to_s == ""
             return [nil, "missing DID"]
         end
@@ -133,14 +137,24 @@ class Oydid
                     end
                 end
             end
-            currentDID = dag_update(currentDID, options)
+
+            # identify if DID Rotation was performed
+            rotated_DID = (currentDID.transform_keys(&:to_s)["doc"]["doc"].has_key?("@context") &&
+                currentDID.transform_keys(&:to_s)["doc"]["doc"].has_key?("id") &&
+                currentDID.transform_keys(&:to_s)["doc"]["doc"]["id"].split(":").first == "did") rescue false
+
+            if rotated_DID
+                doc = currentDID["doc"].dup
+                currentDID = dag_update(currentDID, options)
+                currentDID["doc"] = doc
+            else
+                currentDID = dag_update(currentDID, options)
+            end
             if options[:log_complete]
                 currentDID["log"] = log_array
             end
-
             return [currentDID, ""]
         end
-
     end
 
     def self.create(content, options)
@@ -289,6 +303,27 @@ class Oydid
         pubRevoKey = public_key(revocationKey, options).first
         did_key = publicKey + ":" + pubRevoKey
 
+        if options[:x25519_keyAgreement]
+            if did_doc.nil?
+                did_doc = {}
+            end
+            did_doc[:keyAgreement] = [{
+                "id": "#key-doc-x25519",
+                "type": "X25519KeyAgreementKey2019",
+                "publicKeyMultibase": public_key(privateKey, options, 'x25519-pub').first
+            }]
+            did_doc = did_doc.transform_keys(&:to_s)
+        end
+        if options[:authentication]
+            if did_doc.nil?
+                did_doc = {}
+            end
+            did_doc[:authentication] = [{
+                "id": "#key-doc"
+            }]
+            did_doc = did_doc.transform_keys(&:to_s)
+        end
+
         # build new revocation document
         subDid = {"doc": did_doc, "key": did_key}.to_json
         retVal = multi_hash(canonical(subDid), LOG_HASH_OPTIONS)
@@ -494,14 +529,17 @@ class Oydid
         success, msg = publish(did, didDocument, logs, options)
 
         if success
+            didDocumentBackup = Marshal.load(Marshal.dump(didDocument))
             w3c_input = {
-                "did" => did,
-                "doc" => didDocument
+                "did" => did.clone,
+                "doc" => didDocument.clone
             }
+            doc_w3c = Oydid.w3c(w3c_input, options)
+            didDocument = didDocumentBackup
             retVal = {
                 "did" => did,
                 "doc" => didDocument,
-                "doc_w3c" => w3c(w3c_input, options),
+                "doc_w3c" => doc_w3c,
                 "log" => logs
             }
             if options[:return_secrets]
@@ -927,12 +965,19 @@ class Oydid
     end
 
     def self.w3c(did_info, options)
+        # check if doc is already W3C DID
+        is_already_w3c_did = (did_info.transform_keys(&:to_s)["doc"]["doc"].has_key?("@context") &&
+            did_info.transform_keys(&:to_s)["doc"]["doc"].has_key?("id") &&
+            did_info.transform_keys(&:to_s)["doc"]["doc"]["id"].split(":").first == "did") rescue false
+        if is_already_w3c_did
+            return did_info.transform_keys(&:to_s)["doc"]["doc"]
+        end
         did = percent_encode(did_info["did"])
         if !did.start_with?("did:oyd:")
             did = "did:oyd:" + did
         end
 
-        didDoc = did_info.transform_keys(&:to_s)["doc"]
+        didDoc = did_info.dup.transform_keys(&:to_s)["doc"]
         pubDocKey = didDoc["key"].split(":")[0] rescue ""
         pubRevKey = didDoc["key"].split(":")[1] rescue ""
         delegateDocKeys = getDelegatedPubKeysFromDID(did, "doc").first - [pubDocKey] rescue []
@@ -1020,7 +1065,7 @@ class Oydid
             end
         end unless did_info["log"].nil?
         if equivalentIds.length > 0
-            wd[:alsoKnownAs] = equivalentIds
+            wd["alsoKnownAs"] = equivalentIds
         end
 
         if didDoc["doc"].is_a?(Hash) && !didDoc["doc"]["service"].nil?
@@ -1046,16 +1091,32 @@ class Oydid
                 if didDoc["doc"] != {}
                     didDoc = didDoc["doc"]
                     if didDoc["authentication"].to_s != ""
-                        wd["authentication"] = didDoc["authentication"]
-                        didDoc.delete("authentication")
+                        new_authentication = []
+                        didDoc["authentication"].each do |el|
+                            new_el = el.transform_keys(&:to_s)
+                            new_el["id"] = percent_encode(did) + new_el["id"]
+                            new_authentication << new_el
+                        end unless didDoc["authentication"].nil?
+                        if new_authentication.length > 0
+                            wd["authentication"] = new_authentication
+                            didDoc.delete("authentication")
+                        end
                     end
                     if didDoc["assertionMethod"].to_s != ""
                         wd["assertionMethod"] = didDoc["assertionMethod"]
                         didDoc.delete("assertionMethod")
                     end
                     if didDoc["keyAgreement"].to_s != ""
-                        wd["keyAgreement"] = didDoc["keyAgreement"]
-                        didDoc.delete("keyAgreement")
+                        new_keyAgreement = []
+                        didDoc["keyAgreement"].each do |el|
+                            new_el = el.transform_keys(&:to_s)
+                            new_el["id"] = percent_encode(did) + new_el["id"]
+                            new_keyAgreement << new_el
+                        end unless didDoc["keyAgreement"].nil?
+                        if new_keyAgreement.length > 0
+                            wd["keyAgreement"] = new_keyAgreement
+                            didDoc.delete("keyAgreement")
+                        end
                     end
                     if didDoc["capabilityInvocation"].to_s != ""
                         wd["capabilityInvocation"] = didDoc["capabilityInvocation"]
@@ -1065,7 +1126,23 @@ class Oydid
                         wd["capabilityDelegation"] = didDoc["capabilityDelegation"]
                         didDoc.delete("capabilityDelegation")
                     end
+                    if didDoc["alsoKnownAs"].to_s != ""
+                        if didDoc["alsoKnownAs"].is_a?(Array)
+                            dda = didDoc["alsoKnownAs"]
+                        else
+                            dda = [didDoc["alsoKnownAs"]]
+                        end
+                        if wd["alsoKnownAs"].nil?
+                            wd["alsoKnownAs"] = dda
+                        else
+                            wd["alsoKnownAs"] += dda
+                        end
+                        didDoc.delete("alsoKnownAs")
+                    end
                     payload = didDoc
+                    if payload == {}
+                        payload = nil
+                    end
                 end
             else
                 payload = didDoc["doc"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oydid
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Christoph Fabianek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-02 00:00:00.000000000 Z
+date: 2024-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_dag
@@ -327,147 +327,147 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: Own Your Decentralized Identifier for Ruby.
 test_files:
-- spec/spec_helper.rb
 - spec/oydid_spec.rb
-- spec/input/basic/french.json
+- spec/spec_helper.rb
 - spec/input/basic/arrays.json
+- spec/input/basic/french.json
 - spec/input/basic/structures.json
 - spec/input/basic/unicode.json
-- spec/input/basic/wierd.json
 - spec/input/basic/values.json
-- spec/output/basic/french.json
+- spec/input/basic/wierd.json
 - spec/output/basic/arrays.json
+- spec/output/basic/french.json
 - spec/output/basic/structures.json
 - spec/output/basic/unicode.json
-- spec/output/basic/wierd.json
 - spec/output/basic/values.json
-- spec/input/basic/sample_b32_dec.doc
-- spec/input/basic/sample_b58_enc.doc
-- spec/input/basic/sample_retrieve_document.doc
-- spec/input/basic/sample_b58_dec.doc
-- spec/input/basic/sample_sha2-512_b58_hash.doc
-- spec/input/basic/sample_b32_enc.doc
-- spec/input/basic/sample_get_location.doc
-- spec/input/basic/sample_invalid2_verify.doc
-- spec/input/basic/sample_valid_privkey.doc
+- spec/output/basic/wierd.json
+- spec/input/basic/sample2_get_location.doc
 - spec/input/basic/sample2_retrieve_document.doc
-- spec/input/basic/zQmaBZTghn.doc
-- spec/input/basic/sample_blake2b-16_b16_hash.doc
+- spec/input/basic/sample3_retrieve_document.doc
 - spec/input/basic/sample4_retrieve_document.doc
-- spec/input/basic/sample_b64_enc.doc
-- spec/input/basic/sample_invalid3_readkey.doc
+- spec/input/basic/sample5_retrieve_document.doc
+- spec/input/basic/sample_b16_dec.doc
 - spec/input/basic/sample_b16_enc.doc
+- spec/input/basic/sample_b17_edec.doc
 - spec/input/basic/sample_b17_enc.doc
-- spec/input/basic/sample_blake2b-32_b32_hash.doc
+- spec/input/basic/sample_b32_dec.doc
+- spec/input/basic/sample_b32_enc.doc
+- spec/input/basic/sample_b58_dec.doc
+- spec/input/basic/sample_b58_enc.doc
 - spec/input/basic/sample_b64_dec.doc
-- spec/input/basic/sample_b16_dec.doc
-- spec/input/basic/sample_sign.doc
+- spec/input/basic/sample_b64_enc.doc
+- spec/input/basic/sample_blake2b-16_b16_hash.doc
+- spec/input/basic/sample_blake2b-32_b32_hash.doc
 - spec/input/basic/sample_blake2b-64_b58_hash.doc
-- spec/input/basic/sample_invalid_privkey.doc
+- spec/input/basic/sample_get_location.doc
+- spec/input/basic/sample_invalid2_readkey.doc
+- spec/input/basic/sample_invalid2_verify.doc
+- spec/input/basic/sample_invalid3_readkey.doc
 - spec/input/basic/sample_invalid3_verify.doc
-- spec/input/basic/sample_readkey.doc
-- spec/input/basic/sample_key.doc
-- spec/input/basic/sample3_retrieve_document.doc
-- spec/input/basic/sample_b17_edec.doc
-- spec/input/basic/sample_verify.doc
-- spec/input/basic/sample5_retrieve_document.doc
-- spec/input/basic/sample_sha3-224_b64_hash.doc
-- spec/input/basic/sample2_get_location.doc
+- spec/input/basic/sample_invalid_privkey.doc
 - spec/input/basic/sample_invalid_readkey.doc
-- spec/input/basic/sample_invalid2_readkey.doc
+- spec/input/basic/sample_invalid_sign.doc
 - spec/input/basic/sample_invalid_verify.doc
+- spec/input/basic/sample_key.doc
+- spec/input/basic/sample_readkey.doc
+- spec/input/basic/sample_retrieve_document.doc
 - spec/input/basic/sample_sha2-256_b58_hash.doc
-- spec/input/basic/sample_invalid_sign.doc
-- spec/input/log/sample4_retrieve_log.doc
-- spec/input/log/sample_op1_addhash.doc
-- spec/input/log/sample0_dag_did.doc
-- spec/input/log/sample5_retrieve_log.doc
-- spec/input/log/sample_addhash.doc
-- spec/input/log/sample3_dag_did.doc
+- spec/input/basic/sample_sha2-512_b58_hash.doc
+- spec/input/basic/sample_sha3-224_b64_hash.doc
+- spec/input/basic/sample_sign.doc
+- spec/input/basic/sample_valid_privkey.doc
+- spec/input/basic/sample_verify.doc
+- spec/input/basic/zQmaBZTghn.doc
 - spec/input/log/sample0_dag2array.doc
-- spec/input/log/sample_retrieve_log.doc
-- spec/input/log/sample_dag_update.doc
-- spec/input/log/sample1_dag_update.doc
-- spec/input/log/sample6_retrieve_log.doc
+- spec/input/log/sample0_dag_did.doc
 - spec/input/log/sample1_dag_did.doc
-- spec/input/log/sample6_dag_update.doc
-- spec/input/log/sample4_dag_did.doc
+- spec/input/log/sample1_dag_update.doc
+- spec/input/log/sample2_dag_did.doc
+- spec/input/log/sample2_dag_update.doc
 - spec/input/log/sample2_retrieve_log.doc
+- spec/input/log/sample3_dag_did.doc
+- spec/input/log/sample3_dag_update.doc
+- spec/input/log/sample3_retrieve_log.doc
+- spec/input/log/sample4_dag_did.doc
+- spec/input/log/sample4_dag_update.doc
+- spec/input/log/sample4_retrieve_log.doc
+- spec/input/log/sample5_dag_update.doc
+- spec/input/log/sample5_retrieve_log.doc
+- spec/input/log/sample6_dag_update.doc
+- spec/input/log/sample6_retrieve_log.doc
 - spec/input/log/sample7_dag_update.doc
+- spec/input/log/sample7_retrieve_log.doc
 - spec/input/log/sample8_dag_update.doc
-- spec/input/log/sample2_dag_update.doc
-- spec/input/log/sample5_dag_update.doc
+- spec/input/log/sample_addhash.doc
+- spec/input/log/sample_dag_update.doc
 - spec/input/log/sample_match_log.doc
-- spec/input/log/sample7_retrieve_log.doc
-- spec/input/log/sample4_dag_update.doc
-- spec/input/log/sample3_retrieve_log.doc
-- spec/input/log/sample2_dag_did.doc
-- spec/input/log/sample3_dag_update.doc
+- spec/input/log/sample_op1_addhash.doc
+- spec/input/log/sample_retrieve_log.doc
 - spec/input/main/sample0_read.doc
-- spec/output/basic/sample_b32_dec.doc
-- spec/output/basic/sample_b58_enc.doc
-- spec/output/basic/sample_retrieve_document.doc
-- spec/output/basic/sample_b58_dec.doc
-- spec/output/basic/sample_sha2-512_b58_hash.doc
-- spec/output/basic/sample_b32_enc.doc
-- spec/output/basic/sample_get_location.doc
-- spec/output/basic/sample_invalid2_verify.doc
-- spec/output/basic/sample_valid_privkey.doc
+- spec/output/basic/sample2_get_location.doc
 - spec/output/basic/sample2_retrieve_document.doc
-- spec/output/basic/sample_blake2b-16_b16_hash.doc
+- spec/output/basic/sample3_retrieve_document.doc
 - spec/output/basic/sample4_retrieve_document.doc
-- spec/output/basic/sample_b64_enc.doc
-- spec/output/basic/sample_invalid3_readkey.doc
+- spec/output/basic/sample5_retrieve_document.doc
+- spec/output/basic/sample_b16_dec.doc
 - spec/output/basic/sample_b16_enc.doc
+- spec/output/basic/sample_b17_edec.doc
 - spec/output/basic/sample_b17_enc.doc
-- spec/output/basic/sample_blake2b-32_b32_hash.doc
+- spec/output/basic/sample_b32_dec.doc
+- spec/output/basic/sample_b32_enc.doc
+- spec/output/basic/sample_b58_dec.doc
+- spec/output/basic/sample_b58_enc.doc
 - spec/output/basic/sample_b64_dec.doc
-- spec/output/basic/sample_b16_dec.doc
-- spec/output/basic/sample_sign.doc
+- spec/output/basic/sample_b64_enc.doc
+- spec/output/basic/sample_blake2b-16_b16_hash.doc
+- spec/output/basic/sample_blake2b-32_b32_hash.doc
 - spec/output/basic/sample_blake2b-64_b58_hash.doc
-- spec/output/basic/sample_invalid_privkey.doc
+- spec/output/basic/sample_get_location.doc
+- spec/output/basic/sample_invalid2_readkey.doc
+- spec/output/basic/sample_invalid2_verify.doc
+- spec/output/basic/sample_invalid3_readkey.doc
 - spec/output/basic/sample_invalid3_verify.doc
-- spec/output/basic/sample_readkey.doc
-- spec/output/basic/sample_key.doc
-- spec/output/basic/sample3_retrieve_document.doc
-- spec/output/basic/sample_b17_edec.doc
-- spec/output/basic/sample_verify.doc
-- spec/output/basic/sample5_retrieve_document.doc
-- spec/output/basic/sample_sha3-224_b64_hash.doc
-- spec/output/basic/sample2_get_location.doc
+- spec/output/basic/sample_invalid_privkey.doc
 - spec/output/basic/sample_invalid_readkey.doc
-- spec/output/basic/sample_invalid2_readkey.doc
+- spec/output/basic/sample_invalid_sign.doc
 - spec/output/basic/sample_invalid_verify.doc
+- spec/output/basic/sample_key.doc
+- spec/output/basic/sample_readkey.doc
+- spec/output/basic/sample_retrieve_document.doc
 - spec/output/basic/sample_sha2-256_b58_hash.doc
-- spec/output/basic/sample_invalid_sign.doc
-- spec/output/log/sample4_retrieve_log.doc
-- spec/output/log/sample_op1_addhash.doc
-- spec/output/log/sample0_dag_did.doc
-- spec/output/log/sample5_retrieve_log.doc
-- spec/output/log/sample_addhash.doc
-- spec/output/log/sample3_dag_did.doc
+- spec/output/basic/sample_sha2-512_b58_hash.doc
+- spec/output/basic/sample_sha3-224_b64_hash.doc
+- spec/output/basic/sample_sign.doc
+- spec/output/basic/sample_valid_privkey.doc
+- spec/output/basic/sample_verify.doc
 - spec/output/log/sample0_dag2array.doc
-- spec/output/log/sample_retrieve_log.doc
-- spec/output/log/sample_dag_update.doc
-- spec/output/log/sample1_dag_update.doc
-- spec/output/log/sample6_retrieve_log.doc
+- spec/output/log/sample0_dag_did.doc
 - spec/output/log/sample1_dag_did.doc
-- spec/output/log/sample6_dag_update.doc
-- spec/output/log/sample4_dag_did.doc
+- spec/output/log/sample1_dag_update.doc
+- spec/output/log/sample2_dag_did.doc
+- spec/output/log/sample2_dag_update.doc
 - spec/output/log/sample2_retrieve_log.doc
+- spec/output/log/sample3_dag_did.doc
+- spec/output/log/sample3_dag_update.doc
+- spec/output/log/sample3_retrieve_log.doc
+- spec/output/log/sample4_dag_did.doc
+- spec/output/log/sample4_dag_update.doc
+- spec/output/log/sample4_retrieve_log.doc
+- spec/output/log/sample5_dag_update.doc
+- spec/output/log/sample5_retrieve_log.doc
+- spec/output/log/sample6_dag_update.doc
+- spec/output/log/sample6_retrieve_log.doc
 - spec/output/log/sample7_dag_update.doc
+- spec/output/log/sample7_retrieve_log.doc
 - spec/output/log/sample8_dag_update.doc
-- spec/output/log/sample2_dag_update.doc
-- spec/output/log/sample5_dag_update.doc
+- spec/output/log/sample_addhash.doc
+- spec/output/log/sample_dag_update.doc
 - spec/output/log/sample_match_log.doc
-- spec/output/log/sample7_retrieve_log.doc
-- spec/output/log/sample4_dag_update.doc
-- spec/output/log/sample3_retrieve_log.doc
-- spec/output/log/sample2_dag_did.doc
-- spec/output/log/sample3_dag_update.doc
+- spec/output/log/sample_op1_addhash.doc
+- spec/output/log/sample_retrieve_log.doc
 - spec/output/main/sample0_read.doc