ruby_home 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ccc3aa90b30716b6e6d39417f7c1bef28d9f46c9eede93dde811436d2ddfb8e
-  data.tar.gz: ad86b1dbbb0744be8eb76d82da287a9d2ee13d1e43d3bb5f137669fe3c865c82
+  metadata.gz: cc7188fc5cc51dd567a013d39cff0c8693474aeb6ae70861defaae3a72556334
+  data.tar.gz: e309c541c56c9ef4fde63a3559cb2148a264c32fcbda7bcc685b9d499382c942
 SHA512:
-  metadata.gz: 03c859f3cd8129b26576402d2ecc8d3fff54adb7fcce812e36a910bec254d8c26e6f1192b570889ed6c7462f83f2a7a3a7e9f616e4941be0b82fb7af688e0ed0
-  data.tar.gz: ea4e4033a81221b8f798a8adb50a3e625b405d1136f43c690834f53af9a07cdf36eb8269241a1a69397b68fe3ca4f8dbf1673c3e0ffd750420686bdb61ace4dd
+  metadata.gz: 0db967bfe7d94e2b5158fb5345711312c40aba7bf396d6e8ec8215ddc2e222bf757353e0c551fc927e55b0f022c8d16bd74762562b864e4a1905bc767d7a05b2
+  data.tar.gz: eec3bff1b8067acd972b146081df4a0b29f469f6353b3965de3634e2e1efa7486d6f25623004ab295c1702d36fad69bef5a3a4913c7960e1f38d77f15eb1bd5b

data/.travis.yml

@@ -1,21 +1,20 @@
-language: ruby
 cache: bundler
-
-before_install:
-  - sudo apt-get -qq update
-  - sudo apt-get install -y libavahi-compat-libdnssd-dev
-  - gem update --system
-  - gem --version
-  - gem install bundler -v 1.16.1
-  - bundle --version
+language: ruby
+install:
+  - 'gem update --system'
+  - 'gem --version'
+  - 'gem install bundler -v 1.16.1'
+  - 'bundle --version'
   - bundle
-
 rvm:
   - 2.5.0
   - ruby-head
-
-matrix:
-  fast_finish: true
-
+os:
+  - linux
+  - osx
+addons:
+  apt:
+    packages:
+      - libavahi-compat-libdnssd-dev
 notifications:
   email: false

data/README.md

@@ -39,7 +39,7 @@ fan.characteristic(:on).on(:updated) do |new_value|
   end
 end
 
-RubyHome::Broadcast.run
+RubyHome.run
 ```
 
 ## Development

data/bin/rubyhome

@@ -13,4 +13,4 @@ fan.characteristic(:on).on(:updated) do |new_value|
   end
 end
 
-RubyHome::Broadcast.run
+RubyHome.run

data/lib/ruby_home/accessory_info.rb

@@ -1,99 +1,60 @@
-require 'ed25519'
-require 'yaml/store'
 require_relative 'device_id'
+require_relative 'yaml_record'
 
 module RubyHome
-  class AccessoryInfo
-    PERSISTABLE = [ :device_id, :paired_clients, :password, :signature_key, :username ].freeze
+  class AccessoryInfo < YamlRecord::Base
+    USERNAME = -'Pair-Setup'
 
-    def initialize(store)
-      @store = store
+    properties :device_id, :paired_clients, :password, :signature_key
+    source 'accessory_info.yml'
 
-      read
+    set_callback :before_create, :set_device_id
+    set_callback :before_create, :set_paired_clients
+    set_callback :before_create, :set_password
+    set_callback :before_create, :set_signature_key
 
-      @device_id ||= DeviceID.generate
-      @paired_clients ||= []
-      @signature_key ||= Ed25519::SigningKey.generate.to_bytes.unpack1('H*')
+    def self.instance
+      first || create
     end
 
-    attr_reader :store
-    attr_reader :device_id, :signature_key, :paired_clients, :password, :username
-    attr_writer :device_id, :paired_clients, :password, :username
-
-    def signature_key=(signature_key)
-      @signing_key = nil
-      @signature_key = signature_key
+    def add_paired_client(admin: false, identifier: , public_key: )
+      paired_clients << { admin: admin, identifier: identifier, public_key: public_key }
+      save
     end
 
-    def signing_key
-      @signing_key ||= Ed25519::SigningKey.new([signature_key].pack('H*'))
+    def remove_paired_client(identifier)
+      paired_clients.delete_if { |h| h[:identifier] == identifier }
+      save
     end
 
-    def username
-      'Pair-Setup'
+    def paired?
+      paired_clients.any?
     end
 
-    def password
-      '031-45-154'
+    def signing_key
+      @signing_key ||= RbNaCl::Signatures::Ed25519::SigningKey.new([signature_key].pack('H*'))
     end
 
-    def to_hash
-      Hash[*PERSISTABLE.flat_map { |attribute| [attribute, send(attribute)] }]
+    def username
+      USERNAME
     end
 
-    def read
-      store.transaction(true) do
-        store.fetch(:accessory_info, {}).each do |key, value|
-          send("#{key}=", value)
-        end
-      end
-    end
+    private
 
-    def save
-      store.transaction do
-        store[:accessory_info] = to_hash
-      end
+    def set_device_id
+      self.device_id ||= DeviceID.generate
     end
 
-    def self.pstore=(new_storage)
-      @@accessory_info = AccessoryInfo.new(new_storage)
+    def set_paired_clients
+      self.paired_clients = []
     end
 
-    @@accessory_info = AccessoryInfo.new(YAML::Store.new 'accessory_info.yml')
-
-    class << self
-      PERSISTABLE.each do |attribute|
-        define_method("#{attribute}=") do |value, save=true|
-          @@accessory_info.send("#{attribute}=", value)
-          save
-        end
-
-        define_method(attribute) do
-          @@accessory_info.send(attribute)
-        end
-      end
-
-      def save
-        @@accessory_info.save
-      end
-
-      def signing_key
-        @@accessory_info.signing_key
-      end
-
-      def paired?
-        @@accessory_info.paired_clients.any?
-      end
-
-      def add_paired_client(admin: false, identifier: , public_key: )
-        @@accessory_info.paired_clients << { admin: admin, identifier: identifier, public_key: public_key }
-        save
-      end
+    def set_password
+      self.password ||= '031-45-154'
+    end
 
-      def remove_paired_client(identifier)
-        @@accessory_info.paired_clients.delete_if { |h| h[:identifier] == identifier }
-        save
-      end
+    def set_signature_key
+      self.signature_key ||= RbNaCl::Signatures::Ed25519::SigningKey.generate.to_bytes.unpack1('H*')
     end
   end
 end

data/lib/ruby_home/device_id.rb

@@ -1,7 +1,6 @@
 module RubyHome
   class DeviceID
     class << self
-
       DELIMITER = ':'
 
       # Device ID of the accessory must be a unique random number generated at every
@@ -24,7 +23,6 @@ module RubyHome
           .times
           .map { random_hexadecimal }
       end
-
     end
   end
 end

data/lib/ruby_home/dns/service.rb

@@ -1,7 +1,3 @@
-require 'dnssd'
-require_relative '../accessory_info'
-require_relative 'text_record'
-
 module RubyHome
   module DNS
     class Service
@@ -36,9 +32,8 @@ module RubyHome
       attr_reader :port
 
       def text_record
-        TextRecord.new(accessory_info: AccessoryInfo)
+        TextRecord.new(accessory_info: AccessoryInfo.instance)
       end
     end
   end
 end
-

data/lib/ruby_home/dns/text_record.rb

@@ -1,5 +1,3 @@
-require 'dnssd/text_record'
-
 module RubyHome
   class TextRecord < DNSSD::TextRecord
     def initialize(accessory_info:)

data/lib/ruby_home/factories/accessory_factory.rb

@@ -1,8 +1,3 @@
-require_relative '../hap/service'
-require_relative '../hap/accessory'
-require_relative 'templates/service_template'
-require_relative 'templates/characteristic_template'
-
 module RubyHome
   class AccessoryFactory
     def self.create(service_name, characteristics: {}, **options)

data/lib/ruby_home/factories/characteristic_factory.rb

@@ -1,6 +1,3 @@
-require_relative '../hap/service'
-require_relative '../hap/accessory'
-
 module RubyHome
   class CharacteristicFactory
     DEFAULT_VALUES = {

data/lib/ruby_home/factories/templates/characteristic_template.rb

@@ -40,4 +40,3 @@ module RubyHome
     end
   end
 end
-

data/lib/ruby_home/factories/templates/service_template.rb

@@ -1,5 +1,3 @@
-require_relative 'characteristic_template'
-
 module RubyHome
   class ServiceTemplate
     FILEPATH = (File.dirname(__FILE__) + '/../../config/services.yml').freeze

data/lib/ruby_home/hap/accessory.rb

@@ -4,8 +4,8 @@ module RubyHome
       @services = []
     end
 
-    attr_reader :id, :services
-    attr_writer :id
+    attr_accessor :id
+    attr_reader :services
 
     def characteristics
       services.flat_map(&:characteristics)

data/lib/ruby_home/hap/characteristic.rb

@@ -1,5 +1,3 @@
-require 'wisper'
-
 module RubyHome
   class Characteristic
     include Wisper::Publisher
@@ -38,6 +36,8 @@ module RubyHome
     end
 
     def value=(new_value)
+      return if name == :identify
+
       @value = new_value
       broadcast(:updated, new_value)
     end

data/lib/ruby_home/hap/crypto/chacha20poly1305.rb

@@ -1,5 +1,3 @@
-require 'rbnacl/libsodium'
-
 module RubyHome
   module HAP
     module Crypto
@@ -27,5 +25,3 @@ module RubyHome
     end
   end
 end
-
-

data/lib/ruby_home/hap/crypto/hkdf.rb

@@ -1,5 +1,3 @@
-require 'rbnacl/libsodium'
-
 GEM_HKDF = HKDF
 
 module RubyHome

data/lib/ruby_home/hap/http_decryption.rb

@@ -1,10 +1,9 @@
-require 'rbnacl/libsodium'
-
 module RubyHome
   module HAP
     class HTTPDecryption
-      AAD_LENGTH_BYTES = 2
-      AUTHENTICATE_TAG_LENGTH_BYTES = 16
+      AAD_LENGTH_BYTES = 2.freeze
+      AUTHENTICATE_TAG_LENGTH_BYTES = 16.freeze
+      NONCE_32_BIT_FIX_COMMENT_PART = [0].pack('L').freeze
 
       def initialize(key, count: 0)
         @key = key
@@ -47,11 +46,11 @@ module RubyHome
       end
 
       def nonce
-        HexPad.pad([count].pack('Q<'))
+        NONCE_32_BIT_FIX_COMMENT_PART + [count].pack('Q')
       end
 
       def chacha20poly1305ietf
-        HAP::Crypto::ChaCha20Poly1305.new(key)
+        @_chacha20poly1305ietf ||= HAP::Crypto::ChaCha20Poly1305.new(key)
       end
     end
   end

data/lib/ruby_home/hap/http_encryption.rb

@@ -1,22 +1,34 @@
-require 'rbnacl/libsodium'
-
 module RubyHome
   module HAP
     class HTTPEncryption
+      MAX_FRAME_LENGTH = 1024.freeze
+      NONCE_32_BIT_FIX_COMMENT_PART = [0].pack('L').freeze
+
       def initialize(key, count: 0)
         @key = key
         @count = count
       end
 
       def encrypt(data)
-        data.chars.each_slice(1024).map(&:join).map do |message|
-          additional_data = [message.length].pack('v')
+        encrypted_data = []
+        read_pointer = 0
 
-          encrypted_data = chacha20poly1305ietf.encrypt(nonce, message, additional_data)
-          increment_count!
+        while read_pointer < data.length
+          encrypted_frame = ""
+
+          frame = data[read_pointer...read_pointer+MAX_FRAME_LENGTH]
+          length_of_encrypted_data = frame.length
+          little_endian_length_of_encrypted_data = [length_of_encrypted_data].pack('v')
+
+          encrypted_frame += little_endian_length_of_encrypted_data
+          encrypted_frame += chacha20poly1305ietf.encrypt(nonce, frame, little_endian_length_of_encrypted_data)
+          encrypted_data << encrypted_frame
 
-          [additional_data, encrypted_data].join
+          read_pointer += length_of_encrypted_data
+          increment_count!
         end
+
+        encrypted_data
       end
 
       attr_reader :count
@@ -30,14 +42,12 @@ module RubyHome
       end
 
       def nonce
-        HexPad.pad([count].pack('Q<'))
+        NONCE_32_BIT_FIX_COMMENT_PART + [count].pack('Q')
       end
 
       def chacha20poly1305ietf
-        HAP::Crypto::ChaCha20Poly1305.new(key)
+        @_chacha20poly1305ietf ||= HAP::Crypto::ChaCha20Poly1305.new(key)
       end
     end
   end
 end
-
-

data/lib/ruby_home/hap/service.rb

@@ -1,6 +1,3 @@
-Dir[File.dirname(__FILE__) + '/services/*.rb'].each { |file| require file }
-require_relative 'characteristic'
-
 module RubyHome
   class Service
     def initialize(accessory: , primary: false, hidden: false, name:, description:, uuid:)

data/lib/ruby_home/hap/tlv.rb

@@ -1,27 +1,34 @@
-require 'bindata'
-
 module RubyHome
   module HAP
     module TLV
-      extend self
+      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
 
-      TYPE_NAMES = {
-        0 => 'kTLVType_Method',
-        1 => 'kTLVType_Identifier',
-        2 => 'kTLVType_Salt',
-        3 => 'kTLVType_PublicKey',
-        4 => 'kTLVType_Proof',
-        5 => 'kTLVType_EncryptedData',
-        6 => 'kTLVType_State',
-        7 => 'kTLVType_Error',
-        8 => 'kTLVType_RetryDelay',
-        9 => 'kTLVType_Certificate',
-       10 => 'kTLVType_Signature',
-       11 => 'kTLVType_Permissions',
-       12 => 'kTLVType_FragmentData',
-       13 => 'kTLVType_FragmentLast',
+      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
-      NAME_TYPES = TYPE_NAMES.invert.freeze
+      TYPE_NAMES = NAME_TYPES.invert.freeze
 
       class Bytes < BinData::String; end
 
@@ -58,7 +65,7 @@ module RubyHome
 
       READER = BinData::Array.new(type: :tlv, read_until: :eof)
 
-      def read(input)
+      def self.read(input)
         READER.clear
         READER.read(input)
         READER.snapshot.each_with_object({}) do |(hash), memo|
@@ -73,7 +80,7 @@ module RubyHome
         end
       end
 
-      def encode(hash)
+      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

data/lib/ruby_home/hex_helper.rb

@@ -0,0 +1,15 @@
+module RubyHome
+  module HexHelper
+    def self.pad(input, pad_length: 24)
+      pack_hex_string(unpack_hex_string(input).rjust(pad_length, '0'))
+    end
+
+    def self.unpack_hex_string(input)
+      input.to_s.unpack1('H*')
+    end
+
+    def self.pack_hex_string(input)
+      [input].pack('H*')
+    end
+  end
+end

data/lib/ruby_home/http/application.rb

@@ -1,28 +1,33 @@
-require 'sinatra/base'
-require_relative '../rack/handler/hap_server'
-require_relative 'cache'
-
-Rack::Handler.register 'hap_server', RubyHome::Rack::Handler::HAPServer
+Dir[File.dirname(__FILE__) + '/controllers/*.rb'].each {|file| require file }
 
 module RubyHome
   module HTTP
-    class Application < Sinatra::Base
-      Dir[File.dirname(__FILE__) + '/controllers/*.rb'].each {|file| require file }
+    class Application
+      def run
+        RubyHome::Rack::Handler::HAPServer.run rack_builder,
+          Port: port,
+          Host: bind_address,
+          ServerSoftware: 'RubyHome'
+      end
 
-      disable :protection
-      disable :logging
-      set :bind, '0.0.0.0'
-      set :quiet, true
-      set :server, :hap_server
-      set :server_settings, AcceptCallback: -> (sock) do
-        self.set :request_id, sock.object_id
+      def port
+        @_port ||= Integer(ENV['PORT'] && !ENV['PORT'].empty? ? ENV['PORT'] : 4567)
       end
 
-      use AccessoriesController
-      use CharacteristicsController
-      use PairSetupsController
-      use PairVerifiesController
-      use PairingsController
+      def bind_address
+        '0.0.0.0'
+      end
+
+      def rack_builder
+        ::Rack::Builder.new do
+          use ::Rack::CommonLogger
+          map('/accessories', &Proc.new { run AccessoriesController })
+          map('/characteristics', &Proc.new { run CharacteristicsController })
+          map('/pair-setup', &Proc.new { run PairSetupsController })
+          map('/pair-verify', &Proc.new { run PairVerifiesController })
+          map('/pairings', &Proc.new { run PairingsController })
+        end
+      end
     end
   end
 end

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

@@ -1,10 +1,9 @@
 require_relative 'application_controller'
-require_relative '../serializers/accessory_serializer'
 
 module RubyHome
   module HTTP
     class AccessoriesController < ApplicationController
-      get '/accessories' do
+      get '/' do
         content_type 'application/hap+json'
 
         if cache[:controller_to_accessory_key] && cache[:accessory_to_controller_key]

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

@@ -3,34 +3,81 @@ module RubyHome
     class ApplicationController < Sinatra::Base
       disable :protection
 
+      if ENV['DEBUG']
+        enable :logging
+        set :logger, Logger.new(STDOUT)
+      end
+
+      before do
+        logger.debug "Cache"
+        logger.debug cache.inspect
+      end
+
+      protected
+
       def unpack_request
-        @_unpack_request ||= begin
-          request.body.rewind
-          HAP::TLV.read(request.body.read)
-        end
+        @_unpack_request ||= _unpack_request
       end
 
       def json_body
-        @_json_body ||= begin
-          request.body.rewind
-          JSON.parse(request.body.read)
-        end
+        @_json_body ||= _unpack_json
       end
 
       def accessory_info
-        AccessoryInfo
+        AccessoryInfo.instance
       end
 
       def identifier_cache
         IdentifierCache
       end
 
-      def request_id
-        Application.request_id
+      def cache
+        RequestStore.store
       end
 
-      def cache
-        GlobalCache.instance[request_id] ||= Cache.new
+      def clear_cache
+        RequestStore.clear!
+      end
+
+      def tlv(object)
+        logger.debug "Response"
+        logger.debug object.inspect
+        HAP::TLV.encode(object)
+      end
+
+      def logger
+        if settings.respond_to?(:logger)
+          settings.logger
+        else
+          request.logger
+        end
+      end
+
+      private
+
+      def rewind_request
+        if request.body.size > 0
+          request.body.rewind
+        end
+      end
+
+      def request_body
+        rewind_request
+        request.body.read
+      end
+
+      def _unpack_request
+        HAP::TLV.read(request_body).tap do |request_tlv|
+          logger.debug "Request"
+          logger.debug request_tlv.inspect
+        end
+      end
+
+      def _unpack_json
+        JSON.parse(request_body).tap do |request_json|
+          logger.debug "Request"
+          logger.debug request_json.inspect
+        end
       end
     end
   end