selfsdk 0.0.154 → 0.0.159

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9e87bb2c6abcae64f987ed167eed801384f03438e19c86ee63de4389987f8d1
-  data.tar.gz: 60fa41e66065e09de0c6af1adf28ebb3819a10f5baec8669d42ec518283cec2a
+  metadata.gz: 1a1de83ae25387f6180432dd419f36568956a458bdbfd5df988ea9292588e50a
+  data.tar.gz: 55717411b03f983659ee503493a233d3ceea14f35fd991eec9494a6bc01fe9b2
 SHA512:
-  metadata.gz: 36d038fcbd3abc25a4e40715ec1086b30feadc64fa66989000245a7997e277dce59a6358d70fa55b4646dba6267b080f03d72ef5f07b8852dac8a0ddab249242
-  data.tar.gz: 4998fc609b7a11761868fcca577f974be805ca6aa45abcd70e8b6baa3cf8f4488099871877487d332fdce213fe490344aa5082dd543c05f21a67aa1278e62459
+  metadata.gz: 291ba0d883273e9aa94eb61aa936014a1fd4a6031c9e921d0affc5da4064c39a4cc5b073bb68823ae73d53a33c2808f9cb4921eeac0e043308715d8eb37b9239
+  data.tar.gz: d73be5eb6086614300de7469026715881b640ea51fd9e9e5d8054a7b9c387b9d67f3cb21e72f358ff899833176bf9bb38962832405dd68461fc489e8d217d345

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/attestation.rb

@@ -2,6 +2,8 @@
 
 # frozen_string_literal: true
 
+require_relative '../ntptime'
+
 module SelfSDK
   module Messages
     class Attestation
@@ -42,6 +44,7 @@ module SelfSDK
         o = {
             sub: @to,
             iss: @origin,
+            iat: SelfSDK::Time.now.strftime('%FT%TZ'),
             source: @source,
             fact: @fact_name,
             expected_value: @expected_value,

data/lib/messages/fact_request.rb

@@ -59,6 +59,7 @@ module SelfSDK
         m.to = @from
         m.audience = @from
         m.to_device = @messaging.device_id
+        m.from_device = @to_device
         m.facts = @facts
         m
       end

data/lib/messages/fact_response.rb

@@ -85,7 +85,7 @@ module SelfSDK
           id: SecureRandom.uuid,
           sender: "#{@jwt.id}:#{@messaging.device_id}",
           recipient: "#{@to}:#{@to_device}",
-          ciphertext: body,
+          ciphertext: encrypt_message(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.154
+  version: 0.0.159
 platform: ruby
 authors:
 - Aldgate Ventures