plum 0.2.2 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3671dbbd1de29adc6a254e5c95cef0a20cce6970
-  data.tar.gz: efd31623c389dbefb5d8d46de2f4f1233d72470e
+  metadata.gz: 01ad5df7a9751026ab7dfef37ff76b47de82bdb8
+  data.tar.gz: 7618f58b020da6661e9d5c89974d1fe175d89651
 SHA512:
-  metadata.gz: e8dd0b9146d5261854136d69c4bcbbe471f31daeb1785b3219779c5ad8daa76bfab82763a383e308b2c17f2fe6ec127a7c8b293ab59a33c22bb7123ecd9ccaab
-  data.tar.gz: 035f11f0270f7fb7c7c95cae95993edcf4e924d6f10643928a53f5bcbee8501b13f66b537eb2875607abf2b87f9c0fd3fd16de1241c525d91742505f2b6909f8
+  metadata.gz: 11175e66083c4fae1c42301c35ce8b56b2fcf6540dffe68eb890a0a5a56e79e90f34ca744c4c63f20a834abfdba787857c5c906852aae6c9e6ae450af9f58ca6
+  data.tar.gz: 95ce217f9ed15a9508d67f13903354aed565a58876d15b98a9458c8b400736bfe1def86d9ab091c3ff29902dbbd699986cb08e78216e54419536036216511473

data/.gitignore

@@ -1,5 +1,6 @@
 /.bundle/
 /.yardoc
+/.ruby-version
 /Gemfile.lock
 /_yardoc/
 /coverage/

data/.travis.yml

@@ -4,11 +4,11 @@ addons:
     repo_token: f5092ab344fac7f2de9d7332e00597642a4d24e3d560f7d7f329172a2e5a2def
 install:
   - echo openssl_url=https://www.openssl.org/source >> $rvm_path/user/db
-  - echo openssl_version=1.0.2d >> $rvm_path/user/db
+  - echo openssl_version=1.0.2e >> $rvm_path/user/db
   - rvm pkg install openssl
   - $rvm_path/usr/bin/openssl version
-  - rvm install 2.2.3-alpn --patch https://gist.githubusercontent.com/rhenium/b1711edcc903e8887a51/raw/2309e469f5a3ba15917d804ac61b19e62b3d8faf/ruby-openssl-alpn-no-tests-and-docs.patch --with-openssl-dir=$rvm_path/usr
-  - rvm use 2.2.3-alpn
+  - rvm install ruby-head --with-openssl-dir=$rvm_path/usr
+  - rvm use ruby-head
   - bundle install
 script:
   - bundle exec rake test

data/README.md

@@ -6,9 +6,7 @@ WARNING: Plum is currently under heavy development. You *will* encounter bugs wh
 [![Circle CI](https://circleci.com/gh/rhenium/plum.svg?style=svg)](https://circleci.com/gh/rhenium/plum) [![Build Status](https://travis-ci.org/rhenium/plum.png?branch=master)](https://travis-ci.org/rhenium/plum) [![Code Climate](https://codeclimate.com/github/rhenium/plum/badges/gpa.svg)](https://codeclimate.com/github/rhenium/plum) [![Test Coverage](https://codeclimate.com/github/rhenium/plum/badges/coverage.svg)](https://codeclimate.com/github/rhenium/plum/coverage)
 
 ## Requirements
-* Ruby
-  * Ruby 2.2 with [ALPN support patch](https://gist.github.com/rhenium/b1711edcc903e8887a51) and [ECDH support patch (r51348)](https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/51348/diff?format=diff)
-  * or latest Ruby 2.3.0-dev
+* Ruby 2.3
 * OpenSSL 1.0.2 or newer (HTTP/2 requires ALPN)
 * Optional:
   * [http_parser.rb gem](https://rubygems.org/gems/http_parser.rb) (HTTP/1.x parser; if you use "http" URI scheme)
@@ -63,7 +61,7 @@ If the server does't support HTTP/2, `Plum::Client` tries to use HTTP/1.x instea
    +-----------------+
             v "https"
    +-----------------+
-   | ALPN(/NPN)      | failed
+   | ALPN            | failed
    | negotiation     |-------> HTTP/1.x
    +-----------------+
             | "h2"

data/circle.yml

@@ -4,15 +4,15 @@ machine:
 dependencies:
   pre:
     - echo openssl_url=https://www.openssl.org/source >> $rvm_path/user/db
-    - echo openssl_version=1.0.2d >> $rvm_path/user/db
+    - echo openssl_version=1.0.2e >> $rvm_path/user/db
     - rvm pkg install openssl
     - >
       case $CIRCLE_NODE_INDEX in
         0)
-          rvm install 2.2.3-alpn --with-openssl-dir=$rvm_path/usr --patch https://gist.githubusercontent.com/rhenium/b1711edcc903e8887a51/raw/2309e469f5a3ba15917d804ac61b19e62b3d8faf/ruby-openssl-alpn-no-tests-and-docs.patch
-          rvm use 2.2.3-alpn --default
+          rvm install ruby-2.3.0 --with-openssl-dir=$rvm_path/usr
+          rvm use ruby-2.3.0 --default
           ;;
-        1)
+        0)
           rvm install ruby-head --with-openssl-dir=$rvm_path/usr
           rvm use ruby-head --default
           ;;

data/examples/non_tls_server.rb

@@ -25,7 +25,7 @@ loop do
     next
   end
 
-  plum = Plum::HTTPServerConnection.new(sock)
+  plum = Plum::HTTPServerConnection.new(sock.method(:write))
 
   plum.on(:frame) do |frame|
     log(id, frame.stream_id, "recv: #{frame.inspect}")

data/examples/rack-example-config.rb

@@ -0,0 +1,24 @@
+log "logs/plum.log"
+debug false
+server_push true
+threaded false # create a new thread per request
+fallback_legacy "127.0.0.1:8080" # forward if client doesn't support HTTP/2
+
+user "nobody"
+group "nobody"
+
+# listeners may be multiple
+listener :unix, { path: "/tmp/plum.sock", mode: 600 }
+listener :tcp, { hostname: "0.0.0.0", port: 80 }
+listener :tls, {
+  hostname: "0.0.0.0",
+  port: 443,
+  certificate: "/path/to/cert", # chained certifcate is acceptable
+  certificate_key: "/path/to/key",
+  sni: {
+    "rhe.jp" => { # SNI, key must be String. If none matches, default certificate (above) is used
+      certificate: "/path/to/rhe.jp/cert",
+      certificate_key: "/path/to/rhe.jp/key"
+    },
+  }
+}

data/examples/static_server.rb

@@ -43,7 +43,7 @@ loop do
     next
   end
 
-  plum = Plum::HTTPSServerConnection.new(sock)
+  plum = Plum::ServerConnection.new(sock.method(:write))
 
   plum.on(:frame) do |frame|
     log(id, frame.stream_id, "recv: #{frame.inspect}")

data/lib/plum.rb

@@ -21,7 +21,7 @@ require "plum/connection"
 require "plum/stream_utils"
 require "plum/stream"
 require "plum/server/connection"
-require "plum/server/https_connection"
+require "plum/server/ssl_socket_connection"
 require "plum/server/http_connection"
 require "plum/client"
 require "plum/client/response"

data/lib/plum/client.rb

@@ -143,8 +143,7 @@ module Plum
         @socket.connect
         @socket.post_connection_check(@config[:hostname]) if ctx.verify_mode != OpenSSL::SSL::VERIFY_NONE
 
-        @socket.respond_to?(:alpn_protocol) && @socket.alpn_protocol == "h2" ||
-          @socket.respond_to?(:npn_protocol) && @socket.npn_protocol == "h2"
+        @socket.alpn_protocol == "h2"
       end
     end
 
@@ -175,15 +174,8 @@ module Plum
       cert_store.set_default_paths
       ctx.cert_store = cert_store
       if @config[:http2]
-        ctx.ciphers = "ALL:!" + HTTPSServerConnection::CIPHER_BLACKLIST.join(":!")
-        if ctx.respond_to?(:alpn_protocols)
-          ctx.alpn_protocols = ["h2", "http/1.1"]
-        end
-        if ctx.respond_to?(:npn_select_cb) # TODO: RFC 7540 does not define protocol negotiation with NPN
-          ctx.npn_select_cb = -> protocols {
-            protocols.include?("h2") ? "h2" : protocols.first
-         }
-        end
+        ctx.ciphers = "ALL:!" + SSLSocketServerConnection::CIPHER_BLACKLIST.join(":!")
+        ctx.alpn_protocols = ["h2", "http/1.1"]
       end
       ctx
     end

data/lib/plum/client/client_session.rb

@@ -64,6 +64,10 @@ module Plum
         response._fail
         raise ex
       }
+      stream.on(:local_stream_error) { |type|
+        response.fail
+        raise LocalStreamError.new(type)
+      }
       response
     end
 

data/lib/plum/connection_utils.rb

@@ -19,9 +19,9 @@ module Plum
 
     # Sends GOAWAY frame to the peer and closes the connection.
     # @param error_type [Symbol] The error type to be contained in the GOAWAY frame.
-    def goaway(error_type = :no_error)
+    def goaway(error_type = :no_error, message = "")
       last_id = @max_stream_ids.max
-      send_immediately Frame.goaway(last_id, error_type)
+      send_immediately Frame.goaway(last_id, error_type, message)
     end
 
     # Returns whether peer enables server push or not

data/lib/plum/event_emitter.rb

@@ -5,18 +5,14 @@ module Plum
     # @param name [Symbol] The name of event.
     # @yield Gives event-specific parameters.
     def on(name, &blk)
-      (callbacks[name] ||= []) << blk
+      @callbacks ||= {}
+      (@callbacks[name] ||= []) << blk
     end
 
     # Invokes an event and call handlers with args.
     # @param name [Symbol] The identifier of event.
     def callback(name, *args)
-      (cbs = callbacks[name]) && cbs.each {|cb| cb.call(*args) }
-    end
-
-    private
-    def callbacks
-      @callbacks ||= {}
+      @callbacks&.[](name)&.each { |cb| cb.call(*args) }
     end
   end
 end

data/lib/plum/frame_factory.rb

@@ -17,7 +17,7 @@ module Plum
     # @param message [String] Additional debug data.
     # @see RFC 7540 Section 6.8
     def goaway(last_id, error_type, message = "")
-      payload = String.new.push_uint32((last_id || 0) | (0 << 31))
+      payload = String.new.push_uint32(last_id)
                           .push_uint32(HTTPError::ERROR_CODES[error_type])
                           .push(message)
       Frame.new(type: :goaway, stream_id: 0, payload: payload)
@@ -55,10 +55,9 @@ module Plum
     # @param stream_id [Integer] The stream ID.
     # @param payload [String] Payload.
     # @param end_stream [Boolean] add END_STREAM flag
-    def data(stream_id, payload, end_stream: false)
-      payload = payload.b if payload && payload.encoding != Encoding::BINARY
-      fval = 0
-      fval += 1 if end_stream
+    def data(stream_id, payload = "", end_stream: false)
+      payload = payload.b if payload&.encoding != Encoding::BINARY
+      fval = end_stream ? 1 : 0
       Frame.new(type_value: 0, stream_id: stream_id, flags_value: fval, payload: payload)
     end
 
@@ -68,8 +67,7 @@ module Plum
     # @param end_stream [Boolean] add END_STREAM flag
     # @param end_headers [Boolean] add END_HEADERS flag
     def headers(stream_id, encoded, end_stream: false, end_headers: false)
-      fval = 0
-      fval += 1 if end_stream
+      fval = end_stream ? 1 : 0
       fval += 4 if end_headers
       Frame.new(type_value: 1, stream_id: stream_id, flags_value: fval, payload: encoded)
     end
@@ -82,8 +80,7 @@ module Plum
     def push_promise(stream_id, new_id, encoded, end_headers: false)
       payload = String.new.push_uint32(new_id)
                           .push(encoded)
-      fval = 0
-      fval += 4 if end_headers
+      fval = end_headers ? 4 : 0
       Frame.new(type: :push_promise, stream_id: stream_id, flags_value: fval, payload: payload)
     end
 
@@ -92,7 +89,7 @@ module Plum
     # @param payload [String] Payload.
     # @param end_headers [Boolean] add END_HEADERS flag
     def continuation(stream_id, payload, end_headers: false)
-      Frame.new(type: :continuation, stream_id: stream_id, flags_value: (end_headers && 4 || 0), payload: payload)
+      Frame.new(type: :continuation, stream_id: stream_id, flags_value: (end_headers ? 4 : 0), payload: payload)
     end
   end
 end

data/lib/plum/hpack/context.rb

@@ -36,18 +36,21 @@ module Plum
       end
 
       def search(name, value)
-        pr = proc { |n, v|
-          n == name && (!value || v == value)
-        }
+        si = STATIC_TABLE.index { |n, v| n == name && v == value }
+        return si + 1 if si
+        di = @dynamic_table.index { |n, v| n == name && v == value }
+        return di + STATIC_TABLE_SIZE + 1 if di
+      end
 
-        si = STATIC_TABLE.index &pr
+      def search_half(name)
+        si = STATIC_TABLE.index { |n, v| n == name }
         return si + 1 if si
-        di = @dynamic_table.index &pr
+        di = @dynamic_table.index { |n, v| n == name }
         return di + STATIC_TABLE_SIZE + 1 if di
       end
 
       def evict
-        while @limit && @size > @limit
+        while @size > @limit
           name, value = @dynamic_table.pop
           @size -= name.bytesize + value.bytesize + 32
         end

data/lib/plum/hpack/encoder.rb

@@ -12,13 +12,13 @@ module Plum
         @huffman = huffman
       end
       def encode(headers)
-        out = String.new.force_encoding(Encoding::BINARY)
+        out = "".b
         headers.each do |name, value|
           name = name.to_s
           value = value.to_s
           if index = search(name, value)
             out << encode_indexed(index)
-          elsif index = search(name, nil)
+          elsif index = search_half(name)
             out << encode_half_indexed(index, value)
           else
             out << encode_literal(name, value)

data/lib/plum/rack/cli.rb

@@ -35,7 +35,7 @@ module Plum
 
       def transform_options
         if @options[:config]
-          dsl = DSL::Config.new.instance_eval(File.read(@options[:config]))
+          dsl = DSL::Config.new.tap { |c| c.instance_eval(File.read(@options[:config])) }
           config = dsl.config
         else
           config = Config.new

data/lib/plum/rack/dsl.rb

@@ -49,6 +49,14 @@ module Plum
           @config[:fallback_legacy_host] = h
           @config[:fallback_legacy_port] = p.to_i
         end
+
+        def user(username)
+          @config[:user] = username
+        end
+
+        def group(groupname)
+          @config[:group] = groupname
+        end
       end
     end
   end

data/lib/plum/rack/listener.rb

@@ -25,7 +25,7 @@ module Plum
       end
 
       def plum(sock)
-        ::Plum::HTTPServerConnection.new(sock)
+        ::Plum::HTTPServerConnection.new(sock.method(:write))
       end
     end
 
@@ -41,34 +41,42 @@ module Plum
 
         ctx = OpenSSL::SSL::SSLContext.new
         ctx.ssl_version = :TLSv1_2
-        ctx.alpn_select_cb = -> protocols {
-          if protocols.include?("h2")
-            "h2"
+        ctx.alpn_select_cb = -> (protocols) { protocols.include?("h2") ? "h2" : protocols.first }
+        ctx.tmp_ecdh_callback = -> (sock, ise, keyl) { OpenSSL::PKey::EC.new("prime256v1") }
+        *ctx.extra_chain_cert, ctx.cert = parse_chained_cert(cert)
+        ctx.key = OpenSSL::PKey::RSA.new(key)
+        ctx.servername_cb = proc { |sock, hostname|
+          if host = lc[:sni]&.[](hostname)
+            new_ctx = ctx.dup
+            *new_ctx.extra_chain_cert, new_ctx.cert = parse_chained_cert(File.read(host[:certificate]))
+            new_ctx.key = OpenSSL::PKey::RSA.new(File.read(host[:certificate_key]))
+            new_ctx
           else
-            protocols.first
+            ctx
           end
         }
-        ctx.tmp_ecdh_callback = -> (sock, ise, keyl) { OpenSSL::PKey::EC.new("prime256v1") }
-        ctx.cert = OpenSSL::X509::Certificate.new(cert)
-        ctx.key = OpenSSL::PKey::RSA.new(key)
         tcp_server = ::TCPServer.new(lc[:hostname], lc[:port])
         @server = OpenSSL::SSL::SSLServer.new(tcp_server, ctx)
         @server.start_immediately = false
       end
 
+      def parse_chained_cert(str)
+        str.scan(/-----BEGIN CERTIFICATE.+?END CERTIFICATE-----/m).map { |s| OpenSSL::X509::Certificate.new(s) }
+      end
+
       def to_io
         @server.to_io
       end
 
       def plum(sock)
-        raise ::Plum::LegacyHTTPError.new("client doesn't offered h2 with ALPN", nil) unless sock.alpn_protocol == "h2"
-        ::Plum::HTTPSServerConnection.new(sock)
+        raise ::Plum::LegacyHTTPError.new("client didn't offer h2 with ALPN", nil) unless sock.alpn_protocol == "h2"
+        ::Plum::ServerConnection.new(sock.method(:write))
       end
 
       private
       # returns: [cert, key]
       def dummy_key
-        puts "WARNING: Generating new dummy certificate..."
+        STDERR.puts "WARNING: Generating new dummy certificate..."
 
         key = OpenSSL::PKey::RSA.new(2048)
         cert = OpenSSL::X509::Certificate.new
@@ -84,13 +92,10 @@ module Plum
         ef.issuer_certificate = cert
         cert.extensions = [
           ef.create_extension("basicConstraints", "CA:TRUE", true),
-          ef.create_extension("subjectKeyIdentifier", "hash"),
         ]
-        cert.add_extension ef.create_extension("authorityKeyIdentifier", "keyid:always,issuer:always")
-
-        cert.sign key, OpenSSL::Digest::SHA1.new
+        cert.sign(key, OpenSSL::Digest::SHA256.new)
 
-        [cert, key]
+        [cert.to_s, key.to_s]
       end
     end
 
@@ -122,7 +127,7 @@ module Plum
       end
 
       def plum(sock)
-        ::Plum::HTTPSServerConnection.new(sock)
+        ::Plum::ServerConnection.new(sock.method(:write))
       end
     end
   end

data/lib/plum/rack/server.rb

@@ -17,6 +17,10 @@ module Plum
 
         @logger.info("Plum #{::Plum::VERSION}")
         @logger.info("Config: #{config}")
+
+        if @config[:user]
+          drop_privileges
+        end
       end
 
       def start
@@ -100,6 +104,24 @@ module Plum
       ensure
         upstream.close if upstream
       end
+
+      def drop_privileges
+        begin
+          user = @config[:user]
+          group = @config[:group] || user
+          @logger.info "Dropping process privilege to #{user}:#{group}"
+
+          cuid, cgid = Process.euid, Process.egid
+          tuid, tgid = Etc.getpwnam(user).uid, Etc.getgrnam(group).gid
+
+          Process.initgroups(user, tgid)
+          Process::GID.change_privilege(tgid)
+          Process::UID.change_privilege(tuid)
+        rescue Errno::EPERM => e
+          @ogger.fatal "Could not change privilege: #{e}"
+          exit 2
+        end
+      end
     end
   end
 end

data/lib/plum/rack/session.rb

@@ -28,9 +28,6 @@ module Plum
         while !@sock.closed? && !@sock.eof?
           @plum << @sock.readpartial(1024)
         end
-      rescue Errno::EPIPE, Errno::ECONNRESET => e
-      rescue StandardError => e
-        @logger.error("#{e.class}: #{e.message}\n#{e.backtrace.map { |b| "\t#{b}" }.join("\n")}")
       ensure
         @request_thread.each { |stream, thread| thread.kill }
         stop
@@ -38,10 +35,6 @@ module Plum
 
       private
       def setup_plum
-        @plum.on(:frame) { |f| puts "recv:#{f.inspect}" }
-        @plum.on(:send_frame) { |f|
-          puts "send:#{f.inspect}" unless f.type == :data
-        }
         @plum.on(:connection_error) { |ex| @logger.error(ex) }
 
         # @plum.on(:stream) { |stream| @logger.debug("new stream: #{stream}") }
@@ -90,7 +83,7 @@ module Plum
             end
           else
             body.each { |part| stream.send_data(part, end_stream: false) }
-            stream.send_data(nil, end_stream: true)
+            stream.send_data(end_stream: true)
           end
         ensure
           body.close if body.respond_to?(:close)
@@ -98,47 +91,53 @@ module Plum
       end
 
       def extract_push(reqheaders, extheaders)
-        if @config[:server_push] && @plum.push_enabled? && pushs = extheaders["plum.serverpush"]
-          authority = reqheaders.find { |k, v| k == ":authority" }[1]
-          scheme = reqheaders.find { |k, v| k == ":scheme" }[1]
-
-          pushs.split(";").map { |push|
-            method, path = push.split(" ", 2)
-            {
-              ":authority" => authority,
-              ":method" => method.upcase,
-              ":scheme" => scheme,
-              ":path" => path
-            }
+        pushs = extheaders["plum.serverpush"]
+        return nil unless pushs
+
+        authority = reqheaders.find { |k, v| k == ":authority" }[1]
+        scheme = reqheaders.find { |k, v| k == ":scheme" }[1]
+
+        pushs.split(";").map { |push|
+          method, path = push.split(" ", 2)
+          {
+            ":authority" => authority,
+            ":method" => method.upcase,
+            ":scheme" => scheme,
+            ":path" => path
           }
-        else
-          []
-        end
+        }
       end
 
       def handle_request(stream, headers, data)
         env = new_env(headers, data)
         r_status, r_rawheaders, r_body = @app.call(env)
         r_headers, r_extheaders = extract_headers(r_status, r_rawheaders)
+        if @config[:server_push] && @plum.push_enabled?
+          push_preqs = extract_push(headers, r_extheaders)
+        end
 
         no_body = r_body.respond_to?(:empty?) && r_body.empty?
 
         stream.send_headers(r_headers, end_stream: no_body)
 
-        push_sts = extract_push(headers, r_extheaders).map { |preq|
-          [stream.promise(preq), preq]
-        }
+        if push_preqs
+          push_preqs.map! { |preq|
+            [stream.promise(preq), preq]
+          }
+        end
 
         send_body(stream, r_body) unless no_body
 
-        push_sts.each { |st, preq|
-          penv = new_env(preq, "".b)
-          p_status, p_h, p_body = @app.call(penv)
-          p_headers, _ = extract_headers(p_status, p_h)
-          pno_body = p_body.respond_to?(:empty?) && p_body.empty?
-          st.send_headers(p_headers, end_stream: pno_body)
-          send_body(st, p_body) unless pno_body
-        }
+        if push_preqs
+          push_preqs.each { |st, preq|
+            penv = new_env(preq, "".b)
+            p_status, p_h, p_body = @app.call(penv)
+            p_headers, _ = extract_headers(p_status, p_h)
+            pno_body = p_body.respond_to?(:empty?) && p_body.empty?
+            st.send_headers(p_headers, end_stream: pno_body)
+            send_body(st, p_body) unless pno_body
+          }
+        end
 
         @request_thread.delete(stream)
       end

data/lib/plum/server/http_connection.rb

@@ -3,20 +3,11 @@ using Plum::BinaryString
 
 module Plum
   class HTTPServerConnection < ServerConnection
-    attr_reader :sock
-
-    def initialize(sock, local_settings = {})
+    def initialize(writer, local_settings = {})
       require "http/parser"
-      @sock = sock
       @negobuf = String.new
       @_http_parser = setup_parser
-      super(@sock.method(:write), local_settings)
-    end
-
-    # Closes the socket.
-    def close
-      super
-      @sock.close
+      super(writer, local_settings)
     end
 
     private
@@ -68,7 +59,7 @@ module Plum
              "Server: plum/#{Plum::VERSION}\r\n" +
              "\r\n"
 
-      @sock.write(resp)
+      @writer.call(resp)
     end
 
     def process_first_request(parser, headers, body)

data/lib/plum/server/{https_connection.rb → ssl_socket_connection.rb}

@@ -1,6 +1,6 @@
 # -*- frozen-string-literal: true -*-
 module Plum
-  class HTTPSServerConnection < ServerConnection
+  class SSLSocketServerConnection < ServerConnection
     attr_reader :sock
 
     def initialize(sock, local_settings = {})

data/lib/plum/stream.rb

@@ -237,11 +237,7 @@ module Plum
       @state = :closed # MUST NOT send RST_STREAM
 
       error_code = frame.payload.uint32
-      if error_code > 0
-        raise LocalStreamError.new(HTTPError::ERROR_CODES.key(error_code))
-      else
-        callback(:rst_stream, frame)
-      end
+      callback(:rst_stream, HTTPError::ERROR_CODES.key(error_code))
     end
 
     # override EventEmitter

data/lib/plum/stream_utils.rb

@@ -28,7 +28,7 @@ module Plum
     # Sends DATA frame. If the data is larger than MAX_FRAME_SIZE, DATA frame will be splitted.
     # @param data [String, IO] The data to send.
     # @param end_stream [Boolean] Set END_STREAM flag or not.
-    def send_data(data, end_stream: true)
+    def send_data(data = "", end_stream: true)
       max = @connection.remote_settings[:max_frame_size]
       if data.is_a?(IO)
         until data.eof?

data/lib/plum/version.rb

@@ -1,4 +1,4 @@
 # -*- frozen-string-literal: true -*-
 module Plum
-  VERSION = "0.2.2"
+  VERSION = "0.2.8"
 end

data/test/plum/client/test_client.rb

@@ -112,7 +112,7 @@ class ClientTest < Minitest::Test
       begin
         Timeout.timeout(1) {
           sock = ssl_server.accept
-          plum = HTTPSServerConnection.new(sock)
+          plum = ServerConnection.new(sock.method(:write))
 
           plum.on(:stream) { |stream|
             headers = data = nil

data/test/plum/hpack/test_context.rb

@@ -38,6 +38,8 @@ class HPACKContextTest < Minitest::Test
     context = new_context
     i1 = context.search(":method", "POST")
     assert_equal(3, i1)
+    i2 = context.search_half(":method")
+    assert_equal(2, i2)
   end
 
   def test_search_dynamic
@@ -48,7 +50,7 @@ class HPACKContextTest < Minitest::Test
     assert_equal(63, i1)
     i2 = context.search("あああ", "AAA")
     assert_equal(nil, i2)
-    i3 = context.search("あああ", nil)
+    i3 = context.search_half("あああ")
     assert_equal(62, i3)
   end
 

data/test/plum/server/{test_https_connection.rb → test_connection.rb}

@@ -4,21 +4,21 @@ using Plum::BinaryString
 
 class HTTPSConnectionNegotiationTest < Minitest::Test
   def test_server_must_raise_cprotocol_error_invalid_magic_short
-    con = HTTPSServerConnection.new(StringIO.new)
+    con = ServerConnection.new(StringIO.new.method(:write))
     assert_connection_error(:protocol_error) {
       con << "HELLO"
     }
   end
 
   def test_server_must_raise_cprotocol_error_invalid_magic_long
-    con = HTTPSServerConnection.new(StringIO.new)
+    con = ServerConnection.new(StringIO.new.method(:write))
     assert_connection_error(:protocol_error) {
       con << ("HELLO" * 100) # over 24
     }
   end
 
   def test_server_must_raise_cprotocol_error_non_settings_after_magic
-    con = HTTPSServerConnection.new(StringIO.new)
+    con = ServerConnection.new(StringIO.new.method(:write))
     con << Connection::CLIENT_CONNECTION_PREFACE
     assert_connection_error(:protocol_error) {
       con << Frame.new(type: :window_update, stream_id: 0, payload: "".push_uint32(1)).assemble
@@ -27,7 +27,7 @@ class HTTPSConnectionNegotiationTest < Minitest::Test
 
   def test_server_accept_fragmented_magic
     magic = Connection::CLIENT_CONNECTION_PREFACE
-    con = HTTPSServerConnection.new(StringIO.new)
+    con = ServerConnection.new(StringIO.new.method(:write))
     assert_no_error {
       con << magic[0...5]
       con << magic[5..-1]
@@ -49,7 +49,7 @@ class HTTPSConnectionNegotiationTest < Minitest::Test
       begin
         Timeout.timeout(3) {
           sock = ssl_server.accept
-          plum = HTTPSServerConnection.new(sock)
+          plum = SSLSocketServerConnection.new(sock)
           assert_connection_error(:inadequate_security) {
             run = true
             while !sock.closed? && !sock.eof?

data/test/plum/server/test_http_connection.rb

@@ -5,7 +5,8 @@ using Plum::BinaryString
 class HTTPConnectionNegotiationTest < Minitest::Test
   ## with Prior Knowledge (same as over TLS)
   def test_server_must_raise_cprotocol_error_non_settings_after_magic
-    con = HTTPServerConnection.new(StringIO.new)
+    io = StringIO.new
+    con = HTTPServerConnection.new(io.method(:write))
     con << Connection::CLIENT_CONNECTION_PREFACE
     assert_connection_error(:protocol_error) {
       con << Frame.new(type: :window_update, stream_id: 0, payload: "".push_uint32(1)).assemble
@@ -14,7 +15,8 @@ class HTTPConnectionNegotiationTest < Minitest::Test
 
   def test_server_accept_fragmented_magic
     magic = Connection::CLIENT_CONNECTION_PREFACE
-    con = HTTPServerConnection.new(StringIO.new)
+    io = StringIO.new
+    con = HTTPServerConnection.new(io.method(:write))
     assert_no_error {
       con << magic[0...5]
       con << magic[5..-1]
@@ -25,7 +27,7 @@ class HTTPConnectionNegotiationTest < Minitest::Test
   ## with HTTP/1.1 Upgrade
   def test_server_accept_upgrade
     io = StringIO.new
-    con = HTTPServerConnection.new(io)
+    con = HTTPServerConnection.new(io.method(:write))
     heads = nil
     con.on(:headers) {|_, _h| heads = _h.to_h }
     req = "GET / HTTP/1.1\r\n" <<
@@ -47,7 +49,7 @@ class HTTPConnectionNegotiationTest < Minitest::Test
 
   def test_server_deny_non_upgrade
     io = StringIO.new
-    con = HTTPServerConnection.new(io)
+    con = HTTPServerConnection.new(io.method(:write))
     req = "GET / HTTP/1.1\r\n" <<
           "Host: rhe.jp\r\n" <<
           "User-Agent: nya\r\n" <<

data/test/plum/test_stream.rb

@@ -40,13 +40,14 @@ class StreamTest < Minitest::Test
 
   def test_stream_local_error
     open_server_connection { |con|
-      stream = nil
-      con.on(:headers) { |s| stream = s }
+      stream = type = nil
+      con.on(:rst_stream) { |s, t| stream = s; type = t }
 
       con << Frame.headers(1, "", end_headers: true).assemble
-      assert_raises(LocalStreamError) {
-        con << Frame.rst_stream(1, :frame_size_error).assemble
-      }
+      con << Frame.rst_stream(1, :frame_size_error).assemble
+
+      assert_equal(1, stream.id)
+      assert_equal(:frame_size_error, type)
     }
   end
 end

data/test/test_helper.rb

@@ -2,7 +2,7 @@ unless ENV["SKIP_COVERAGE"]
   begin
     require "simplecov"
     require "codeclimate-test-reporter"
-    SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+    SimpleCov.formatters = [
       SimpleCov::Formatter::HTMLFormatter,
       CodeClimate::TestReporter::Formatter
     ]

data/test/utils/server.rb

@@ -2,8 +2,8 @@ require "timeout"
 
 module ServerUtils
   def open_server_connection(scheme = :https)
-    io = StringIO.new
-    @_con = (scheme == :https ? HTTPSServerConnection : HTTPServerConnection).new(io)
+    @_io = StringIO.new
+    @_con = (scheme == :https ? ServerConnection : HTTPServerConnection).new(@_io.method(:write))
     @_con << Connection::CLIENT_CONNECTION_PREFACE
     @_con << Frame.new(type: :settings, stream_id: 0).assemble
     if block_given?
@@ -30,8 +30,8 @@ module ServerUtils
     end
   end
 
-  def sent_frames(con = nil)
-    resp = (con || @_con).sock.string.dup.force_encoding(Encoding::BINARY)
+  def sent_frames(io = nil)
+    resp = (io || @_io).string.dup.force_encoding(Encoding::BINARY)
     frames = []
     while f = Frame.parse!(resp)
       frames << f

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plum
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.8
 platform: ruby
 authors:
 - rhenium
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-15 00:00:00.000000000 Z
+date: 2016-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -171,6 +171,7 @@ files:
 - examples/client/large.rb
 - examples/client/twitter.rb
 - examples/non_tls_server.rb
+- examples/rack-example-config.rb
 - examples/rack.ru
 - examples/static_server.rb
 - lib/plum.rb
@@ -204,7 +205,7 @@ files:
 - lib/plum/rack/session.rb
 - lib/plum/server/connection.rb
 - lib/plum/server/http_connection.rb
-- lib/plum/server/https_connection.rb
+- lib/plum/server/ssl_socket_connection.rb
 - lib/plum/stream.rb
 - lib/plum/stream_utils.rb
 - lib/plum/version.rb
@@ -221,8 +222,8 @@ files:
 - test/plum/hpack/test_decoder.rb
 - test/plum/hpack/test_encoder.rb
 - test/plum/hpack/test_huffman.rb
+- test/plum/server/test_connection.rb
 - test/plum/server/test_http_connection.rb
-- test/plum/server/test_https_connection.rb
 - test/plum/stream/test_handle_frame.rb
 - test/plum/test_binary_string.rb
 - test/plum/test_connection.rb
@@ -263,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: An HTTP/2 Library for Ruby
@@ -279,8 +280,8 @@ test_files:
 - test/plum/hpack/test_decoder.rb
 - test/plum/hpack/test_encoder.rb
 - test/plum/hpack/test_huffman.rb
+- test/plum/server/test_connection.rb
 - test/plum/server/test_http_connection.rb
-- test/plum/server/test_https_connection.rb
 - test/plum/stream/test_handle_frame.rb
 - test/plum/test_binary_string.rb
 - test/plum/test_connection.rb