oydid 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 872454b12ba811fdab1ac25967a94f2555b3a3eb5e0b9e33128f671084c1c8ba
-  data.tar.gz: ba79bd15b747a1ff8344bb0084184bdd6f810cc4f13dde5e2abda974459d6576
+  metadata.gz: 171ab373123506d42a8dd20b80df654ebd3cf35ac1d53e65f36580b4a3d92374
+  data.tar.gz: 2bab378e7f1d284f7e730f32acb52964f7c84456ae5a41a786429d0f6ff11134
 SHA512:
-  metadata.gz: 6f365d7a094576d29cf1dc056a6c0ac6ff869b3f7ebe26d99817f439b369f7537caef79f170d1fbe8201eb7d44b36f29f0a0028f858d5ba0bace8de10f6972f6
-  data.tar.gz: 6e7425342af56e8bb2139138ad3162a82fc5023af0db7ba8d005abf5231e098df5d9718af1ee144ca4d8100a69c57e448dd5a4c3c20bc10127be317e1e05eff5
+  metadata.gz: e3d84952f40b4b7680f1c49cb351516b25b901f696f4db73222a3a5f82a645ee23da62881f24237e29cac195da2857f4392ab289ba78d29f83a14332d970ea91
+  data.tar.gz: 555e144d9581d897b91eadd480267c9e76bfed1145077cf524537d13cc571be3efca39512aefdb7ce798390de22fc87ea922ac6e53db3e67dfba8dfa65cedd08

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/lib/oydid/vc.rb

@@ -19,7 +19,7 @@ class Oydid
             exit
         end
 
-        private_key = options[:doc_enc].to_s rescue nil
+        private_key = options[:holder_privateKey].to_s rescue nil
         if private_key.to_s == ""
             msg = "missing private document key information"
             return [nil, msg]
@@ -69,29 +69,70 @@ class Oydid
     def self.create_vc(content, options)
         vercred = {}
         # set the context, which establishes the special terms used
-        vercred["@context"] = ["https://www.w3.org/2018/credentials/v1"]
-        vercred["type"] = ["VerifiableCredential"]
-        vercred["issuer"] = options[:issuer]
+        if content["@context"].nil?
+            vercred["@context"] = ["https://www.w3.org/ns/credentials/v2"]
+        else
+            vercred["@context"] = content["@context"]
+        end
+        if vercred["@context"].to_s == "" || vercred["@context"].to_s == "{}" || vercred["@context"].to_s == "[]"
+            return [nil, "invalid '@context'"]
+        end
+        if content["type"].nil?
+            vercred["type"] = ["VerifiableCredential"]
+        else
+            vercred["type"] = content["type"]
+        end
+        if vercred["type"].to_s == "" || vercred["type"].to_s == "{}" || vercred["type"].to_s == "[]"
+            return [nil, "invalid 'type'"]
+        end
+        if content["issuer"].nil?
+            vercred["issuer"] = options[:issuer]
+        else
+            vercred["issuer"] = content["issuer"]
+        end
+        if vercred["issuer"].to_s == "" || vercred["issuer"].to_s == "{}" || vercred["issuer"].to_s == "[]"
+            return [nil, "invalid 'issuer'"]
+        end
         if options[:ts].nil?
             vercred["issuanceDate"] = Time.now.utc.iso8601
         else
             vercred["issuanceDate"] = Time.at(options[:ts]).utc.iso8601
         end
-        vercred["credentialSubject"] = {"id": options[:holder]}.merge(content)
+        if content["credentialSubject"].nil?
+            vercred["credentialSubject"] = {"id": options[:holder]}.merge(content)
+        else
+            vercred["credentialSubject"] = content["credentialSubject"]
+        end
+        if vercred["credentialSubject"].to_s == "" || vercred["credentialSubject"].to_s == "{}" || vercred["credentialSubject"].to_s == "[]"
+            return [nil, "invalid 'credentialSubject'"]
+        end
+        if content["proof"].nil?
+            proof = {}
+            proof["type"] = "Ed25519Signature2020"
+            proof["verificationMethod"] = options[:issuer].to_s
+            proof["proofPurpose"] = "assertionMethod"
+            proof["proofValue"] = sign(vercred["credentialSubject"].to_json_c14n, options[:issuer_privateKey], []).first
+            vercred["proof"] = proof
+        else
+            vercred["proof"] = content["proof"]
+        end
+        if vercred["proof"].to_s == "" || vercred["proof"].to_s == "{}" || vercred["proof"].to_s == "[]"
+            return [nil, "invalid 'proof'"]
+        end
 
+        # specify the identifier of the credential
+        vercred["identifier"] = hash(vercred.to_json)
+        return [vercred, ""]
+    end
+
+    def self.create_vc_proof(content, options)
         proof = {}
         proof["type"] = "Ed25519Signature2020"
         proof["verificationMethod"] = options[:issuer].to_s
         proof["proofPurpose"] = "assertionMethod"
-
-        # private_key = generate_private_key(options[:issuer_privateKey], "ed25519-priv", []).first
         proof["proofValue"] = sign(content.to_json_c14n, options[:issuer_privateKey], []).first
 
-        vercred["proof"] = proof
-
-        # specify the identifier of the credential
-        vercred["identifier"] = hash(vercred.to_json)
-        return [vercred, ""]
+        return [proof, ""]
     end
 
     def self.publish_vc(vc, options)
@@ -101,8 +142,11 @@ class Oydid
             return [nil, "invalid format (missing identifier"]
             exit
         end
-
-        cs = vc["credentialSubject"].transform_keys(&:to_s) rescue nil
+        if vc["credentialSubject"].is_a?(Array)
+            cs = vc["credentialSubject"].last.transform_keys(&:to_s) rescue nil
+        else
+            cs = vc["credentialSubject"].transform_keys(&:to_s) rescue nil
+        end
         holder = cs["id"] rescue nil
         if holder.nil?
             return [nil, "invalid format (missing holder)"]
@@ -155,7 +199,7 @@ class Oydid
     def self.create_vp(content, options)
         verpres = {}
         # set the context, which establishes the special terms used
-        verpres["@context"] = ["https://www.w3.org/2018/credentials/v1"]
+        verpres["@context"] = ["https://www.w3.org/ns/credentials/v2"]
         verpres["type"] = ["VerifiablePresentation"]
         verpres["verifiableCredential"] = [content].flatten
 

data/lib/oydid.rb

@@ -201,7 +201,18 @@ class Oydid
                 end
             end
         else # mode == "update"  => read information
+            # if a location is provided this is only relevant for writing the DID
+            update_location = options[:location]
+            update_doc_location = options[:doc_location]
+            update_log_location = options[:log_location]
+            options[:location] = nil
+            options[:doc_location] = nil
+            options[:log_location] = nil
             did_info, msg = read(did, options)
+            options[:location] = options[:location]
+            options[:doc_location] = options[:doc_location]
+            options[:log_location] = options[:log_location]
+
             if did_info.nil?
                 return [nil, nil, nil, "cannot resolve DID (on updating DID)"]
             end
@@ -314,6 +325,13 @@ class Oydid
         pubRevoKey = public_key(revocationKey, options).first
         did_key = publicKey + ":" + pubRevoKey
 
+        # check if pubKeys matches with existing DID Document
+        if mode == "update"
+            if did_key_old.to_s != did_info["doc"]["key"].to_s
+                return [nil, nil, nil, "keys from original DID don't match"]
+            end
+        end
+
         # build new revocation document
         subDid = {"doc": did_doc, "key": did_key}.to_json
         retVal = multi_hash(canonical(subDid), LOG_HASH_OPTIONS)
@@ -406,7 +424,6 @@ class Oydid
             :privateKey => privateKey,
             :revocationKey => revocationKey
         }
-
         return [did_doc, did_key, did_log, ""]
         # return [did, didDocument, revoc_log, l1, l2, r1, privateKey, revocationKey, did_old, log_old, ""]
     end
@@ -455,6 +472,9 @@ class Oydid
 
     def self.write(content, did, mode, options)
         did_doc, did_key, did_log, msg = generate_base(content, did, mode, options)
+        if msg != ""
+            return [nil, msg]
+        end
         did = did_doc[:did]
         didDocument = did_doc[:didDocument]
         did_old = did_doc[:did_old]
@@ -467,9 +487,6 @@ class Oydid
         revocationKey = did_key[:revocationKey]
         # did, didDocument, revoc_log, l1, l2, r1, privateKey, revocationKey, did_old, log_old, msg = generate_base(content, did, mode, options)
 
-        if msg != ""
-            return [nil, msg]
-        end
         did_hash = did.delete_prefix("did:oyd:")
         did10 = did_hash[0,10]
         did_old_hash = did_old.delete_prefix("did:oyd:") rescue nil
@@ -776,11 +793,17 @@ class Oydid
                 location = get_location(did_info["did"].to_s)
             end
             wd = wd.merge(didDoc["doc"])
-            wdf = wd["service"].first
-            wdf = { "id": did + "#payload",
-                    "type": "Custom",
-                    "serviceEndpoint": location }.merge(wdf)
-            wd["service"] = [wdf] + wd["service"].drop(1) 
+            if wd["service"] != []
+                if wd["service"].is_a?(Array)
+                    wdf = wd["service"].first
+                else
+                    wdf = wd["service"]
+                end
+                wdf = { "id": did + "#payload",
+                        "type": "Custom",
+                        "serviceEndpoint": location }.merge(wdf)
+                wd["service"] = [wdf] + wd["service"].drop(1) 
+            end
         else
             payload = nil
             if didDoc["doc"].is_a?(Hash)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oydid
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Christoph Fabianek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-04 00:00:00.000000000 Z
+date: 2023-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dag