oydid 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20d91a8c36a05670346244339ea68ec0288c1550994a421e51d4eeb4c6906234
-  data.tar.gz: 32722af4d3ab83842ad7cc3428834bccecdf0a987c3cb5c86683c7b5208fabe8
+  metadata.gz: 56c65853f4983bcb8214a4027986839c0503adcc1133933f817d8401d8881be7
+  data.tar.gz: 2a6048ab2023f8641e83e7b0162a8c15ef6bdb2c0855d70cef8d6c015ca34720
 SHA512:
-  metadata.gz: 965132e50470d2423fce55a6f9cef44c34747585c3a46646f4ed1d546f9acfb25058bfe1cff3dcef1cd151e7ed40964f4f5f5cb55943872534c55610fc90ed1f
-  data.tar.gz: 06e4978da7ae725b69ae07e95fd92638b966c4ae3a111d5a18202739ba4bb0a9496c85f3cd4aae76041958f321d8a3337f94a5774d3df3600287677338442f76
+  metadata.gz: 799e94f77486d60beb09c8b8f5101ac5789eb1d000052a1aa396121acbd13e0a935cb06fe0c1849ef4deb75b407da049d1111bd15f0d49bd2863671419da4480
+  data.tar.gz: d513c74e0b307a74a9c7fced1bd3ce5bdaef1941290a70aef447a183e3e31da5c44582d25969cd401ec25379412fb7850d55e5e547972e87ee39e4297e79866c

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/lib/oydid/basic.rb

@@ -25,6 +25,11 @@ class Oydid
         message.to_json_c14n
     end
 
+    def self.percent_encode(did)
+        # remove "https://" from string as it is default
+        did = did.sub("https://","").sub("@", "%40").sub("http://","http%3A%2F%2F")
+    end
+
     # key management ----------------------------
     def self.generate_private_key(input, method = "ed25519-priv")
         begin
@@ -47,13 +52,21 @@ class Oydid
         return [encode([omc, length, raw_key].pack("SCa#{length}")), ""]
     end
 
-    def self.public_key(private_key)
+    def self.public_key(private_key, method = "ed25519-pub")
         code, length, digest = decode(private_key).unpack('SCa*')
         case Multicodecs[code].name
         when 'ed25519-priv'
-            public_key = Ed25519::SigningKey.new(digest).verify_key
+            case method
+            when 'ed25519-pub'
+                public_key = Ed25519::SigningKey.new(digest).verify_key
+            when 'x25519-pub'
+                public_key = RbNaCl::PrivateKey.new(digest).public_key
+            else
+                return [nil, "unsupported key codec"]
+            end
             length = public_key.to_bytes.bytesize
-            return [encode([Multicodecs['ed25519-pub'].code, length, public_key].pack("CCa#{length}")), ""]
+            return [encode([Multicodecs[method].code, length, public_key].pack("CCa#{length}")), ""]
+
         else
             return [nil, "unsupported key codec"]
         end
@@ -91,6 +104,53 @@ class Oydid
         end
     end
 
+    def self.encrypt(message, public_key)
+        begin
+            code, length, digest = decode(public_key).unpack('CCa*')
+            case Multicodecs[code].name
+            when 'x25519-pub'
+                pubKey = RbNaCl::PublicKey.new(digest)
+                authHash = RbNaCl::Hash.sha256('auth'.dup.force_encoding('ASCII-8BIT'))
+                authKey = RbNaCl::PrivateKey.new(authHash)
+                box = RbNaCl::Box.new(pubKey, authKey)
+                nonce = RbNaCl::Random.random_bytes(box.nonce_bytes)
+                msg = message.force_encoding('ASCII-8BIT')
+                cipher = box.encrypt(nonce, msg)
+                return [
+                    { 
+                        value: cipher.unpack('H*')[0], 
+                        nonce: nonce.unpack('H*')[0]
+                    }, ""
+                ]
+            else
+                return [nil, "unsupported key codec"]
+            end
+        rescue
+            return [nil, "encryption failed"]
+        end
+    end
+
+    def self.decrypt(message, private_key)
+        begin
+            cipher = [JSON.parse(message)["value"]].pack('H*')
+            nonce = [JSON.parse(message)["nonce"]].pack('H*')
+            code, length, digest = decode(private_key).unpack('SCa*')
+            case Multicodecs[code].name
+            when 'ed25519-priv'
+                privKey = RbNaCl::PrivateKey.new(digest)
+                authHash = RbNaCl::Hash.sha256('auth'.dup.force_encoding('ASCII-8BIT'))
+                authKey = RbNaCl::PrivateKey.new(authHash).public_key
+                box = RbNaCl::Box.new(authKey, privKey)
+                retVal = box.decrypt(nonce, cipher)
+                return [retVal, ""]
+            else
+                return [nil, "unsupported key codec"]
+            end
+        rescue
+            return [nil, "decryption failed"]
+        end
+    end
+
     def self.read_private_key(filename)
         begin
             f = File.open(filename)
@@ -157,6 +217,7 @@ class Oydid
 
         case doc_location
         when /^http/
+            doc_location = doc_location.sub("%3A%2F%2F","://")
             retVal = HTTParty.get(doc_location + "/doc/" + doc_hash)
             if retVal.code != 200
                 msg = retVal.parsed_response("error").to_s rescue "invalid response from " + doc_location.to_s + "/doc/" + doc_hash.to_s
@@ -190,6 +251,7 @@ class Oydid
 
         case doc_location
         when /^http/
+            doc_location = doc_location.sub("%3A%2F%2F","://")
             retVal = HTTParty.get(doc_location + "/doc_raw/" + doc_hash)
             if retVal.code != 200
                 msg = retVal.parsed_response("error").to_s rescue "invalid response from " + doc_location.to_s + "/doc/" + doc_hash.to_s

data/lib/oydid/didcomm.rb

@@ -98,4 +98,23 @@ class Oydid
             return [nil, "verification failed"]
         end
     end
+
+    # DID Auth for data container with challenge ---
+    def self.token_from_challenge(host, pwd)
+        sid = SecureRandom.hex(20).to_s
+        retVal = HTTParty.post(host + "/oydid/init",
+                    headers: { 'Content-Type' => 'application/json' },
+                    body: { "session_id": sid }.to_json )
+        challenge = retVal.parsed_response["challenge"]
+        signed_challenge = Oydid.sign(challenge, Oydid.generate_private_key(pwd).first).first
+        public_key = Oydid.public_key(Oydid.generate_private_key(pwd).first).first
+        retVal = HTTParty.post(host + "/oydid/token",
+                    headers: { 'Content-Type' => 'application/json' },
+                    body: {
+                        "session_id": sid,
+                        "signed_challenge": signed_challenge,
+                        "public_key": public_key
+                    }.to_json)
+        return retVal.parsed_response["access_token"]
+    end
 end

data/lib/oydid/log.rb

@@ -37,6 +37,7 @@ class Oydid
 
         case log_location
         when /^http/
+            log_location = log_location.sub("%3A%2F%2F","://")
             retVal = HTTParty.get(log_location + "/log/" + did_hash)
             if retVal.code != 200
                 msg = retVal.parsed_response("error").to_s rescue 

data/lib/oydid.rb

@@ -139,6 +139,11 @@ class Oydid
         return write(content, did, "update", options)
     end
 
+    def self.simulate_did(content, did, mode, options)
+        user_did, didDocument, revoc_log, l1, l2, r1, privateKey, revocationKey, did_old, log_old, msg = Oydid.generate_base(content, did, mode, options)
+        return [user_did, msg]
+    end
+    
     def self.generate_base(content, did, mode, options)
         # input validation
         did_doc = JSON.parse(content.to_json) rescue nil

metadata

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