selfsdk 0.0.164 → 0.0.169

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37a0711ed0feb251165f49fcfdce3573cb3845dea3e02263395baada7af5d0f6
-  data.tar.gz: dd281cf75f58dc8ff14e22a8e71e32b400aa78a7ea806038a33c9cb8d9bf61ac
+  metadata.gz: e525b40ab24f81c5e2ece5c34a8bdb312fae674074981ba8188d168a4c27644d
+  data.tar.gz: c97ce7cf0278006e0ef0a3fff16b5ce80f0d5564c84b0419354dc41dab35bd21
 SHA512:
-  metadata.gz: 81ce8dcd9ebdbccfd0991b0479ddba10d46806588d660a4c7ace4f76cc534d62c7c3ef3074060989504b11a7876c51e66bb5ec780ddce889d780750cc5724e85
-  data.tar.gz: 296412709b0ad51d9e4ee748d2116f07f940168aa00c7ad9494ff432fca532f81e7c996e833641c36417f94a319a82d012fa49665eb8b7f2e651b39419ba77b5
+  metadata.gz: b069aaabdcc6a10a941c7ecdff18ec69d57d6773275903b9b8f9e1192ec045d1b43d361e57e8203abffd77878b184ac43ae84a2b0cd771112124a58e4860c1d4
+  data.tar.gz: 66d71475ac439e52ab6982e676348547a90cfd3455f80a091dbf8fb7af777185fe9aff65c341fda2d0ec406cb217557fdbdaa513a6a666326128d9dfdd370965

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,8 +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? auth_id
+        if @acks[auth_id][:waiting]
+          close
+          start_connection
+        end
+        @acks.delete(auth_id)
       end
     end
 
@@ -404,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.164
+  version: 0.0.169
 platform: ruby
 authors:
 - Aldgate Ventures