ruby_home 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 247444e8f829a6189260709b8e0ea216ebe541788e2c8db878a944a92ed926f2
-  data.tar.gz: a015fb65638df959a1d0bd5b69d6510f5c1b04d24eef96742fb0c6188153db8f
+  metadata.gz: 90d257a9cc88bba2f6323a89829fc89000e6e84842dbf7abadefb35168eb2848
+  data.tar.gz: 94acb47192d8cb7b9a54f01f7621da8b5371c2218ebf9494d2324af2193a705d
 SHA512:
-  metadata.gz: 93daf94385bd9f965392cd9ed748ff3e0f23132383bff1fe510f326b255aa6fe45b33f88a43b01b98c181de54d43bec2fbe48dde02d39e3004cf956c86616cb6
-  data.tar.gz: 8100648de51d429ec93b6de81137cf0c9354435acbb11a47fb57a365f0a5a14f38224a6dfaf41cba61edae6dc67d762a227ae6da9af4d22fef8d18c742ebaebd
+  metadata.gz: e229661aca3237368c77159703e01b10ad8a39d4c3ce35176ce73251668bba6077646285c2360fa783d79d5c77b658ae84299af6143ecd613b8abf97edd2213b
+  data.tar.gz: 3e4aadce797eb3b8a8be1ae6f70af601866726c7d53f76e3a0c7246fda25affadc0c67220e98d1596b4befa1a6dc6299ff89f7863c232b45e1748529497d84c8

data/lib/ruby_home/hap/ev_response.rb

@@ -3,44 +3,37 @@ module RubyHome
     class EVResponse
       def initialize(session, body)
         @session = session
-        @socket = session.socket
         @body = body
       end
 
       def send_response
-        response = ''
-
-        send_header(response)
-        send_body(response)
-
-        encrypter = session.encrypter
-        encrypted_response = encrypter.encrypt(response).join
-        session.accessory_to_controller_count = encrypter.count
-
-        socket << encrypted_response
+        send_header(session)
+        send_body(session)
       end
 
       private
 
-        attr_reader :body, :socket, :session
+        attr_reader :body, :session
 
         CRLF = -"\x0d\x0a"
         STATUS_LINE = -'EVENT/1.0 200 OK'
         CONTENT_TYPE_LINE = -'Content-Type: application/hap+json'
 
-        def send_header(socket)
-          socket << STATUS_LINE + CRLF
-          socket << CONTENT_TYPE_LINE + CRLF
-          socket << content_length_line + CRLF
-          socket << CRLF
+        def content_length_line
+          "Content-Length: #{body.length}"
         end
 
-        def send_body(socket)
-          socket << body
+        def send_header(io)
+          data = STATUS_LINE + CRLF
+          data << CONTENT_TYPE_LINE + CRLF
+          data << content_length_line + CRLF
+          data << CRLF
+
+          io.write(data)
         end
 
-        def content_length_line
-          "Content-Length: #{body.length}"
+        def send_body(io)
+          io.write(body)
         end
     end
   end

data/lib/ruby_home/hap/hap_request.rb

@@ -1,26 +1,11 @@
 module RubyHome
   module HAP
     class HAPRequest < WEBrick::HTTPRequest
-      def parse(session)
-        @session = session
-        socket = session.socket
-
-        if session.decryption_time?
-          request_line = socket.read_nonblock(@buffer_size)
-
-          decrypter = session.decrypter
-          decrypted_request = decrypter.decrypt(request_line).join
-          session.controller_to_accessory_count = decrypter.count
-
-          super(StringIO.new(decrypted_request))
-        else
-          super(socket)
-        end
-      end
+      attr_accessor :session
 
       def meta_vars
         super.merge(
-          { "REQUEST_SESSION" => @session }
+          { "REQUEST_SESSION" => session }
         )
       end
     end

data/lib/ruby_home/hap/hap_response.rb

@@ -1,23 +1,6 @@
 module RubyHome
   module HAP
     class HAPResponse < WEBrick::HTTPResponse
-      def send_response(session)
-        socket = session.socket
-
-        if session.encryption_time?
-          response = StringIO.new
-          super(response)
-
-          encrypter = session.encrypter
-
-          encrypted_response = encrypter.encrypt(response.string).join
-          session.accessory_to_controller_count = encrypter.count
-
-          _write_data(socket, encrypted_response)
-        else
-          super(socket)
-        end
-      end
     end
   end
 end

data/lib/ruby_home/hap/server.rb

@@ -42,13 +42,13 @@ module RubyHome
       def read(socket)
         return close(socket) if socket.eof?
 
-        session = SESSIONS[socket] ||= Session.new(socket)
-
         request = HAPRequest.new(webrick_config)
         response = HAPResponse.new(webrick_config)
 
-        request.parse(session)
+        session = SESSIONS[socket] ||= Session.new(socket)
+        request.session = session
 
+        request.parse(session.parse)
         response.request_method = request.request_method
         response.request_uri = request.request_uri
         response.request_http_version = request.http_version

data/lib/ruby_home/hap/{http_decryption.rb → session/decrypter.rb}

@@ -1,6 +1,6 @@
 module RubyHome
   module HAP
-    class HTTPDecryption
+    class Decrypter
       AAD_LENGTH_BYTES = 2.freeze
       AUTHENTICATE_TAG_LENGTH_BYTES = 16.freeze
       NONCE_32_BIT_FIX_COMMENT_PART = [0].pack('L').freeze
@@ -16,7 +16,7 @@ module RubyHome
 
         while read_pointer < data.length
           little_endian_length_of_encrypted_data = data[read_pointer...read_pointer+AAD_LENGTH_BYTES]
-          length_of_encrypted_data = little_endian_length_of_encrypted_data.unpack('v').first
+          length_of_encrypted_data = little_endian_length_of_encrypted_data.unpack1('v')
           read_pointer += AAD_LENGTH_BYTES
 
           message = data[read_pointer...read_pointer+length_of_encrypted_data]
@@ -32,7 +32,7 @@ module RubyHome
           increment_count!
         end
 
-        decrypted_data
+        decrypted_data.join
       end
 
       attr_reader :count

data/lib/ruby_home/hap/session/encrypter.rb

@@ -0,0 +1,56 @@
+module RubyHome
+  module HAP
+    class Session
+      class Encrypter
+        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)
+          encrypted_data = []
+          read_pointer = 0
+
+          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
+
+            read_pointer += length_of_encrypted_data
+            increment_count!
+          end
+
+          encrypted_data.join
+        end
+
+        attr_reader :count
+
+        private
+
+        attr_reader :key
+
+        def increment_count!
+          @count += 1
+        end
+
+        def nonce
+          NONCE_32_BIT_FIX_COMMENT_PART + [count].pack('Q')
+        end
+
+        def chacha20poly1305ietf
+          @_chacha20poly1305ietf ||= HAP::Crypto::ChaCha20Poly1305.new(key)
+        end
+      end
+    end
+  end
+end
+

data/lib/ruby_home/hap/session.rb

@@ -1,68 +1,85 @@
 module RubyHome
   module HAP
     class Session
-      def initialize(socket)
-        @socket = socket
-        @accessory_to_controller_count = 0
-        @controller_to_accessory_count = 0
-      end
+      PARSE_BUFFER_SIZE = 65536
 
-      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?
+      def initialize(socket, decrypter_class: Decrypter, encrypter_class: Encrypter)
+        @socket = socket
+        @encrypter_class = encrypter_class
+        @decrypter_class = decrypter_class
       end
 
-      def received_encrypted_request?
-        controller_to_accessory_count > 0
-      end
+      attr_accessor(
+        :controller_to_accessory_key,
+        :accessory_to_controller_key,
+        :shared_secret,
+        :session_key,
+        :srp_session
+      )
 
-      def encrypter
-        HTTPEncryption.new(accessory_to_controller_key, encrypter_params)
+      def sufficient_privileges?
+        controller_to_accessory_key? && accessory_to_controller_key?
       end
 
-      def decryption_time?
-        controller_to_accessory_key.present?
+      def active?
+        !socket.closed?
       end
 
-      def decrypter
-        HTTPDecryption.new(controller_to_accessory_key, decrypter_params)
+      def write(data)
+        if encryption_time?
+          socket.write(encrypter.encrypt(data))
+        else
+          socket.write(data)
+        end
       end
 
-      def sufficient_privileges?
-        controller_to_accessory_key? && accessory_to_controller_key?
+      def parse
+        if decryption_time?
+          received_encrypted_request!
+          StringIO.new(
+            decrypter.decrypt(
+              socket.read_nonblock(PARSE_BUFFER_SIZE)
+            )
+          )
+        else
+          socket
+        end
       end
 
-      def active?
-        !socket.closed?
+      def received_encrypted_request!
+        @received_encrypted_request ||= true
       end
 
       private
 
-        attr_reader :accessory_to_controller_count,
-                    :controller_to_accessory_count
+        attr_reader :socket, :encrypter_class, :decrypter_class
 
-        def accessory_to_controller_key?
-          accessory_to_controller_key.present?
+        def received_encrypted_request?
+          @received_encrypted_request ||= false
         end
 
-        def controller_to_accessory_key?
+        def encrypter
+          @_encrypter ||= encrypter_class.new(accessory_to_controller_key)
+        end
+
+        def encryption_time?
+          accessory_to_controller_key? && received_encrypted_request?
+        end
+
+        def decrypter
+          @_decrypter ||= decrypter_class.new(controller_to_accessory_key)
+        end
+
+        def decryption_time?
           controller_to_accessory_key.present?
         end
 
-        def encrypter_params
-          { count: accessory_to_controller_count }
+        def accessory_to_controller_key?
+          accessory_to_controller_key.present?
         end
 
-        def decrypter_params
-          { count: controller_to_accessory_count }
+        def controller_to_accessory_key?
+          controller_to_accessory_key.present?
         end
     end
   end

data/lib/ruby_home/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_home
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Karl Entwistle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-22 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -291,11 +291,11 @@ files:
 - lib/ruby_home/hap/ev_response.rb
 - lib/ruby_home/hap/hap_request.rb
 - lib/ruby_home/hap/hap_response.rb
-- lib/ruby_home/hap/http_decryption.rb
-- 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/session/decrypter.rb
+- lib/ruby_home/hap/session/encrypter.rb
 - lib/ruby_home/hap/tlv.rb
 - lib/ruby_home/hap/values/base_value.rb
 - lib/ruby_home/hap/values/bool_value.rb

data/lib/ruby_home/hap/http_encryption.rb

@@ -1,53 +0,0 @@
-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)
-        encrypted_data = []
-        read_pointer = 0
-
-        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
-
-          read_pointer += length_of_encrypted_data
-          increment_count!
-        end
-
-        encrypted_data
-      end
-
-      attr_reader :count
-
-      private
-
-      attr_reader :key
-
-      def increment_count!
-        @count += 1
-      end
-
-      def nonce
-        NONCE_32_BIT_FIX_COMMENT_PART + [count].pack('Q')
-      end
-
-      def chacha20poly1305ietf
-        @_chacha20poly1305ietf ||= HAP::Crypto::ChaCha20Poly1305.new(key)
-      end
-    end
-  end
-end