http-2 0.8.2 → 0.8.3

data/example/keys/server.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAoxV61qrUWRDDjv6OgMRm4A2DIIP+7sQhUCTOWeguCCOg/Ffe
+BQ8gnfidCzitoQfkFHRaqQNUvekVtjLyMHb0bdN0STIG33FBdPsOGSLb9sa1vcGg
+nwpi0kQ2YHEgE2nBBervadlbPqOCf3B2nIq0sI8uPpveAoJMbVBRrRnCWhagGegn
+Y+Vr0HSUogCN8d4DQv1BgPuXS7KfPr8Fsfv0zHOpwwZqEVtxh3hvzQKUEodNcN8A
+79BZlGhUJQOVj8mvybPgsrmIdZol20CRIw5xhmiY56MkQEKT65O9iY/m53zrvZMa
+c5LiyTrG2qH0RZDPvwK+VPm0M7lNBK0PCIfDDwIDAQABAoIBAQCZShphZsccRJ6c
+bPdDX9iW5vyG9qsMgPwTGdWAOrXx3pN2PZ0pwjNVaRcsMgU6JHGlLEz/Kmtf6pQG
+41I0bcuI48Yc+tHs+sadD1IMHHEHP3Yau8KfWyLSI129Pvf4Z2IQjuik5LJYaVbD
+NNG4iMQYZS0Bmn6Oey0dXu62t0ywYa0qvbIDse/RmjTQSTipuvGg8/QEAeRGABv8
+Nd4Esya0zuxk6hGaNp3hkjyRkeoC7RsBVJbFSnp6gSubPdXwrJyHfySKe9jvrDG3
+Q/AzyHUh/6EODd5n66x0p6rq7oo9/PnLvZJY8jIGWG+aEp68RJyEgimrwll0rAWw
+/buqijGRAoGBANimL8407fFirmct7BceavaeJfXPK5yWiOhVX0XlJ0phAFuaAxK3
+5HVT7DD+KKV66g1jtS9FUVZGDiYFHlsdsYuHVYcRmr0h5rZr941obrDwNrM9Nf9C
+0uehN5+n/FaeGoQLR3V4THoP3rlkYTlLpQnI5mKA19JukXnIiJM9ARUZAoGBAMC0
+mcVsVuSKSFwURtQHHIufxL6SqC2kLTwIQ7exqejNYPCqCiif+ZWOmsTqbVGAGbMK
+Ohak4oLwN5IGCl4jNQG+vWagREkx6OXSk5NYcfoNBrOm+0UoFRzoEA85s7Dy6PuD
+tBucNZpt1sGauzkCSx7C8jj4ZlSwkv0XhBFfbTZnAoGBAK2wBjF+U6iq4YFM2rLq
+KvzOa0Z3MdKXCOmiz//cKDTEMaI+heoyzZCWmIvqpzGLqirT3gUowH23Kk6m2eBY
+nOdst0/S+Eha7nkfc9bFe8CUxHXMRAcCTs1ufYadCXtzw3RLCp4NtNpC8N+Wry9d
+CtIeYz1jaCOHi0+kSoIobT65AoGAc6hxWkJp7ITqZQlucTdLdKmRheeztKEC3TMA
+obGqDqWldww3SKarP431ahZhQjcmNYT/1DNmF7xhPe0OL+3llISMXJn4Ig4ogDdg
+h2DgF3nV+eFQkfM6qLzHVrwFE0DXgI1NffzFV0hxSoW5tL+honbStkqv8EiCEBEb
+HOovPCUCgYBpXuPARd2ycInAulVHijJmj2rmK7f41ZhVCWovYjcCWyeJyLIO7j+b
+MBJZbmwpStJhEjW64nE2zZGWg2HCBbvZz5/SXIr3fp7qVXwpn1TvB/TJDf43t0oF
+3caLgyQYoQCsVHKT3cU4s3wuog/DyHKh9FtRkcJrEy7h9Rrc+ModbA==
+-----END RSA PRIVATE KEY-----

data/example/server.rb

@@ -11,6 +11,10 @@ OptionParser.new do |opts|
   opts.on('-p', '--port [Integer]', 'listen port') do |v|
     options[:port] = v
   end
+
+  opts.on('-u', '--push', 'Push message') do |_v|
+    options[:push] = true
+  end
 end.parse!
 
 puts "Starting server on port #{options[:port]}"
@@ -18,9 +22,23 @@ server = TCPServer.new(options[:port])
 
 if options[:secure]
   ctx = OpenSSL::SSL::SSLContext.new
-  ctx.cert = OpenSSL::X509::Certificate.new(File.open('keys/mycert.pem'))
-  ctx.key = OpenSSL::PKey::RSA.new(File.open('keys/mykey.pem'))
-  ctx.npn_protocols = [DRAFT]
+  ctx.cert = OpenSSL::X509::Certificate.new(File.open('keys/server.crt'))
+  ctx.key = OpenSSL::PKey::RSA.new(File.open('keys/server.key'))
+
+  ctx.ssl_version = :TLSv1_2
+  ctx.options = OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:options]
+  ctx.ciphers = OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:ciphers]
+
+  ctx.alpn_protocols = ['h2']
+
+  ctx.alpn_select_cb = lambda do |protocols|
+    raise "Protocol #{DRAFT} is required" if protocols.index(DRAFT).nil?
+    DRAFT
+  end
+
+  ctx.tmp_ecdh_callback = lambda do |*_args|
+    OpenSSL::PKey::EC.new 'prime256v1'
+  end
 
   server = OpenSSL::SSL::SSLServer.new(server, ctx)
 end
@@ -32,7 +50,7 @@ loop do
   conn = HTTP2::Server.new
   conn.on(:frame) do |bytes|
     # puts "Writing bytes: #{bytes.unpack("H*").first}"
-    sock.write bytes
+    sock.is_a?(TCPSocket) ? sock.sendmsg(bytes) : sock.write(bytes)
   end
   conn.on(:frame_sent) do |frame|
     puts "Sent frame: #{frame.inspect}"
@@ -76,9 +94,35 @@ loop do
         'content-type' => 'text/plain',
       }, end_stream: false)
 
+      if options[:push]
+        push_streams = []
+
+        # send 10 promises
+        10.times do |i|
+          puts 'sending push'
+
+          head = { ':method' => 'GET',
+                   ':authority' => 'localhost',
+                   ':scheme' => 'https',
+                   ':path' => "/other_resource/#{i}" }
+
+          stream.promise(head) do |push|
+            push.headers(':status' => '200', 'content-type' => 'text/plain', 'content-length' => '11')
+            push_streams << push
+          end
+        end
+      end
+
       # split response into multiple DATA frames
       stream.data(response.slice!(0, 5), end_stream: false)
       stream.data(response)
+
+      if options[:push]
+        push_streams.each_with_index do |push, i|
+          sleep 1
+          push.data("push_data #{i}")
+        end
+      end
     end
   end
 

data/example/upgrade_server.rb

@@ -1,6 +1,7 @@
+# frozen_string_literals: true
+
 require_relative 'helper'
 require 'http_parser'
-require 'base64'
 
 options = { port: 8080 }
 OptionParser.new do |opts|
@@ -20,15 +21,24 @@ server = TCPServer.new(options[:port])
 
 if options[:secure]
   ctx = OpenSSL::SSL::SSLContext.new
-  ctx.cert = OpenSSL::X509::Certificate.new(File.open('keys/mycert.pem'))
-  ctx.key = OpenSSL::PKey::RSA.new(File.open('keys/mykey.pem'))
+  ctx.cert = OpenSSL::X509::Certificate.new(File.open('keys/server.crt'))
+  ctx.key = OpenSSL::PKey::RSA.new(File.open('keys/server.key'))
   ctx.npn_protocols = [DRAFT]
 
   server = OpenSSL::SSL::SSLServer.new(server, ctx)
 end
 
+def request_header_hash
+  Hash.new do |hash, key|
+    k = key.to_s.downcase
+    k.tr! '_', '-'
+    _, value = hash.find { |header_key, _| header_key.downcase == k }
+    hash[key] = value if value
+  end
+end
+
 class UpgradeHandler
-  VALID_UPGRADE_METHODS = %w(GET OPTIONS)
+  VALID_UPGRADE_METHODS = %w(GET OPTIONS).freeze
   UPGRADE_RESPONSE = <<-RESP
 HTTP/1.1 101 Switching Protocols
 Connection: Upgrade
@@ -41,6 +51,7 @@ RESP
   def initialize(conn, sock)
     @conn, @sock = conn, sock
     @complete, @parsing = false, false
+    @headers = request_header_hash
     @body = ''
     @parser = ::HTTP::Parser.new(self)
   end
@@ -68,7 +79,7 @@ RESP
   end
 
   def on_headers_complete(headers)
-    @headers = headers
+    @headers.merge! headers
   end
 
   def on_body(chunk)
@@ -100,7 +111,8 @@ loop do
 
   conn.on(:stream) do |stream|
     log = Logger.new(stream.id)
-    req, buffer = {}, ''
+    req = request_header_hash
+    buffer = ''
 
     stream.on(:active) { log.info 'client opened new stream' }
     stream.on(:close) do
@@ -108,7 +120,7 @@ loop do
     end
 
     stream.on(:headers) do |h|
-      req = Hash[*h.flatten]
+      req.merge! Hash[*h.flatten]
       log.info "request headers: #{h}"
     end
 
@@ -122,9 +134,7 @@ loop do
 
       if req['Upgrade']
         log.info "Processing h2c Upgrade request: #{req}"
-
-        # Don't respond to OPTIONS...
-        if req[':method'] != 'OPTIONS'
+        if req[':method'] != 'OPTIONS' # Don't respond to OPTIONS...
           response = 'Hello h2c world!'
           stream.headers({
             ':status' => '200',

data/lib/http/2/buffer.rb

@@ -1,35 +1,61 @@
+require 'forwardable'
+
 module HTTP2
-  # Simple binary buffer backed by string.
-  #
-  # TODO: Refactor, it would be better if Buffer were not a String subclass,
-  # but rather wrap a string and only expose the mutating API needed so that
-  # the possible surface for things to go wrong stays controllable.
-  # - https://github.com/igrigorik/http-2/pull/46
+  # Binary buffer wraps String.
   #
-  class Buffer < String
+  class Buffer
+    extend Forwardable
+
+    def_delegators :@buffer, :ord, :encoding, :setbyte, :unpack,
+                   :size, :each_byte, :to_str, :to_s, :length, :inspect,
+                   :[], :[]=, :empty?, :bytesize, :include?
+
     UINT32 = 'N'.freeze
     private_constant :UINT32
 
     # Forces binary encoding on the string
-    def initialize(*)
-      super.force_encoding(Encoding::BINARY)
+    def initialize(str = '')
+      str = str.dup if str.frozen?
+      @buffer = str.force_encoding(Encoding::BINARY)
     end
 
     # Emulate StringIO#read: slice first n bytes from the buffer.
     #
     # @param n [Integer] number of bytes to slice from the buffer
     def read(n)
-      Buffer.new(slice!(0, n))
+      Buffer.new(@buffer.slice!(0, n))
     end
 
-    # Alias getbyte to readbyte
-    alias_method :readbyte, :getbyte
-
     # Emulate StringIO#getbyte: slice first byte from buffer.
     def getbyte
       read(1).ord
     end
 
+    def slice!(*args)
+      Buffer.new(@buffer.slice!(*args))
+    end
+
+    def slice(*args)
+      Buffer.new(@buffer.slice(*args))
+    end
+
+    def force_encoding(*args)
+      @buffer = @buffer.force_encoding(*args)
+    end
+
+    def ==(other)
+      @buffer == other
+    end
+
+    def +(other)
+      @buffer += other
+    end
+
+    # Emulate String#getbyte: return nth byte from buffer.
+    def readbyte(n)
+      @buffer[n].ord
+    end
+
     # Slice unsigned 32-bit integer from buffer.
     # @return [Integer]
     def read_uint32
@@ -41,7 +67,9 @@ module HTTP2
     [:<<, :prepend].each do |mutating_method|
       define_method(mutating_method) do |string|
         string = string.dup if string.frozen?
-        super(string.force_encoding(Encoding::BINARY))
+        @buffer.send mutating_method, string.force_encoding(Encoding::BINARY)
+
+        self
       end
     end
   end

data/lib/http/2/compressor.rb

@@ -527,12 +527,12 @@ module HTTP2
 
         case header[:type]
         when :indexed
-          fail CompressionError if header[:name] == 0
+          fail CompressionError if (header[:name]).zero?
           header[:name] -= 1
         when :changetablesize
           header[:value] = header[:name]
         else
-          if header[:name] == 0
+          if (header[:name]).zero?
             header[:name] = string(buf)
           else
             header[:name] -= 1

data/lib/http/2/connection.rb

@@ -56,7 +56,7 @@ module HTTP2
     # infinity, but is automatically updated on receipt of peer settings).
     attr_reader :local_window
     attr_reader :remote_window
-    alias_method :window, :local_window
+    alias window local_window
 
     # Current settings value for local and peer
     attr_reader :local_settings
@@ -81,6 +81,7 @@ module HTTP2
 
       @active_stream_count = 0
       @streams = {}
+      @streams_recently_closed = {}
       @pending_settings = []
 
       @framer = Framer.new
@@ -226,6 +227,10 @@ module HTTP2
         else
           case frame[:type]
           when :headers
+            # When server receives even-numbered stream identifier,
+            # the endpoint MUST respond with a connection error of type PROTOCOL_ERROR.
+            connection_error if frame[:stream].even? && self.is_a?(Server)
+
             # The last frame in a sequence of HEADERS/CONTINUATION
             # frames MUST have the END_HEADERS flag set.
             unless frame[:flags].include? :end_headers
@@ -278,6 +283,12 @@ module HTTP2
             parent = @streams[frame[:stream]]
             pid = frame[:promise_stream]
 
+            # if PUSH parent is recently closed, RST_STREAM the push
+            if @streams_recently_closed[frame[:stream]]
+              send(type: :rst_stream, stream: pid, error: :refused_stream)
+              return
+            end
+
             connection_error(msg: 'missing parent ID') if parent.nil?
 
             unless parent.state == :open || parent.state == :half_closed_local
@@ -330,7 +341,7 @@ module HTTP2
       raise if e.is_a?(Error::Error)
       connection_error(e: e)
     end
-    alias_method :<<, :receive
+    alias << receive
 
     private
 
@@ -364,12 +375,10 @@ module HTTP2
     # @param frame [Hash]
     # @return [Array of Buffer] encoded frame
     def encode(frame)
-      frames = []
-
-      if frame[:type] == :headers || frame[:type] == :push_promise
-        frames = encode_headers(frame) # HEADERS and PUSH_PROMISE may create more than one frame
+      frames = if frame[:type] == :headers || frame[:type] == :push_promise
+        encode_headers(frame) # HEADERS and PUSH_PROMISE may create more than one frame
       else
-        frames = [frame]               # otherwise one frame
+        [frame]               # otherwise one frame
       end
 
       frames.map { |f| @framer.generate(f) }
@@ -381,7 +390,7 @@ module HTTP2
     # @param frame [Hash]
     # @return [Boolean]
     def connection_frame?(frame)
-      frame[:stream] == 0 ||
+      (frame[:stream]).zero? ||
         frame[:type] == :settings ||
         frame[:type] == :ping ||
         frame[:type] == :goaway
@@ -447,11 +456,11 @@ module HTTP2
             # Clients MUST reject any attempt to change the
             # SETTINGS_ENABLE_PUSH setting to a value other than 0 by treating the
             # message as a connection error (Section 5.4.1) of type PROTOCOL_ERROR.
-            return ProtocolError.new("invalid #{key} value") unless v == 0
+            return ProtocolError.new("invalid #{key} value") unless v.zero?
           when :client
             # Any value other than 0 or 1 MUST be treated as a
             # connection error (Section 5.4.1) of type PROTOCOL_ERROR.
-            unless v == 0 || v == 1
+            unless v.zero? || v == 1
               return ProtocolError.new("invalid #{key} value")
             end
           end
@@ -485,7 +494,7 @@ module HTTP2
     #
     # @param frame [Hash]
     def connection_settings(frame)
-      connection_error unless frame[:type] == :settings && frame[:stream] == 0
+      connection_error unless frame[:type] == :settings && (frame[:stream]).zero?
 
       # Apply settings.
       #  side =
@@ -576,7 +585,7 @@ module HTTP2
     #
     # @param frame [Hash]
     def decode_headers(frame)
-      if frame[:payload].is_a? String
+      if frame[:payload].is_a? Buffer
         frame[:payload] = @decompressor.decode(frame[:payload])
       end
 
@@ -590,11 +599,11 @@ module HTTP2
     # @return [Array of Frame]
     def encode_headers(frame)
       payload = frame[:payload]
-      payload = @compressor.encode(payload) unless payload.is_a? String
+      payload = @compressor.encode(payload) unless payload.is_a? Buffer
 
       frames = []
 
-      while payload.size > 0
+      while payload.bytesize > 0
         cont = frame.dup
         cont[:type] = :continuation
         cont[:flags] = []
@@ -632,7 +641,18 @@ module HTTP2
       # states count toward the maximum number of streams that an endpoint is
       # permitted to open.
       stream.once(:active) { @active_stream_count += 1 }
-      stream.once(:close)  { @active_stream_count -= 1 }
+      stream.once(:close) do
+        @streams.delete id
+        @active_stream_count -= 1
+
+        # Store a reference to the closed stream, such that we can respond
+        # to any in-flight frames while close is registered on both sides.
+        # References to such streams will be purged whenever another stream
+        # is closed, with a minimum of 15s RTT time window.
+        @streams_recently_closed.delete_if { |_, v| (Time.now - v) > 15 }
+        @streams_recently_closed[id] = Time.now
+      end
+
       stream.on(:promise, &method(:promise)) if self.is_a? Server
       stream.on(:frame,   &method(:send))
       stream.on(:window_update, &method(:window_update))
@@ -656,7 +676,9 @@ module HTTP2
 
       @state, @error = :closed, error
       klass = error.to_s.split('_').map(&:capitalize).join
-      fail Error.const_get(klass), msg || e.message, e.backtrace || []
+      msg ||= e && e.message
+      backtrace = (e && e.backtrace) || []
+      fail Error.const_get(klass), msg, backtrace
     end
   end
 end

data/lib/http/2/emitter.rb

@@ -11,7 +11,7 @@ module HTTP2
       fail ArgumentError, 'must provide callback' unless block_given?
       listeners(event.to_sym).push block
     end
-    alias_method :on, :add_listener
+    alias on add_listener
 
     # Subscribe to next event (at most once) for specified type.
     #