selfsdk 0.0.137 → 0.0.142

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4b5f44ffce4a1ad4c61c20b752e97173f2cc0c96091138683ddb56c2dca2f73
-  data.tar.gz: 841ad78f32bcb7434126eac7bdea3e3eb9d7abf4cc35fd41d0d243fa7f05fffa
+  metadata.gz: b831656c278b883faa5a7831e39965964e87a7b2739257954ac29154d0374923
+  data.tar.gz: ed0231cd3e9fdd9525fa08a4119a3aee26e3146d2ed65c18b09c540c542ebce4
 SHA512:
-  metadata.gz: 04f00c82b5f64dc8f23597e28fc11eee64db02deacfbeedb328d3f766048e40d3a625c3ae25b7a5a888969272883650e63ce9425d5056f2ed98f5beae1712987
-  data.tar.gz: 2dfa4e9f4e3796393adfda66d994ef39fa2de8f37b08b2274b4fcdaa1ccd752e7aafdec5f7eb80b1b4f336ecaeb74350a42464c785c5026eb82e8ffd3458761f
+  metadata.gz: 745da1e65693ecb6e3e4946d799104cab2365e54af7faf3dfa1c0996825453e98507c4e536bc3c2690a67601e2bc565590ca71529ba53999fe6340cb48e79b8c
+  data.tar.gz: 0225bdfb29c5efbeb1501b7dcf144cbd09e87ab81d68c8b44a8ec5daa8cf4f08a2f24b7c1b59c356dde50cb696d1be17b02eb605ee5080ad033c6f06881c0aaf

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

data/lib/services/auth.rb

@@ -39,13 +39,16 @@ module SelfSDK
       #  @return [String, String] conversation id or encoded body.
       def request(selfid, opts = {}, &block)
         SelfSDK.logger.info "authenticating #{selfid}"
-        raise "You're not permitting connections from #{selfid}" unless @messaging_service.is_permitted?(selfid)
+        rq = opts.fetch(:request, true)
+        if rq
+          raise "You're not permitting connections from #{selfid}" unless @messaging_service.is_permitted?(selfid)
+        end
 
         req = SelfSDK::Messages::AuthenticationReq.new(@messaging)
         req.populate(selfid, opts)
 
         body = @client.jwt.prepare(req.body)
-        return body unless opts.fetch(:request, true)
+        return body unless rq
         return req.send_message if opts.fetch(:async, false)
 
         # when a block is given the request will always be asynchronous.

data/lib/services/facts.rb

@@ -41,13 +41,16 @@ module SelfSDK
       #  @return [Object] SelfSDK:::Messages::FactRequest
       def request(selfid, facts, opts = {}, &block)
         SelfSDK.logger.info "authenticating #{selfid}"
-        raise "You're not permitting connections from #{selfid}" unless @messaging_service.is_permitted?(selfid)
+        rq = opts.fetch(:request, true)
+        if rq
+          raise "You're not permitting connections from #{selfid}" unless @messaging_service.is_permitted?(selfid)
+        end
 
         req = SelfSDK::Messages::FactRequest.new(@messaging)
         req.populate(selfid, prepare_facts(facts), opts)
 
         body = @client.jwt.prepare(req.body)
-        return body unless opts.fetch(:request, true)
+        return body unless rq
 
         # when a block is given the request will always be asynchronous.
         if block_given?

metadata

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