selfsdk 0.0.166 → 0.0.171

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c85c6fa67915d806be363e234ac87b2bdffc6d331a48a273f48f737bb476fa6
-  data.tar.gz: fadf3e8a7df24cb74b71fc0e695f647b94510afb4092e58ca86f9aa6e0d2deaa
+  metadata.gz: 6dc6a29ff435f9b448759891a658f8ad4d93f2abf1981813ea00afbb448839d2
+  data.tar.gz: 9d6e5bb62bac11b939d5021fe5e52174e33930b667d4a3fc046070b58e62bc25
 SHA512:
-  metadata.gz: dfc07013f91c98b460991df709e4526fe86ee37d6f26818d87fe3c29c10c99ec69401d1c51a1f7ab80f1a7bad1248ce81cb7091fa469d584863d962e6c39effa
-  data.tar.gz: 7f3455f82fd7a2dec5579dd67d4a43a80ffc3fb24b35f90f7ab82bffd86d264e8760154decc7119ffc9c9fc6976669f2804f0f8222c7f52a6a0e4ebe55496cc5
+  metadata.gz: 82566b7f8beed7b293fbd3ec858969a526e570a77c093be3bfe3c7bc0535e25b9327887d673a762362c23fadd8044032903f03b4df814a8868eb4ffe029a3253
+  data.tar.gz: '096f7064f54238f411b8ec568ba83a5b1d9dd691780daa401ceb48a6c08c2c0a6346431d723d268ad0042b36b500f5c6b50fef33675e1d840473e866653ac81b'

data/lib/crypto.rb

@@ -24,7 +24,8 @@ module SelfSDK
         keys = @account.otk['curve25519'].map{|k,v| {id: k, key: v}}.to_json
 
         # 1b-iv) post those keys to POST /v1/identities/<selfid>/devices/1/pre_keys/
-        @client.post("/v1/apps/#{@client.jwt.id}/devices/#{@device}/pre_keys", keys)
+        res = @client.post("/v1/apps/#{@client.jwt.id}/devices/#{@device}/pre_keys", keys)
+        raise 'unable to push prekeys, please try in a few minutes' if res.code != 200
 
         # 1b-v) store the account to a file
         File.write(account_path, @account.to_pickle(storage_key))
@@ -89,6 +90,27 @@ 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) remove the session's prekey from the account
+        @account.remove_one_time_keys(session_with_bob)
+
+        current_one_time_keys = @account.otk['curve25519']
+
+        # 7b-iv) if the number of remaining prekeys is below a certain threshold, publish new keys
+        if current_one_time_keys.length < 10
+          @account.gen_otk(100)
+
+          keys = Array.new
+
+          @account.otk['curve25519'].each do |k,v|
+            keys.push({id: k, key: v}) if current_one_time_keys[k].nil?
+          end
+
+          res = @client.post("/v1/apps/#{@client.jwt.id}/devices/#{@device}/pre_keys", keys.to_json)
+          raise 'unable to push prekeys, please try in a few minutes' if res.code != 200
+        end
+
+        File.write(account_path, @account.to_pickle(@storage_key))
       end
 
       # 8) create a group session and set the identity of the account you're using

data/lib/messaging.rb

@@ -43,6 +43,7 @@ module SelfSDK
       @client = client
       @ack_timeout = 60 # seconds
       @timeout = 120 # seconds
+      @auth_id = SecureRandom.uuid
       @device_id = options.fetch(:device_id, DEFAULT_DEVICE)
       @auto_reconnect = options.fetch(:auto_reconnect, DEFAULT_AUTO_RECONNECT)
       @raw_storage_dir = options.fetch(:storage_dir, DEFAULT_STORAGE_DIR)
@@ -264,8 +265,10 @@ module SelfSDK
     # Start sthe websocket listener
     def start
       SelfSDK.logger.info "starting"
+      auth_id = @auth_id.dup
+
       @mon.synchronize do
-        @acks["authentication"] = { waiting_cond: @mon.new_cond,
+        @acks[auth_id] = { waiting_cond: @mon.new_cond,
                                     waiting: true,
                                     timeout: SelfSDK::Time.now + @ack_timeout }
       end
@@ -283,16 +286,16 @@ module SelfSDK
       end
 
       @mon.synchronize do
-        @acks["authentication"][:waiting_cond].wait_while { @acks["authentication"][:waiting] }
-        @acks.delete("authentication")
+        @acks[auth_id][:waiting_cond].wait_while { @acks[auth_id][:waiting] }
+        @acks.delete(auth_id)
       end
       # In case this does not succeed start the process again.
-      if @acks.include? 'authentication'
-        if @acks['authentication'][:waiting]
+      if @acks.include? auth_id
+        if @acks[auth_id][:waiting]
           close
           start_connection
         end
-        @acks.delete("authentication")
+        @acks.delete(auth_id)
       end
     end
 
@@ -412,14 +415,18 @@ module SelfSDK
 
     # Authenticates current client on the websocket server.
     def authenticate
+      @auth_id = SecureRandom.uuid if @auth_id.nil?
+
       SelfSDK.logger.info "authenticating"
       send_raw Msgproto::Auth.new(
         type: Msgproto::MsgType::AUTH,
-        id: "authentication",
+        id: @auth_id,
         token: @jwt.auth_token,
         device: @device_id,
         offset: @offset,
       )
+      
+      @auth_id = nil
     end
 
     def send_raw(msg)

data/lib/signature_graph.rb

@@ -261,7 +261,7 @@ module SelfSDK
 
       sk = @keys[operation.signing_key]
 
-      raise "operation specifies a signing key that does not exist" if k.nil?
+      raise "operation specifies a signing key that does not exist" if sk.nil?
 
       # if this is an account recovery, nuke all existing keys
       if sk.type == KEY_TYPE_RECOVERY

metadata

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