oydid 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84460bc149df8e10a4f5094879894399bd3d6670ff5ef1fc8c500811af5fb5e2
-  data.tar.gz: 3515b7f22cf286b3abda13299fd15a6a713f39a2048c8f1d3553f36832577e24
+  metadata.gz: ac6225dd965dafae4c9a9013d023882dd0ffe6408eb8922ef4179b8c0be96e10
+  data.tar.gz: ec26220fc09876cef2fb554ebc8cb16b03485cd31d019514384831188addd645
 SHA512:
-  metadata.gz: 1eadd2c6dfba9ef8788e72514b3c12561e8628a20c6fc14bb21172d3777227bde42accb6dfe5cda14ccdeb027cb53415c179193cbd70bf1fa637b1bfe1208078
-  data.tar.gz: 9e0f47ca1316e508faf65af727afb8a61de3a89e023d789d21ce69ca9328da46f4d1c9a197ee7486aba3c460476112bebf919803c26b7f0c06896f911b1ecfa6
+  metadata.gz: b982abdf30a063066e8d6d636cff2b144b80d25aca19aaadc13b2c9aa8f05a794f51362cd03877ad1113be6d08e4f0a038308eafed9c00a6aea25d10ef59db89
+  data.tar.gz: f783d819dea7744cfe54a1a7575cbf7657b56c0f836822a61eeb4b658e8e1eead2cc3cc1f2d120f06cca6e22e2c6ebda1d83ea3ce50a2050e5e37e2aa58fc4ee

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.1

data/lib/oydid/basic.rb

@@ -124,7 +124,11 @@ class Oydid
     end
 
     def self.read_private_storage(filename)
-        File.open(filename, 'r') { |f| f.read }
+        begin
+            File.open(filename, 'r') { |f| f.read }
+        rescue
+            nil
+        end
     end
 
     def self.get_location(id)

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
@@ -205,8 +205,38 @@ 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[: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_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, nil, nil, nil, nil, nil, nil, nil, nil, 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
+                    revocationKey_old, msg = decode_private_key(options[:old_rev_enc].to_s)
+                end
+            else
+                revocationKey_old, msg = read_private_key(options[:old_rev_key].to_s)
+            end
+            if revocationKey_old.nil?
+                return [nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, "invalid or missing old private revocation key"]
+            end
 
             # key management
             if options[:doc_key].nil?
@@ -218,13 +248,19 @@ class Oydid
             else
                 privateKey, msg = read_private_key(options[:doc_key].to_s)
             end
-            if options[:rev_key].nil? && options[:rev_pwd].nil?
-                revocationKey, msg = generate_private_key("", 'ed25519-priv')
-                revocationLog = read_private_storage(did10 + "_revocation.json")
-            else
+            # if options[:rev_key].nil? && options[:rev_pwd].nil? && options[:rev_enc].nil?
+            #     revocationLog = read_private_storage(did10 + "_revocation.json")
+            #     if revocationLog.nil?
+            #         return [nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, "invalid or missing old revocation log"]
+            #     end
+            # else
                 if options[:rev_key].nil?
                     if options[:rev_enc].nil?
-                        revocationKey, msg = generate_private_key(options[:rev_pwd].to_s, 'ed25519-priv')
+                        if options[:rev_pwd].nil?
+                            revocationKey, msg = generate_private_key("", 'ed25519-priv')
+                        else
+                            revocationKey, msg = generate_private_key(options[:rev_pwd].to_s, 'ed25519-priv')
+                        end
                     else
                         revocationKey, msg = decode_private_key(options[:rev_enc].to_s)
                     end
@@ -246,7 +282,7 @@ class Oydid
                     "op": 1, # REVOKE
                     "doc": subDidHash,
                     "sig": signedSubDidHash }.transform_keys(&:to_s).to_json
-            end
+            # end
             revoc_log = JSON.parse(revocationLog)
             revoc_log["previous"] = [
                 hash(canonical(log_old[did_info["doc_log_id"].to_i])), 
@@ -431,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?
@@ -462,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, msg = generate_private_key(options[:doc_pwd].to_s, 'ed25519-priv')
+                privateKey_old, msg = decode_private_key(options[:old_doc_enc].to_s)
             end
         else
-            privateKey, msg = read_private_key(options[:doc_key].to_s)
+            privateKey_old, msg = read_private_key(options[:old_doc_key].to_s)
         end
-        if privateKey.nil?
-            return [nil, "private key not found"]
+        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
+                revocationKey_old, msg = decode_private_key(options[:old_rev_enc].to_s)
+            end
+        else
+            revocationKey_old, msg = read_private_key(options[:old_rev_key].to_s)
+        end
+        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")
@@ -502,7 +553,7 @@ class Oydid
             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
+            signedSubDidHash = sign(subDidHash, revocationKey_old).first
             revocationLog = { 
                 "ts": ts_old,
                 "op": 1, # REVOKE
@@ -519,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
@@ -527,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.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Christoph Fabianek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2022-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dag