oydid 0.2.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd217dec02b21cc0f67b4468ca7512cdc407042f5800ba9321453a40578b0fca
-  data.tar.gz: dc2456c039c57454dda2586e0791fe5c21ed854973a9223e6900e5414298f0cd
+  metadata.gz: 7fdd0883f0c8f620e7e0df179e0665ce3e5833dc50571e29ca9f2035a7336168
+  data.tar.gz: 65588a5899cd069a8bd35d1ab56cf28753e3e3ec7ffcc0781820a1cd253fa701
 SHA512:
-  metadata.gz: 960ff5f588095f07401e4eb2c70b29a1e3393fb335f757188cf91ac026c9f066a22f5e660a927cbe6bbc70d9b3524f423dacf1b4fb417945d3bbe2c750cb29d2
-  data.tar.gz: bae80cb73bb3029a1b157fb85c579ac0d394f713b50b2f3eff6968b0a672528d45ae06969a52b3f13c077b55ab9792fe75630417bf19952f18ce7847b834c66a
+  metadata.gz: 3d8ed1a2114b02c387ad6db5602b82f5b2732be81072ed3f9ea294c036c3e0344eadd93a1aebac9c1321ff406d9e56d63f4e6e2bd126f34575ae64d7c6e092d7
+  data.tar.gz: 6e635a8121304254b70f17a08315e9be4fc654d818e49be1246e2bea9aae24ab0d27548fb697c62dcc7eae6ba0ce9d6c09f75da291b6831dd603683a68c67639

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.2

data/lib/oydid.rb

@@ -139,9 +139,9 @@ class Oydid
 
     def self.generate_base(content, did, mode, options)
         # input validation
-        did_doc = JSON.parse(content.to_json) rescue {}
-        if did_doc == {}
-            return [nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, "empty or invalid payload"]
+        did_doc = JSON.parse(content.to_json) rescue nil
+        if did_doc.nil?
+            return [nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, "invalid payload"]
         end        
         did_old = nil
         log_old = nil
@@ -275,7 +275,7 @@ class Oydid
                 pubRevoKey_old = public_key(revocationKey_old).first
                 did_key_old = publicKey_old + ":" + pubRevoKey_old
                 subDid = {"doc": did_old_doc, "key": did_key_old}.to_json
-                subDidHash = hash(subDid)
+                subDidHash = hash(canonical(subDid))
                 signedSubDidHash = sign(subDidHash, revocationKey_old).first
                 revocationLog = { 
                     "ts": ts_old,
@@ -467,7 +467,7 @@ class Oydid
         end
     end
 
-    def self.revoke(did, options)
+    def self.revoke_base(did, options)
         did_orig = did.dup
         doc_location = options[:doc_location]
         if options[:ts].nil?
@@ -498,25 +498,40 @@ class Oydid
         did_old = did.dup
         did10_old = did10.dup
         log_old = did_info["log"]
-        privateKey_old = read_private_storage(did10_old + "_private_key.b58")
-        revocationKey_old = read_private_storage(did10_old + "_revocation_key.b58")
 
-        if options[:doc_key].nil?
-            if options[:doc_pwd].nil?
-                if options[:doc_enc].nil?
-                    privateKey, msg = read_private_key(did10 + "_private_key.b58")
+        if options[:old_doc_key].nil?
+            if options[:old_doc_enc].nil?
+                if options[:old_doc_pwd].nil?
+                    privateKey_old = read_private_storage(did10_old + "_private_key.b58")
                 else
-                    privateKey, msg = decode_private_key(options[:doc_enc].to_s)
+                    privateKey_old, msg = generate_private_key(options[:old_doc_pwd].to_s, 'ed25519-priv')
+                end
+            else
+                privateKey_old, msg = decode_private_key(options[:old_doc_enc].to_s)
+            end
+        else
+            privateKey_old, msg = read_private_key(options[:old_doc_key].to_s)
+        end
+        if privateKey_old.nil?
+            return [nil, "invalid or missing old private document key"]
+        end
+        if options[:old_rev_key].nil?
+            if options[:old_rev_enc].nil?
+                if options[:old_rev_pwd].nil?
+                    revocationKey_old = read_private_storage(did10_old + "_revocation_key.b58")
+                else
+                    revocationKey_old, msg = generate_private_key(options[:old_rev_pwd].to_s, 'ed25519-priv')
                 end
             else
-                privateKey, msg = generate_private_key(options[:doc_pwd].to_s, 'ed25519-priv')
+                revocationKey_old, msg = decode_private_key(options[:old_rev_enc].to_s)
             end
         else
-            privateKey, msg = read_private_key(options[:doc_key].to_s)
+            revocationKey_old, msg = read_private_key(options[:old_rev_key].to_s)
         end
-        if privateKey.nil?
-            return [nil, "private key not found"]
+        if revocationKey_old.nil?
+            return [nil, "invalid or missing old private revocation key"]
         end
+
         if options[:rev_key].nil? && options[:rev_pwd].nil? && options[:rev_enc].nil?
             revocationKey, msg = read_private_key(did10 + "_revocation_key.b58")
             revocationLog = read_private_storage(did10 + "_revocation.json")
@@ -537,8 +552,8 @@ class Oydid
             pubRevoKey_old = public_key(revocationKey_old).first
             did_key_old = publicKey_old + ":" + pubRevoKey_old
             subDid = {"doc": did_old_doc, "key": did_key_old}.to_json
-            subDidHash = hash(subDid)
-            signedSubDidHash = sign(subDidHash, revocationKey).first
+            subDidHash = hash(canonical(subDid))
+            signedSubDidHash = sign(subDidHash, revocationKey_old).first
             revocationLog = { 
                 "ts": ts_old,
                 "op": 1, # REVOKE
@@ -555,7 +570,18 @@ class Oydid
             hash(canonical(log_old[did_info["doc_log_id"].to_i])), 
             hash(canonical(log_old[did_info["termination_log_id"].to_i]))
         ]
+        return [revoc_log, ""]
+    end
 
+    def self.revoke_publish(did, revoc_log, options)
+        did_hash = did.delete_prefix("did:oyd:")
+        did10 = did_hash[0,10]
+        doc_location = options[:doc_location]
+        if did_hash.include?(LOCATION_PREFIX)
+            hash_split = did_hash.split(LOCATION_PREFIX)
+            did_hash = hash_split[0]
+            doc_location = hash_split[1]
+        end
         if doc_location.to_s == ""
             doc_location = DEFAULT_LOCATION
         end
@@ -563,22 +589,29 @@ class Oydid
         # publish revocation log based on location
         case doc_location.to_s
         when /^http/
-            retVal = HTTParty.post(doc_location.to_s + "/log/" + did.to_s,
+            retVal = HTTParty.post(doc_location.to_s + "/log/" + did_hash.to_s,
                 headers: { 'Content-Type' => 'application/json' },
                 body: {"log": revoc_log}.to_json )
             if retVal.code != 200
-                msg = retVal.parsed_response("error").to_s rescue "invalid response from " + doc_location.to_s + "/log/" + did.to_s
+                msg = retVal.parsed_response("error").to_s rescue "invalid response from " + doc_location.to_s + "/log/" + did_hash.to_s
                 return [nil, msg]
             end
         else
-            File.write(did10 + ".log", [log_old, revoc_log].flatten.compact.to_json)
+            File.write(did10 + ".log", revoc_log.to_json)
             if !did_old.nil?
-                File.write(did10_old + ".log", [log_old, revoc_log].flatten.compact.to_json)
+                File.write(did10_old + ".log", revoc_log.to_json)
             end
         end
 
-        return [did_orig, ""]
+        return [did, ""]
+    end
 
+    def self.revoke(did, options)
+        revoc_log, msg = revoke_base(did, options)
+        if revoc_log.nil?
+            return [nil, msg]
+        end
+        success, msg = revoke_publish(did, revoc_log, options)
     end
 
     def self.clone(did, options)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oydid
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Christoph Fabianek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-15 00:00:00.000000000 Z
+date: 2022-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dag