oydid 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84460bc149df8e10a4f5094879894399bd3d6670ff5ef1fc8c500811af5fb5e2
-  data.tar.gz: 3515b7f22cf286b3abda13299fd15a6a713f39a2048c8f1d3553f36832577e24
+  metadata.gz: fd217dec02b21cc0f67b4468ca7512cdc407042f5800ba9321453a40578b0fca
+  data.tar.gz: dc2456c039c57454dda2586e0791fe5c21ed854973a9223e6900e5414298f0cd
 SHA512:
-  metadata.gz: 1eadd2c6dfba9ef8788e72514b3c12561e8628a20c6fc14bb21172d3777227bde42accb6dfe5cda14ccdeb027cb53415c179193cbd70bf1fa637b1bfe1208078
-  data.tar.gz: 9e0f47ca1316e508faf65af727afb8a61de3a89e023d789d21ce69ca9328da46f4d1c9a197ee7486aba3c460476112bebf919803c26b7f0c06896f911b1ecfa6
+  metadata.gz: 960ff5f588095f07401e4eb2c70b29a1e3393fb335f757188cf91ac026c9f066a22f5e660a927cbe6bbc70d9b3524f423dacf1b4fb417945d3bbe2c750cb29d2
+  data.tar.gz: bae80cb73bb3029a1b157fb85c579ac0d394f713b50b2f3eff6968b0a672528d45ae06969a52b3f13c077b55ab9792fe75630417bf19952f18ce7847b834c66a

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.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

@@ -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])), 

metadata

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