selfsdk 0.0.138 → 0.0.143

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9cbb2bad8f28cb417c2df600279bed7de2730b4391a735574a953e15da32eb0
-  data.tar.gz: caee509d09748376b2185de51e73e4cdc78b1790a2de323f90babcf94b2df1f3
+  metadata.gz: d317a3c78c03af0c8882cf280a3811060d97b5fbfa1dd6c2261bfe8c1246d209
+  data.tar.gz: e346b04c24246db81a29f4d366d4af858f3936961396a5459ce6ebc446bfa468
 SHA512:
-  metadata.gz: 63b33c646f77f9f07e365e2c33f840eef746b7e7f564833a4598755d36da7f698cb8a01c24158a82de8477e3861a82ce5dea588a4bf2d0ba7ff92addb101601f
-  data.tar.gz: d858ae95e76994ac51a2622f141a8b8bd47eeaebca0ed55842ae6fa4bd025debaeb557b51201fd63755da9425341c5c85737b551718b21ad61b4860199d6a40c
+  metadata.gz: 6bd2d793deae3a91747ded4371d99a54f35979c494993be3cdb3514aef520f7b83354852d932c4ecf057cb6a08c3cf9502ab974d820d0b9ae87ba13eb6bd337b
+  data.tar.gz: be302ede9fb1498e2b9572bbb7ff6b4ff2a4fce9dfb326f223462869e3956319b8582a925f299beed23c0937ff85f23077edcaac7c4e0240644e695a3265976d

data/lib/client.rb

@@ -66,19 +66,31 @@ module SelfSDK
     end
 
     def post(endpoint, body)
-      p HTTParty.post("#{@self_url}#{endpoint}",
-                    headers: {
-                        'Content-Type' => 'application/json',
-                        'Authorization' => "Bearer #{@jwt.auth_token}"
-                    },
-                    body: body)
+      res = nil
+      loop do
+        res = HTTParty.post("#{@self_url}#{endpoint}",
+                      headers: {
+                          'Content-Type' => 'application/json',
+                          'Authorization' => "Bearer #{@jwt.auth_token}"
+                      },
+                      body: body)
+        break if res.code != 503
+        sleep 2
+      end
+      return res
     end
 
     def get(endpoint)
-      HTTParty.get("#{@self_url}#{endpoint}", headers: {
+      res = nil
+      loop do
+        res = HTTParty.get("#{@self_url}#{endpoint}", headers: {
           'Content-Type' => 'application/json',
           'Authorization' => "Bearer #{@jwt.auth_token}"
-      })
+        })
+        break if res.code != 503
+        sleep 2
+      end
+      return res
     end
 
     # Lists all public keys stored on self for the given ID
@@ -90,6 +102,15 @@ module SelfSDK
       sg.key_by_id(kid)
     end
 
+    # Get the active public key for a device
+    #
+    # @param id [string] identity id
+    def device_public_key(id, did)
+      i = entity(id)
+      sg = SelfSDK::SignatureGraph.new(i[:history])
+      sg.key_by_device(did)
+    end
+
     private
 
     def get_identity(endpoint)

data/lib/crypto.rb

@@ -8,9 +8,9 @@ module SelfSDK
       @storage_key = storage_key
       @storage_folder = storage_folder
 
-      if File.exist?('account.pickle')
+      if File.exist?(account_path)
         # 1a) if alice's account file exists load the pickle from the file
-        @account = SelfCrypto::Account.from_pickle(File.read('account.pickle'), @storage_key)
+        @account = SelfCrypto::Account.from_pickle(File.read(account_path), @storage_key)
       else
         # 1b-i) if create a new account for alice if one doesn't exist already
         @account = SelfCrypto::Account.from_seed(@client.jwt.key)
@@ -25,12 +25,12 @@ module SelfSDK
         @client.post("/v1/apps/#{@client.jwt.id}/devices/#{@device}/pre_keys", keys)
 
         # 1b-v) store the account to a file
-        File.write('account.pickle', @account.to_pickle(storage_key))
+        File.write(account_path, @account.to_pickle(storage_key))
       end
     end
 
     def encrypt(message, recipient, recipient_device)
-      session_file_name = "#{recipient}:#{recipient_device}-session.pickle"
+      session_file_name = session_path(recipient, recipient_device)
 
       if File.exist?(session_file_name)
         # 2a) if bob's session file exists load the pickle from the file
@@ -38,7 +38,7 @@ module SelfSDK
       else
         # 2b-i) if you have not previously sent or recevied a message to/from bob,
         #       you must get his identity key from GET /v1/identities/bob/
-        ed25519_identity_key = @client.public_keys(recipient).first[:key]
+        ed25519_identity_key = @client.device_public_key(recipient, recipient_device)
 
         # 2b-ii) get a one time key for bob
         res = @client.get("/v1/identities/#{recipient}/devices/#{recipient_device}/pre_keys")
@@ -51,13 +51,10 @@ module SelfSDK
         one_time_key = JSON.parse(res.body)["key"]
 
         # 2b-iii) convert bobs ed25519 identity key to a curve25519 key
-        curve25519_identity_key = SelfCrypto::Util.ed25519_pk_to_curve25519(ed25519_identity_key)
+        curve25519_identity_key = SelfCrypto::Util.ed25519_pk_to_curve25519(ed25519_identity_key.raw_public_key)
 
         # 2b-iv) create the session with bob
         session_with_bob = @account.outbound_session(curve25519_identity_key, one_time_key)
-
-        # 2b-v) store the session to a file
-        File.write(session_file_name, session_with_bob.to_pickle(@storage_key))
       end
 
       # 3) create a group session and set the identity of the account youre using
@@ -67,11 +64,16 @@ module SelfSDK
       gs.add_participant("#{recipient}:#{recipient_device}", session_with_bob)
 
       # 5) encrypt a message
-      gs.encrypt(message).to_s
+      ct = gs.encrypt(message).to_s
+
+      # 6) store the session to a file
+      File.write(session_file_name, session_with_bob.to_pickle(@storage_key))
+
+      ct
     end
 
     def decrypt(message, sender, sender_device)
-      session_file_name = "#{sender}:#{sender_device}-session.pickle"
+      session_file_name = session_path(sender, sender_device)
 
       if File.exist?(session_file_name)
         # 7a) if carol's session file exists load the pickle from the file
@@ -84,9 +86,6 @@ module SelfSDK
 
         # 7b-ii) use the initial message to create a session for bob or carol
         session_with_bob = @account.inbound_session(m)
-
-        # 7b-iii) store the session to a file
-        File.write(session_file_name, session_with_bob.to_pickle(@storage_key))
       end
 
       # 8) create a group session and set the identity of the account you're using
@@ -96,7 +95,22 @@ module SelfSDK
       gs.add_participant("#{sender}:#{sender_device}", session_with_bob)
 
       # 10) decrypt the message ciphertext
-      gs.decrypt("#{sender}:#{sender_device}", message).to_s
+      pt = gs.decrypt("#{sender}:#{sender_device}", message).to_s
+
+      # 11) store the session to a file
+      File.write(session_file_name, session_with_bob.to_pickle(@storage_key))
+
+      pt
+    end
+
+    private
+
+    def account_path
+      "#{@storage_folder}/account.pickle"
+    end
+
+    def session_path(selfid, device)
+      "#{@storage_folder}/#{selfid}:#{device}-session.pickle"
     end
   end
 end

data/lib/messages/message.rb

@@ -11,7 +11,7 @@ module SelfSDK
       body = if input.is_a? String
                input
              else
-               issuer = input.recipient.split(":")
+               issuer = input.sender.split(":")
                messaging.encryption_client.decrypt(input.ciphertext, issuer.first, issuer.last)
              end
 

data/lib/messaging.rb

@@ -30,7 +30,7 @@ module SelfSDK
     # @params storage_folder [String] folder to perist messaging encryption
     # @option opts [Bool] :auto_reconnect Automatically reconnects to websocket if connection is lost (defaults to true).
     # @option opts [String] :device_id The device id to be used by the app defaults to "1".
-    def initialize(url, client, storage_key, storage_folder, options = {})
+    def initialize(url, client, storage_key, options = {})
       @mon = Monitor.new
       @url = url
       @messages = {}
@@ -49,7 +49,7 @@ module SelfSDK
 
       FileUtils.mkdir_p @storage_dir unless File.exist? @storage_dir
       unless options.include? :no_crypto
-        @encryption_client = Crypto.new(@client, @device_id, storage_folder, storage_key)
+        @encryption_client = Crypto.new(@client, @device_id, @storage_dir, storage_key)
       end
 
       if options.include? :ws

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selfsdk
 version: !ruby/object:Gem::Version
-  version: 0.0.138
+  version: 0.0.143
 platform: ruby
 authors:
 - Aldgate Ventures