selfsdk 0.0.156 → 0.0.161

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60b6d8b51dbc4342626614a4e46fef73108e2682a64720a6e2258660a89ef82e
-  data.tar.gz: a5c531247384f1b2f7306caea9786f113e1a19332c276e53b9c7647744f58d5b
+  metadata.gz: 6c7562e018dee44a3bb70e3f52dcc12dc2e5a5824d68e3d85e9810e1b48afb06
+  data.tar.gz: 831bc7d29fabf7e32dbde64b6fa6d9b8b8466c8e3b203d024d45d4697d96b407
 SHA512:
-  metadata.gz: 4d4627bf6291729efa8a8de5fc80f3999d9a6580f9fb76ecb07dc911be9cfa4f1c1844e0069082394c70934a1831d85b55efdf1ac619f298736216489516e0b0
-  data.tar.gz: a09427be697a2be3c1cfd745c482146ee07f428a26b5fab80d6f89fdc7fc8e6cfdcf3fb2e31084f54c3be8514ba48f49561cd452db2cb0a64f4c8fbd91df294d
+  metadata.gz: 159b597aded28279b54b8a1b1e70dd54f04603b012a0487aa7dd95db0412e8d063e5a3b0af5acfb8711f41918d33cca6038704e136fe6fb6a1ed50773df1990d
+  data.tar.gz: c3c42b8c818150bff70d43b821bf73087925a81535abceabb45f293f3ded2c8b916d4b8f7e4d34da7cde9ba4916414d943c09212358727221800e9d369e09d0f

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

@@ -57,8 +57,9 @@ module SelfSDK
         m.id = @id
         m.from = @to
         m.to = @from
+        m.sub = @to
         m.audience = @from
-        m.to_device = @messaging.device_id
+        m.to_device = @from_device
         m.from_device = @to_device
         m.facts = @facts
         m

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.156
+  version: 0.0.161
 platform: ruby
 authors:
 - Aldgate Ventures