selfsdk 0.0.157 → 0.0.162

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 591ba1fdd4152ea5346667256345644f78ddcc5307426f59d90bc2a7ac61cdcc
-  data.tar.gz: 3e565f40abf9e8df6fdde236ba92bc65f780cbcc7554fc26316cc52b54dc2d69
+  metadata.gz: c7b7b3b844225f5fc4419a53bf28aa028e44c264a4ec3b298c269daaea4b05c5
+  data.tar.gz: 64c35eac74be284ab020e2412c27a338f856174e5d154c59dcab0e4625a65276
 SHA512:
-  metadata.gz: 231048c700a31b8e0664a20b4afb212fd5f4b3da8cc91b02b18296153cd6e0d5c137d902f95133b32bf288bae815598270c0f0caf1271f791e34b9f4de79a115
-  data.tar.gz: c44c480f4c5181e11c310345a8c81f99b17867877760edf927ab6bdcf3dc46805487533febca0e5f4208615c9a65fac463ee48ec73a02764bda52be2749e54f8
+  metadata.gz: 1dd9537fd6aa8021b8a2a5d5d3587fc447bd3a389460c5b4ea996f429a91b4a965cdb577673109f69514eb8056963c7f972a6e440edc764c06fbe5934ff9cc7b
+  data.tar.gz: d2cf23e278279d99cef701b0f74f8c31a6ed3ce4f1a44b87a8b648b8fb9e9029b84812431b53a4f7b4e2abf234a977cd7e59b57a1e53532e9ab0bc2f8230e2b3

data/lib/crypto.rb

@@ -8,7 +8,7 @@ module SelfSDK
       @client = client
       @device = device
       @storage_key = storage_key
-      @storage_folder = storage_folder
+      @storage_folder = "#{storage_folder}/#{@client.jwt.key_id}"
 
       if File.exist?(account_path)
         # 1a) if alice's account file exists load the pickle from the file
@@ -112,7 +112,7 @@ module SelfSDK
       "#{@storage_folder}/account.pickle"
     end
 
-    def session_path(selfid, device)
+    def session_path(selfid, device)      
       "#{@storage_folder}/#{selfid}:#{device}-session.pickle"
     end
   end

data/lib/messages/fact_request.rb

@@ -57,6 +57,7 @@ module SelfSDK
         m.id = @id
         m.from = @to
         m.to = @from
+        m.sub = @to
         m.audience = @from
         m.to_device = @messaging.device_id
         m.from_device = @to_device

data/lib/messages/fact_response.rb

@@ -60,15 +60,13 @@ module SelfSDK
         end
       end
 
-      protected
-
-      def proto(to_device)
+      def body
         encoded_facts = []
         @facts.each do |fact|
           encoded_facts.push(fact.to_hash)
         end
-        body = @jwt.prepare(
-          typ: MSG_TYPE,
+        
+        { typ: MSG_TYPE,
           iss: @jwt.id,
           sub: @sub || @to,
           aud: @audience,
@@ -77,15 +75,20 @@ module SelfSDK
           cid: @id,
           jti: SecureRandom.uuid,
           status: @status,
-          facts: encoded_facts,
-        )
+          facts: encoded_facts }        
+      end
+
+      protected
+
+      def proto(to_device)
+
 
         Msgproto::Message.new(
           type: Msgproto::MsgType::MSG,
           id: SecureRandom.uuid,
           sender: "#{@jwt.id}:#{@messaging.device_id}",
           recipient: "#{@to}:#{@to_device}",
-          ciphertext: encrypt_message(body, @to, @to_device)
+          ciphertext: encrypt_message(@jwt.prepare(body), @to, @to_device)
         )
       end
     end

data/lib/messaging.rb

@@ -45,13 +45,17 @@ module SelfSDK
       @timeout = 120 # seconds
       @device_id = options.fetch(:device_id, DEFAULT_DEVICE)
       @auto_reconnect = options.fetch(:auto_reconnect, DEFAULT_AUTO_RECONNECT)
-      @storage_dir = options.fetch(:storage_dir, DEFAULT_STORAGE_DIR)
+      @raw_storage_dir = options.fetch(:storage_dir, DEFAULT_STORAGE_DIR)
+      @storage_dir = "#{@raw_storage_dir}/apps/#{@jwt.id}/devices/#{@device_id}"
+      FileUtils.mkdir_p @storage_dir unless File.exist? @storage_dir
       @offset_file = "#{@storage_dir}/#{@jwt.id}:#{@device_id}.offset"
       @offset = read_offset
+      migrate_old_storage_format
 
-      FileUtils.mkdir_p @storage_dir unless File.exist? @storage_dir
       unless options.include? :no_crypto
-        @encryption_client = Crypto.new(@client, @device_id, @storage_dir, storage_key)
+        crypto_path = "#{@storage_dir}/keys"
+        FileUtils.mkdir_p crypto_path unless File.exist? crypto_path
+        @encryption_client = Crypto.new(@client, @device_id, crypto_path, storage_key)
       end
 
       if options.include? :ws
@@ -439,15 +443,36 @@ module SelfSDK
       return 0 unless File.exist? @offset_file
 
       File.open(@offset_file, 'rb') do |f|
-        return f.read.unpack('q')[0]
+        return f.read.to_i
       end
     end
 
     def write_offset(offset)
       File.open(@offset_file, 'wb') do |f|
         f.flock(File::LOCK_EX)
-        f.write([offset].pack('q'))
+        f.write(offset.to_s.rjust(19, "0"))
+      end
+    end
+
+    def migrate_old_storage_format
+      # Move the offset file
+      old_offset_file = "#{@raw_storage_dir}/#{@jwt.id}:#{@device_id}.offset"
+      if File.file?(old_offset_file)
+        File.open(old_offset_file, 'rb') do |f|
+          offset = f.read.unpack('q')[0]
+          write_offset(offset)
+        end
+        File.delete(old_offset_file)
+      end
+      
+      # Move all pickle files
+      crypto_path = "#{@storage_dir}/keys/#{@jwt.key_id}"
+      FileUtils.mkdir_p crypto_path unless File.exist? crypto_path
+      Dir[File.join(@raw_storage_dir, "*.pickle")].each do |file|
+        filename = File.basename(file, ".pickle")
+        File.rename file, "#{crypto_path}/#{filename}.pickle"
       end
+        
     end
   end
 end

metadata

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