oydid 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '080c68f559573f4402ed202c539848c9bdc72e173697061b8e8005c06b64d06b'
-  data.tar.gz: 5614b9dc152ff70f3f1e951f0db39a41a46dddaa17aa4088652e1d3c17cd8115
+  metadata.gz: 20d91a8c36a05670346244339ea68ec0288c1550994a421e51d4eeb4c6906234
+  data.tar.gz: 32722af4d3ab83842ad7cc3428834bccecdf0a987c3cb5c86683c7b5208fabe8
 SHA512:
-  metadata.gz: 7d594168b9e609882afff27e8b92e9740acb5500a328ecf9599a3c8ee848a4917921744117810263957585f6f3b8d742c5a00362d516b871ffe3f2dd73d4f494
-  data.tar.gz: '0571905fda5580900ecaea886909e951da2fe1636cb001e8984f95837733a4ce453aaae928525cf6521e8c50b9428afc7941aed1bd02855fd20e3a61e16d10d8'
+  metadata.gz: 965132e50470d2423fce55a6f9cef44c34747585c3a46646f4ed1d546f9acfb25058bfe1cff3dcef1cd151e7ed40964f4f5f5cb55943872534c55610fc90ed1f
+  data.tar.gz: 06e4978da7ae725b69ae07e95fd92638b966c4ae3a111d5a18202739ba4bb0a9496c85f3cd4aae76041958f321d8a3337f94a5774d3df3600287677338442f76

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.3

data/lib/oydid/didcomm.rb

@@ -18,8 +18,45 @@ class Oydid
 
     end
 
-    # signing -----------------------------------
-    def self.msg_encrypt(payload, private_key_encoded)
+    # DIDComm Signed Message --------------------
+    def self.dcsm(payload, private_key_encoded, options)
+        error = ""
+        code, length, digest = decode(private_key_encoded).unpack('SCa*')
+        case Multicodecs[code].name
+        when 'ed25519-priv'
+            private_key = RbNaCl::Signatures::Ed25519::SigningKey.new(digest)
+            token = JWT.encode payload, private_key, 'ED25519', { typ: 'JWM', kid: options[:sign_did].to_s, alg: 'ED25519' }
+        else
+            token = nil
+            error = "unsupported key codec"
+        end
+        return [token, error]
+    end
+
+    def self.dcsm_verify(token, options)
+        error = ""
+        decoded_payload = JWT.decode token, nil, false
+        pubkey_did = decoded_payload.last["kid"]
+        result, msg = Oydid.read(pubkey_did, options)
+        public_key_encoded = Oydid.w3c(result, options)["authentication"].first["publicKeyMultibase"]
+        begin
+            code, length, digest = Oydid.decode(public_key_encoded).unpack('CCa*')
+            case Multicodecs[code].name
+            when 'ed25519-pub'
+                public_key = RbNaCl::Signatures::Ed25519::VerifyKey.new(digest)
+                payload = JWT.decode token.to_s, public_key, true, { algorithm: 'ED25519' }
+            else
+                payload = nil
+                error = "unsupported key codec"
+            end
+            return [payload, error]
+        rescue
+            return [nil, "verification failed"]
+        end
+    end
+
+    # encryption -----------------------------------
+    def self.msg_encrypt(payload, private_key_encoded, did)
         error = ""
         code, length, digest = decode(private_key_encoded).unpack('SCa*')
         case Multicodecs[code].name
@@ -47,4 +84,18 @@ class Oydid
         return [payload, error]
     end
 
+    # signing for JWS ---------------------------
+    def self.msg_sign(payload, hmac_secret)
+        token = JWT.encode payload, hmac_secret, 'HS256'
+        return [token, ""]
+    end
+
+    def self.msg_verify_jws(token, hmac_secret)
+        begin
+            decoded_token = JWT.decode token, hmac_secret, true, { algorithm: 'HS256' }
+            return [decoded_token, ""]
+        rescue
+            return [nil, "verification failed"]
+        end
+    end
 end

data/lib/oydid/log.rb

@@ -152,20 +152,23 @@ class Oydid
 
     def self.dag_update(currentDID, options)
         i = 0
-        initial_did = currentDID["did"].to_s
+        doc_location = ""
+        initial_did = currentDID["did"].to_s.dup
         initial_did = initial_did.delete_prefix("did:oyd:")
-        initial_did = initial_did.split("@").first
+        if initial_did.include?(LOCATION_PREFIX)
+            tmp = initial_did.split(LOCATION_PREFIX)
+            initial_did = tmp[0] 
+            doc_location = tmp[1]
+        end
         current_public_doc_key = ""
         verification_output = false
         currentDID["log"].each do |el|
             case el["op"]
             when 2,3 # CREATE, UPDATE
                 currentDID["doc_log_id"] = i
-
                 doc_did = el["doc"]
-                doc_location = get_location(doc_did)
                 did_hash = doc_did.delete_prefix("did:oyd:")
-                did_hash = did_hash.split("@").first
+                did_hash = did_hash.split(LOCATION_PREFIX).first
                 did10 = did_hash[0,10]
                 doc = retrieve_document_raw(doc_did, did10 + ".doc", doc_location, {})
                 if doc.first.nil?
@@ -217,9 +220,8 @@ class Oydid
                 currentDID["termination_log_id"] = i
 
                 doc_did = currentDID["did"]
-                doc_location = get_location(doc_did)
                 did_hash = doc_did.delete_prefix("did:oyd:")
-                did_hash = did_hash.split("@").first
+                did_hash = did_hash.split(LOCATION_PREFIX).first
                 did10 = did_hash[0,10]
                 doc = retrieve_document_raw(doc_did, did10 + ".doc", doc_location, {})
                 # since it retrieves a DID that previously existed, this test is not necessary
@@ -230,11 +232,11 @@ class Oydid
                 # end
                 doc = doc.first["doc"]
                 term = doc["log"]
-                log_location = term.split("@")[1] rescue ""
+                log_location = term.split(LOCATION_PREFIX)[1] rescue ""
                 if log_location.to_s == ""
                     log_location = DEFAULT_LOCATION
                 end
-                term = term.split("@").first
+                term = term.split(LOCATION_PREFIX).first
                 if hash(canonical(el)) != term
                     currentDID["error"] = 1
                     currentDID["message"] = "Log reference and record don't match"
@@ -256,7 +258,7 @@ class Oydid
                 # check if there is a revocation entry
                 revocation_record = {}
                 revoc_term = el["doc"]
-                revoc_term = revoc_term.split("@").first
+                revoc_term = revoc_term.split(LOCATION_PREFIX).first
                 revoc_term_found = false
                 log_array, msg = retrieve_log(did_hash, did10 + ".log", log_location, options)
                 log_array.each do |log_el|
@@ -321,9 +323,9 @@ class Oydid
                                         currentDID["verification"] += "of next DID Document (Details: https://ownyourdata.github.io/oydid/#verify_signature)" + "\n"
 
                                         next_doc_did = log_el["doc"].to_s
-                                        next_doc_location = get_location(next_doc_did)
+                                        next_doc_location = doc_location
                                         next_did_hash = next_doc_did.delete_prefix("did:oyd:")
-                                        next_did_hash = next_did_hash.split("@").first
+                                        next_did_hash = next_did_hash.split(LOCATION_PREFIX).first
                                         next_did10 = next_did_hash[0,10]
                                         next_doc = retrieve_document_raw(next_doc_did, next_did10 + ".doc", next_doc_location, {})
                                         if next_doc.first.nil?
@@ -342,9 +344,9 @@ class Oydid
                                     currentDID["message"] = "Signature does not match"
                                     if verification_output
                                         new_doc_did = log_el["doc"].to_s
-                                        new_doc_location = get_location(new_doc_did)
+                                        new_doc_location = doc_location
                                         new_did_hash = new_doc_did.delete_prefix("did:oyd:")
-                                        new_did_hash = new_did_hash.split("@").first
+                                        new_did_hash = new_did_hash.split(LOCATION_PREFIX).first
                                         new_did10 = new_did_hash[0,10]
                                         new_doc = retrieve_document(new_doc_did, new_did10 + ".doc", new_doc_location, {}).first
                                         currentDID["verification"] += "found UPDATE log record:" + "\n"

data/lib/oydid.rb

@@ -149,7 +149,7 @@ class Oydid
         log_old = nil
         prev_hash = []
         revoc_log = nil
-        doc_location = options[:doc_location]
+        doc_location = options[:location]
         if options[:ts].nil?
             ts = Time.now.to_i
         else
@@ -672,14 +672,13 @@ class Oydid
         wd = {}
         wd["@context"] = "https://www.w3.org/ns/did/v1"
         wd["id"] = did
-        wd["assertionMethod"] = [{
-            "id": did,
+        wd["verificationMethod"] = [{
+            "id": did + "#key-doc",
             "type": "Ed25519VerificationKey2020",
             "controller": did,
             "publicKeyMultibase": pubDocKey
-        }]
-        wd["keyAgreement"] = [{
-            "id": did,
+        },{
+            "id": did + "#key-rev",
             "type": "Ed25519VerificationKey2020",
             "controller": did,
             "publicKeyMultibase": pubRevKey

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oydid
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Christoph Fabianek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-14 00:00:00.000000000 Z
+date: 2022-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dag