ruby_home 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5c2472175346b490fafbd175e114227a9796e4304c472d5c3e5f4eb8734c76a
-  data.tar.gz: 6930dac62338255403695f5369397daa26fd0c7853d9ab2784a7de084f092655
+  metadata.gz: 8a06fe406af9a2d18a8cd3083e97dd84d10cf6ccc447ff3d46527ea5882c22d1
+  data.tar.gz: 3893723e9f2ccf60561bc831a680b715f7216f32c1783bbc3b01bd290212d95a
 SHA512:
-  metadata.gz: 18ebd83f029b7a1545d2f28331ca38be78ffe5a392026e598b93732b936dc5712b43e7b7b1c24088864709cc4fa45d6189bf3c9793220303d02b1fb86c336079
-  data.tar.gz: cd1227d1e26ef5dd91c6fc91c1ce526cc8b8e257916161a8cc72814e68f5be522b33bdd8f4db3d46a5511ce98534261917c640dfe75e6cc9e23df2cc19efe391
+  metadata.gz: 613563189aaf7dedf4361b8bc8f3a59ed6b98527976c309ccd40ffafc6717cebfd1eb97d792507eddc751b151aaa5c1f047317038475e4a63c96c94da8012a7e
+  data.tar.gz: ac7e43d2580b305a97d8b1354b940cb909cd2a4763bcf629898cb2a59cc817c53b049bd4745c597a80aa84a8072e3157583f1ee9975a4e542b00cb5c37d92d72

data/lib/ruby_home/http/controllers/application_controller.rb

@@ -40,7 +40,7 @@ module RubyHome
       def tlv(object)
         logger.debug "Response"
         logger.debug object.inspect
-        HAP::TLV.encode(object)
+        TLV.encode(object)
       end
 
       def logger
@@ -65,7 +65,7 @@ module RubyHome
       end
 
       def _unpack_request
-        HAP::TLV.read(request_body).tap do |request_tlv|
+        TLV.decode(request_body).tap do |request_tlv|
           logger.debug "Request"
           logger.debug request_tlv.inspect
         end

data/lib/ruby_home/http/controllers/pair_setups_controller.rb

@@ -60,7 +60,7 @@ module RubyHome
 
         nonce = HexHelper.pad('PS-Msg05')
         decrypted_data = chacha20poly1305ietf.decrypt(nonce, encrypted_data)
-        unpacked_decrypted_data = HAP::TLV.read(decrypted_data)
+        unpacked_decrypted_data = TLV.decode(decrypted_data)
 
         iosdevicepairingid = unpacked_decrypted_data[:identifier]
         iosdevicesignature = unpacked_decrypted_data[:signature]

data/lib/ruby_home/http/controllers/pair_verifies_controller.rb

@@ -53,7 +53,7 @@ module RubyHome
         chacha20poly1305ietf = HAP::Crypto::ChaCha20Poly1305.new(session.session_key)
         nonce = HexHelper.pad('PV-Msg03')
         decrypted_data = chacha20poly1305ietf.decrypt(nonce, encrypted_data)
-        unpacked_decrypted_data = HAP::TLV.read(decrypted_data)
+        unpacked_decrypted_data = TLV.decode(decrypted_data)
 
         if accessory_info.paired_clients.any? {|h| h[:identifier] == unpacked_decrypted_data[:identifier]}
           shared_secret = HAP::Crypto::SessionKey.new(session.shared_secret)

data/lib/ruby_home/version.rb

@@ -1,3 +1,3 @@
 module RubyHome
-  VERSION = '0.1.22'
+  VERSION = '0.1.23'
 end

data/lib/ruby_home.rb

@@ -6,7 +6,8 @@ require 'nio'
 require 'oj'
 require 'rack'
 require 'rbnacl'
-require 'ruby_home-srp'
+require 'ruby_home/srp'
+require 'ruby_home/tlv'
 require 'securerandom'
 require 'sinatra/base'
 require 'socket'

data/rubyhome.gemspec

@@ -33,7 +33,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'nio4r', '~> 2.3', '>= 2.3.1'
   spec.add_dependency 'oj', '3.7.9'
   spec.add_dependency 'rbnacl', '~> 6.0'
-  spec.add_dependency 'ruby_home-srp', '~> 1.2'
+  spec.add_dependency 'ruby_home-srp', '~> 1.3'
+  spec.add_dependency 'ruby_home-tlv', '~> 0.1.0'
   spec.add_dependency 'sinatra', '2.0.5'
   spec.add_dependency 'wisper', '~> 2.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_home
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - Karl Entwistle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2019-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -126,14 +126,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: ruby_home-tlv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -283,7 +297,6 @@ files:
 - lib/ruby_home/hap/hap_response.rb
 - lib/ruby_home/hap/server.rb
 - lib/ruby_home/hap/session.rb
-- lib/ruby_home/hap/tlv.rb
 - lib/ruby_home/hap/values/base_value.rb
 - lib/ruby_home/hap/values/bool_value.rb
 - lib/ruby_home/hap/values/float_value.rb

data/lib/ruby_home/hap/tlv.rb

@@ -1,102 +0,0 @@
-module RubyHome
-  module HAP
-    module TLV
-      ERROR_TYPES = {
-        unknown: 1,
-        authentication: 2,
-        backoff: 3,
-        max_peers: 4,
-        max_tries: 5,
-        unavailable: 6,
-        busy: 7,
-      }.freeze
-      TYPE_ERRORS = ERROR_TYPES.invert.freeze
-
-      NAME_TYPES = {
-        method: 0,
-        identifier: 1,
-        salt: 2,
-        public_key: 3,
-        proof: 4,
-        encrypted_data: 5,
-        state: 6,
-        error: 7,
-        retry_delay: 8,
-        certificate: 9,
-        signature: 10,
-        permissions: 11,
-        fragment_data: 12,
-        fragment_last: 13,
-      }.freeze
-      TYPE_NAMES = NAME_TYPES.invert.freeze
-
-      class Bytes < BinData::String; end
-
-      class UTF8String < BinData::String
-        def snapshot
-          super.force_encoding('UTF-8')
-        end
-      end
-
-      class Payload < BinData::Choice
-        bytes :default, read_length: :len
-
-        uint8       0,  read_length: :len
-        utf8_string 1,  read_length: :len
-        bytes       2,  read_length: :len
-        bytes       3,  read_length: :len
-        bytes       4,  read_length: :len
-        bytes       5,  read_length: :len
-        uint8       6,  read_length: :len
-        uint8       7,  read_length: :len
-        uint8       8,  read_length: :len
-        bytes       9,  read_length: :len
-        bytes      10,  read_length: :len
-        uint8      11,  read_length: :len
-        bytes      12,  read_length: :len
-        bytes      13,  read_length: :len
-      end
-
-      class TLV < BinData::Record
-        uint8 :type_id, read_length: 2
-        uint8 :len, read_length: 2
-        payload :val, selection: :type_id
-      end
-
-      READER = BinData::Array.new(type: :tlv, read_until: :eof)
-
-      def self.read(input)
-        READER.clear
-        READER.read(input)
-        READER.snapshot.each_with_object({}) do |(hash), memo|
-          type = TYPE_NAMES[hash[:type_id]]
-          next unless type
-
-          if memo[type]
-            memo[type] << hash[:val]
-          else
-            memo[type] = hash[:val]
-          end
-        end
-      end
-
-      def self.encode(hash)
-        hash.to_hash.each_with_object(String.new) do |(key, value), memo|
-          type_id = NAME_TYPES[key]
-          next unless type_id
-
-          if value.is_a?(String)
-            value.scan(/.{1,255}/m)
-          else
-            [value]
-          end.each do |frame_value|
-            tlv = TLV.new(type_id: type_id, val: frame_value).tap do |tlv|
-              tlv.len = tlv.val.to_binary_s.length
-            end
-            memo << tlv.to_binary_s
-          end
-        end
-      end
-    end
-  end
-end