ruby_home 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbb486ea0b95baaee4388d69f2875024e941d7a79b2385f327f6cfb4639cc270
-  data.tar.gz: d451c724e41292c3899461951bcd337095404abd0c730744cd3bf863a58e9859
+  metadata.gz: 247444e8f829a6189260709b8e0ea216ebe541788e2c8db878a944a92ed926f2
+  data.tar.gz: a015fb65638df959a1d0bd5b69d6510f5c1b04d24eef96742fb0c6188153db8f
 SHA512:
-  metadata.gz: 569b75436eaa94dd62ce2395cedf0af12b4a9d498168d80a12534e6ee2320a870e6f7967676fae986243b2f4bf6e98a456e17089183ee9c5e2768539fcb131b1
-  data.tar.gz: 0e43c491540462de28126a06cbe84f93b15ede9ef13133998f9c1e855b7c48ba8f4a3570d4d1fa8c485f6accc2fd1e1cb2864e92ff7dca0b04f7e728363dc818
+  metadata.gz: 93daf94385bd9f965392cd9ed748ff3e0f23132383bff1fe510f326b255aa6fe45b33f88a43b01b98c181de54d43bec2fbe48dde02d39e3004cf956c86616cb6
+  data.tar.gz: 8100648de51d429ec93b6de81137cf0c9354435acbb11a47fb57a365f0a5a14f38224a6dfaf41cba61edae6dc67d762a227ae6da9af4d22fef8d18c742ebaebd

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

@@ -31,16 +31,5 @@ module RubyHome
     def constraints
       @constraints || {}
     end
-
-    def to_hash
-      {
-        name: name,
-        description: description,
-        uuid: uuid,
-        format: format,
-        unit: unit,
-        properties: properties,
-      }
-    end
   end
 end

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

@@ -36,13 +36,5 @@ module RubyHome
         CharacteristicTemplate.find_by(uuid: uuid)
       end
     end
-
-    def to_hash
-      {
-        name: name,
-        description: description,
-        uuid: uuid
-      }
-    end
   end
 end

data/lib/ruby_home/hap/ev_response.rb

@@ -1,10 +1,10 @@
 module RubyHome
   module HAP
     class EVResponse
-      def initialize(socket, body)
-        @socket = socket
+      def initialize(session, body)
+        @session = session
+        @socket = session.socket
         @body = body
-        cache[:accessory_to_controller_count] ||= 0
       end
 
       def send_response
@@ -13,14 +13,17 @@ module RubyHome
         send_header(response)
         send_body(response)
 
+        encrypter = session.encrypter
         encrypted_response = encrypter.encrypt(response).join
-        cache[:accessory_to_controller_count] = encrypter.count
+        session.accessory_to_controller_count = encrypter.count
 
         socket << encrypted_response
       end
 
       private
 
+        attr_reader :body, :socket, :session
+
         CRLF = -"\x0d\x0a"
         STATUS_LINE = -'EVENT/1.0 200 OK'
         CONTENT_TYPE_LINE = -'Content-Type: application/hap+json'
@@ -39,26 +42,6 @@ module RubyHome
         def content_length_line
           "Content-Length: #{body.length}"
         end
-
-        attr_reader :body, :socket
-
-        def encrypter
-          @_encrypter ||= RubyHome::HAP::HTTPEncryption.new(encryption_key, encrypter_params)
-        end
-
-        def encrypter_params
-          {
-            count: cache[:accessory_to_controller_count]
-          }
-        end
-
-        def encryption_key
-          cache[:accessory_to_controller_key]
-        end
-
-        def cache
-          RubyHome.socket_store[socket]
-        end
     end
   end
 end

data/lib/ruby_home/hap/hap_request.rb

@@ -1,19 +1,16 @@
 module RubyHome
   module HAP
     class HAPRequest < WEBrick::HTTPRequest
-      def initialize(config, sock)
-        @sock = sock
-        cache[:controller_to_accessory_count] ||= 0
+      def parse(session)
+        @session = session
+        socket = session.socket
 
-        super(config)
-      end
-
-      def parse(socket)
-        if decryption_time?
+        if session.decryption_time?
           request_line = socket.read_nonblock(@buffer_size)
 
+          decrypter = session.decrypter
           decrypted_request = decrypter.decrypt(request_line).join
-          cache[:controller_to_accessory_count] = decrypter.count
+          session.controller_to_accessory_count = decrypter.count
 
           super(StringIO.new(decrypted_request))
         else
@@ -21,38 +18,10 @@ module RubyHome
         end
       end
 
-      def received_encrypted_request?
-        cache[:controller_to_accessory_count] >= 1
-      end
-
       def meta_vars
-        super.merge({"REQUEST_SOCKET" => sock})
-      end
-
-      private
-
-      attr_reader :sock
-
-      def decrypter
-        @_decrypter ||= RubyHome::HAP::HTTPDecryption.new(decryption_key, decrypter_params)
-      end
-
-      def decrypter_params
-        {
-          count: cache[:controller_to_accessory_count]
-        }
-      end
-
-      def decryption_time?
-        !!decryption_key
-      end
-
-      def decryption_key
-        cache[:controller_to_accessory_key]
-      end
-
-      def cache
-        RubyHome.socket_store[sock]
+        super.merge(
+          { "REQUEST_SESSION" => @session }
+        )
       end
     end
   end

data/lib/ruby_home/hap/hap_response.rb

@@ -1,54 +1,23 @@
 module RubyHome
   module HAP
     class HAPResponse < WEBrick::HTTPResponse
-      def initialize(config, sock)
-        @sock = sock
-        cache[:accessory_to_controller_count] ||= 0
+      def send_response(session)
+        socket = session.socket
 
-        super(config)
-      end
-
-      def send_response(socket)
-        if encryption_time?
+        if session.encryption_time?
           response = StringIO.new
           super(response)
 
+          encrypter = session.encrypter
+
           encrypted_response = encrypter.encrypt(response.string).join
-          cache[:accessory_to_controller_count] = encrypter.count
+          session.accessory_to_controller_count = encrypter.count
 
           _write_data(socket, encrypted_response)
         else
           super(socket)
         end
       end
-
-      attr_writer :received_encrypted_request
-
-      private
-
-      attr_reader :sock
-
-      def encrypter
-        @_encrypter ||= RubyHome::HAP::HTTPEncryption.new(encryption_key, encrypter_params)
-      end
-
-      def encrypter_params
-        {
-          count: cache[:accessory_to_controller_count]
-        }
-      end
-
-      def encryption_time?
-        encryption_key && !!@received_encrypted_request
-      end
-
-      def encryption_key
-        cache[:accessory_to_controller_key]
-      end
-
-      def cache
-        RubyHome.socket_store[sock]
-      end
     end
   end
 end

data/lib/ruby_home/hap/server.rb

@@ -1,14 +1,13 @@
 module RubyHome
   module HAP
     class Server
-      def initialize(host, port, socket_store)
+      def initialize(host, port)
         @port = port
         @host = host
-        @socket_store = socket_store
         @selector = NIO::Selector.new
       end
 
-      attr_reader :port, :host, :socket_store
+      attr_reader :port, :host
 
       def run
         puts "Listening on #{host}:#{port}"
@@ -24,10 +23,10 @@ module RubyHome
 
       private
 
+      SESSIONS = {}
+
       def accept
         socket = @server.accept
-        _, port, host = socket.peeraddr
-
         monitor = @selector.register(socket, :r)
         monitor.value = proc { read(socket) }
       end
@@ -36,17 +35,20 @@ module RubyHome
         @_upstream ||= HTTP::Application.run
       end
 
+      def webrick_config
+        @_webrick_config ||= WEBrick::Config::HTTP
+      end
+
       def read(socket)
         return close(socket) if socket.eof?
 
-        socket_store[socket] ||= {}
+        session = SESSIONS[socket] ||= Session.new(socket)
 
-        request = HAPRequest.new(WEBrick::Config::HTTP, socket)
-        response = HAPResponse.new(WEBrick::Config::HTTP, socket)
+        request = HAPRequest.new(webrick_config)
+        response = HAPResponse.new(webrick_config)
 
-        request.parse(socket)
+        request.parse(session)
 
-        response.received_encrypted_request = request.received_encrypted_request?
         response.request_method = request.request_method
         response.request_uri = request.request_uri
         response.request_http_version = request.http_version
@@ -58,7 +60,7 @@ module RubyHome
           if request.keep_alive? && response.keep_alive?
             request.fixup()
           end
-          response.send_response(socket)
+          response.send_response(session)
         end
 
         return close(socket) unless request.keep_alive?
@@ -72,7 +74,6 @@ module RubyHome
 
       def close(socket)
         @selector.deregister(socket)
-        socket_store.delete(socket)
         socket.close
       end
     end

data/lib/ruby_home/hap/session.rb

@@ -0,0 +1,69 @@
+module RubyHome
+  module HAP
+    class Session
+      def initialize(socket)
+        @socket = socket
+        @accessory_to_controller_count = 0
+        @controller_to_accessory_count = 0
+      end
+
+      attr_reader :socket
+      attr_accessor :controller_to_accessory_key
+      attr_accessor :accessory_to_controller_key
+      attr_writer :accessory_to_controller_count
+      attr_writer :controller_to_accessory_count
+      attr_accessor :shared_secret
+      attr_accessor :session_key
+      attr_accessor :srp_session
+
+      def encryption_time?
+        accessory_to_controller_key? && received_encrypted_request?
+      end
+
+      def received_encrypted_request?
+        controller_to_accessory_count > 0
+      end
+
+      def encrypter
+        HTTPEncryption.new(accessory_to_controller_key, encrypter_params)
+      end
+
+      def decryption_time?
+        controller_to_accessory_key.present?
+      end
+
+      def decrypter
+        HTTPDecryption.new(controller_to_accessory_key, decrypter_params)
+      end
+
+      def sufficient_privileges?
+        controller_to_accessory_key? && accessory_to_controller_key?
+      end
+
+      def active?
+        !socket.closed?
+      end
+
+      private
+
+        attr_reader :accessory_to_controller_count,
+                    :controller_to_accessory_count
+
+        def accessory_to_controller_key?
+          accessory_to_controller_key.present?
+        end
+
+        def controller_to_accessory_key?
+          controller_to_accessory_key.present?
+        end
+
+        def encrypter_params
+          { count: accessory_to_controller_count }
+        end
+
+        def decrypter_params
+          { count: controller_to_accessory_count }
+        end
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module RubyHome
       get '/' do
         content_type 'application/hap+json'
 
-        if cache[:controller_to_accessory_key] && cache[:accessory_to_controller_key]
+        if session.sufficient_privileges?
           AccessorySerializer.new(identifier_cache.accessories).serialized_json
         else
           status 401

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

@@ -9,8 +9,8 @@ module RubyHome
       end
 
       before do
-        logger.debug "Cache"
-        logger.debug cache.inspect
+        logger.debug "Session"
+        logger.debug session.inspect
       end
 
       protected
@@ -31,16 +31,8 @@ module RubyHome
         Accessory.all
       end
 
-      def socket
-        env["REQUEST_SOCKET"]
-      end
-
-      def clear_cache
-        RubyHome.socket_store.delete(socket)
-      end
-
-      def cache
-        RubyHome.socket_store[socket]
+      def session
+        env["REQUEST_SESSION"]
       end
 
       def tlv(object)

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

@@ -41,7 +41,7 @@ module RubyHome
 
         def subscribe_characteristics(characteristic_params)
           find_characteristic(**characteristic_params.symbolize_keys.slice(:aid, :iid)) do |characteristic|
-            notifier = SocketNotifier.new(socket, characteristic)
+            notifier = SessionNotifier.new(session, characteristic)
 
             unless characteristic.listeners.include?(notifier)
               characteristic.subscribe(notifier)
@@ -56,7 +56,7 @@ module RubyHome
         end
 
         def require_session
-          unless cache[:controller_to_accessory_key] && cache[:accessory_to_controller_key]
+          unless session.sufficient_privileges?
             halt 401, JSON.generate({"status" => -70401})
           end
         end

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

@@ -19,8 +19,6 @@ module RubyHome
       private
 
       def pairing_failed
-        clear_cache
-
         tlv state: 4, error: 2
       end
 
@@ -30,7 +28,7 @@ module RubyHome
           password: accessory_info.password
         )
 
-        cache[:srp_session] = start_srp.proof
+        session.srp_session = start_srp.proof
 
         tlv salt: start_srp.salt_bytes, public_key: start_srp.public_key_bytes, state: 2
       end
@@ -38,13 +36,13 @@ module RubyHome
       def verify
         verify_srp = VerifySRPService.new(
           device_proof: unpack_request[:proof],
-          srp_session: cache[:srp_session],
+          srp_session: session.srp_session,
           public_key: unpack_request[:public_key],
         )
 
         if verify_srp.valid?
-          cache[:session_key] = verify_srp.session_key
-          cache.delete(:srp_session)
+          session.session_key = verify_srp.session_key
+          session.srp_session = nil
 
           tlv state: 4, proof: verify_srp.server_proof
         else
@@ -56,7 +54,7 @@ module RubyHome
         encrypted_data = unpack_request[:encrypted_data]
 
         hkdf = HAP::Crypto::HKDF.new(info: 'Pair-Setup-Encrypt-Info', salt: 'Pair-Setup-Encrypt-Salt')
-        key = hkdf.encrypt(cache[:session_key])
+        key = hkdf.encrypt(session.session_key)
 
         chacha20poly1305ietf = HAP::Crypto::ChaCha20Poly1305.new(key)
 
@@ -69,7 +67,7 @@ module RubyHome
         iosdeviceltpk = unpacked_decrypted_data[:public_key]
 
         hkdf = HAP::Crypto::HKDF.new(info: 'Pair-Setup-Controller-Sign-Info', salt: 'Pair-Setup-Controller-Sign-Salt')
-        iosdevicex = hkdf.encrypt(cache[:session_key])
+        iosdevicex = hkdf.encrypt(session.session_key)
 
         iosdeviceinfo = [
           iosdevicex.unpack1('H*'),
@@ -80,7 +78,7 @@ module RubyHome
 
         if verify_key.verify(iosdevicesignature, [iosdeviceinfo].pack('H*'))
           hkdf = HAP::Crypto::HKDF.new(info: 'Pair-Setup-Accessory-Sign-Info', salt: 'Pair-Setup-Accessory-Sign-Salt')
-          accessory_x = hkdf.encrypt(cache[:session_key])
+          accessory_x = hkdf.encrypt(session.session_key)
 
           signing_key = accessory_info.signing_key
           accessoryltpk = signing_key.verify_key.to_bytes

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

@@ -23,7 +23,7 @@ module RubyHome
         public_key = secret_key.public_key.to_bytes
         client_public_key = RbNaCl::PublicKey.new(unpack_request[:public_key])
         shared_secret = RbNaCl::GroupElement.new(client_public_key).mult(secret_key).to_bytes
-        cache[:shared_secret] = shared_secret
+        session.shared_secret = shared_secret
 
         accessoryinfo = [
           public_key.unpack1('H*'),
@@ -38,7 +38,7 @@ module RubyHome
 
         hkdf = HAP::Crypto::HKDF.new(info: 'Pair-Verify-Encrypt-Info', salt: 'Pair-Verify-Encrypt-Salt')
         session_key = hkdf.encrypt(shared_secret)
-        cache[:session_key] = session_key
+        session.session_key = session_key
 
         chacha20poly1305ietf = HAP::Crypto::ChaCha20Poly1305.new(session_key)
         nonce = HexHelper.pad('PV-Msg02')
@@ -50,18 +50,19 @@ module RubyHome
       def verify_finish_response
         encrypted_data = unpack_request[:encrypted_data]
 
-        chacha20poly1305ietf = HAP::Crypto::ChaCha20Poly1305.new(cache[:session_key])
+        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)
 
         if accessory_info.paired_clients.any? {|h| h[:identifier] == unpacked_decrypted_data[:identifier]}
-          shared_secret = HAP::Crypto::SessionKey.new(cache[:shared_secret])
-          cache[:controller_to_accessory_key] = shared_secret.controller_to_accessory_key
-          cache[:accessory_to_controller_key] = shared_secret.accessory_to_controller_key
+          shared_secret = HAP::Crypto::SessionKey.new(session.shared_secret)
 
-          cache.delete(:session_key)
-          cache.delete(:shared_secret)
+          session.controller_to_accessory_key = shared_secret.controller_to_accessory_key
+          session.accessory_to_controller_key = shared_secret.accessory_to_controller_key
+
+          session.session_key = nil
+          session.shared_secret = nil
 
           tlv state: 4
         else

data/lib/ruby_home/http/services/{socket_notifier.rb → session_notifier.rb}

@@ -1,13 +1,13 @@
 module RubyHome
   module HTTP
-    class SocketNotifier
-      def initialize(socket, characteristic)
-        @socket = socket
+    class SessionNotifier
+      def initialize(session, characteristic)
+        @session = session
         @characteristic = characteristic
       end
 
       def after_update(_)
-        if socket_still_active?
+        if session.active?
           send_ev_response
         else
           characteristic.unsubscribe(self)
@@ -16,20 +16,16 @@ module RubyHome
 
       def ==(other)
         self.class == other.class &&
-          self.socket == other.socket &&
+          self.session == other.session &&
           self.characteristic == other.characteristic
       end
 
-      attr_reader :socket, :characteristic
+      attr_reader :session, :characteristic
 
       private
 
-        def socket_still_active?
-          RubyHome.socket_store.include?(socket)
-        end
-
         def send_ev_response
-          HAP::EVResponse.new(socket, serialized_characteristic).send_response
+          HAP::EVResponse.new(session, serialized_characteristic).send_response
         end
 
         def serialized_characteristic

data/lib/ruby_home/identifier_cache.rb

@@ -13,10 +13,6 @@ module RubyHome
       end
     end
 
-    def self.reload
-      @@_instance = nil
-    end
-
     def self.create(**attributes)
       new(**attributes).save
     end

data/lib/ruby_home/persistable.rb

@@ -7,7 +7,9 @@ module RubyHome
 
     module ClassMethods
       def persisted
-        new(read) if read
+        if yaml = read
+          new(yaml)
+        end
       end
 
       def create(**options)
@@ -19,10 +21,20 @@ module RubyHome
       end
 
       def read
-        return false unless File.exists?(source)
+        return false unless file_exists?
 
         YAML.load_file(source)
       end
+
+      def truncate
+        return false unless file_exists?
+
+        File.truncate(source, 0)
+      end
+
+      def file_exists?
+        File.exists?(source)
+      end
     end
 
     def reload

data/lib/ruby_home/version.rb

@@ -1,3 +1,3 @@
 module RubyHome
-  VERSION = '0.1.13'
+  VERSION = '0.1.14'
 end

data/lib/ruby_home.rb

@@ -46,11 +46,7 @@ module RubyHome
     end
 
     def hap_server
-      @_hap_server ||= HAP::Server.new('0.0.0.0', 4567, socket_store)
-    end
-
-    def socket_store
-      @_socket_store ||= {}
+      @_hap_server ||= HAP::Server.new('0.0.0.0', 4567)
     end
 
     def greet

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_home
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Karl Entwistle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-18 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -295,6 +295,7 @@ files:
 - lib/ruby_home/hap/http_encryption.rb
 - lib/ruby_home/hap/server.rb
 - lib/ruby_home/hap/service.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
@@ -319,7 +320,7 @@ files:
 - lib/ruby_home/http/serializers/object_serializer.rb
 - lib/ruby_home/http/serializers/service_serializer.rb
 - lib/ruby_home/http/serializers/uuid_helper.rb
-- lib/ruby_home/http/services/socket_notifier.rb
+- lib/ruby_home/http/services/session_notifier.rb
 - lib/ruby_home/http/services/start_srp_service.rb
 - lib/ruby_home/http/services/verify_srp_service.rb
 - lib/ruby_home/identifier_cache.rb