plum 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbb3d755285f78919374f46331be663f93b0c2a2
-  data.tar.gz: 7fec872c23645cd58bfaac4498687d7ed30163c5
+  metadata.gz: df4cac7083913b918a193ac157d4fd88bd1c0022
+  data.tar.gz: ef49c0a591dbcb1fa671b9f206705531f006e025
 SHA512:
-  metadata.gz: b89109d466c9f33465f45080c664b16e4f897a505837a91d98bc4c2785968ee1899be7cf92f3a94512632eae35c475b43c3a09d5148195d52d1864e3948de838
-  data.tar.gz: 333261402b76c021fcd3385dbd8e6ac8e2a1d77d65155978ebf23fbd08cac2dea8d6401047024850ebaeb311eedecf27d3723b483edc3eb9f71042f8c7e43ba4
+  metadata.gz: 635b191791c1f6465d0a8e8f3d84c763506f9449c5e685c3ce4c80ed1b5bd22f1fc906d0f1f4c74a47e52e1d44dbea6245282575f88eff61af784fae8be1dbb2
+  data.tar.gz: 30cdfdd10ff68e47521f6d5928f920300706f9722bf32002844c18b2ced3d7215e2a24165a37abdcd9a53009173d5efc578ef5ddee61a766c2ca90af60cc9707

data/Guardfile

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 guard :minitest, env: { "SKIP_COVERAGE" => true } do
   # with Minitest::Unit
   watch(%r{^test/(.*)\/?test_(.*)\.rb$})

data/README.md

@@ -17,11 +17,11 @@ A minimal pure Ruby implementation of HTTP/2 library / server.
 * [rhenium/plum-server](https://github.com/rhenium/plum-server) - A static-file server for https://rhe.jp and http://rhe.jp.
 
 ### As a Rack-compatible server
-Insert `require "plum/rack"` to your `config.ru`
 
-```ruby
-require "plum/rack"
+Most existing Rack-based applications (plum doesn't support Rack hijack API) should work without modification.
 
+```ruby
+# config.ru
 App = -> env {
   [
     200,
@@ -33,7 +33,7 @@ App = -> env {
 run App
 ```
 
-Then run it with:
+You can run it:
 
 ```sh
 % plum -e production -p 8080 --https config.ru

data/Rakefile

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 require "bundler/gem_tasks"
 require "rake/testtask"
 require "yard"

data/examples/non_tls_server.rb

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 $LOAD_PATH << File.expand_path("../../lib", __FILE__)
 require "plum"
 require "socket"
@@ -53,7 +54,7 @@ loop do
 
     stream.on(:open) do
       headers = nil
-      data = ""
+      data = String.new
     end
 
     stream.on(:headers) do |headers_|
@@ -69,8 +70,8 @@ loop do
     stream.on(:end_stream) do
       case [headers[":method"], headers[":path"]]
       when ["GET", "/"]
-        body = "Hello World! <a href=/abc.html>ABC</a> <a href=/fgsd>Not found</a>"
-        body << <<-EOF
+        body = <<-EOF
+        Hello World! <a href=/abc.html>ABC</a> <a href=/fgsd>Not found</a>
         <form action=post.page method=post>
         <input type=text name=key value=default_value>
         <input type=submit>
@@ -80,7 +81,7 @@ loop do
           ":status": "200",
           "server": "plum",
           "content-type": "text/html",
-          "content-length": body.size
+          "content-length": body.bytesize
         }, body)
       when ["POST", "/post.page"]
         body = "Posted value is: #{CGI.unescape(data).gsub("<", "&lt;").gsub(">", "&gt;")}<br> <a href=/>Back to top page</a>"
@@ -88,7 +89,7 @@ loop do
           ":status": "200",
           "server": "plum",
           "content-type": "text/html",
-          "content-length": body.size
+          "content-length": body.bytesize
         }, body)
       else
         body = "Page not found! <a href=/>Back to top page</a>"
@@ -96,7 +97,7 @@ loop do
           ":status": "404",
           "server": "plum",
           "content-type": "text/html",
-          "content-length": body.size
+          "content-length": body.bytesize
         }, body)
       end
     end
@@ -106,15 +107,12 @@ loop do
     begin
       plum.run
     rescue Plum::LegacyHTTPError
-      data = "Use modern web browser with HTTP/2 support."
-
-      resp = ""
-      resp << "HTTP/1.1 505 HTTP Version Not Supported\r\n"
-      resp << "Content-Type: text/plain\r\n"
-      resp << "Content-Length: #{data.bytesize}\r\n"
-      resp << "Server: plum/#{Plum::VERSION}\r\n"
-      resp << "\r\n"
-      resp << data
+      resp = "HTTP/1.1 505 HTTP Version Not Supported\r\n"
+             "Content-Type: text/plain\r\n"
+             "Content-Length: #{data.bytesize}\r\n"
+             "Server: plum/#{Plum::VERSION}\r\n"
+             "\r\n"
+             "Use modern web browser with HTTP/2 support."
 
       sock.write(resp)
     rescue

data/examples/rack.ru

@@ -7,13 +7,13 @@ class App2
       [
         200,
         { "Content-Type" => "text/html" },
-        ["*10 bytes*"*400]
+        ["8 bytes-" * 512]
       ]
     else
       [
         404,
         { "Content-Type" => "text/html" },
-        [""]
+        ["#{env["REQUEST_METHOD"]} #{env["PATH_INFO"]}"]
       ]
     end
   end

data/examples/static_server.rb

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 $LOAD_PATH << File.expand_path("../../lib", __FILE__)
 require "plum"
 require "openssl"
@@ -71,7 +72,7 @@ loop do
 
     stream.on(:open) do
       headers = nil
-      data = ""
+      data = String.new
     end
 
     stream.on(:headers) do |headers_|
@@ -87,8 +88,8 @@ loop do
     stream.on(:end_stream) do
       case [headers[":method"], headers[":path"]]
       when ["GET", "/"]
-        body = "Hello World! <a href=/abc.html>ABC</a> <a href=/fgsd>Not found</a>"
-        body << <<-EOF
+        body = <<-EOF
+        Hello World! <a href=/abc.html>ABC</a> <a href=/fgsd>Not found</a>
         <form action=post.page method=post>
         <input type=text name=key value=default_value>
         <input type=submit>
@@ -114,9 +115,9 @@ loop do
           "content-type": "text/html",
           "content-length": body.size
         }, body)
-        image = ("iVBORw0KGgoAAAANSUhEUgAAAEAAAABAAgMAAADXB5lNAAAACVBMVEX///93o0jG/4mTMy20AAAA" <<
-                 "bklEQVQ4y2NgoAoIRQJkCoSimIdTgJGBBU1ABE1A1AVdBQuaACu6gCALhhZ0axlZCDgMWYAB6ilU" <<
-                 "35IoADEMxWyyBDD45AhQCFahM0kXWIVu3sAJrILzyBcgytoFeATABBcXWohhCEC14BCgGAAAX1ZQ" <<
+        image = ("iVBORw0KGgoAAAANSUhEUgAAAEAAAABAAgMAAADXB5lNAAAACVBMVEX///93o0jG/4mTMy20AAAA"
+                 "bklEQVQ4y2NgoAoIRQJkCoSimIdTgJGBBU1ABE1A1AVdBQuaACu6gCALhhZ0axlZCDgMWYAB6ilU"
+                 "35IoADEMxWyyBDD45AhQCFahM0kXWIVu3sAJrILzyBcgytoFeATABBcXWohhCEC14BCgGAAAX1ZQ"
                  "ZtJp0zAAAAAASUVORK5CYII=").unpack("m")[0]
         i_stream.respond({
           ":status": "200",

data/lib/plum/binary_string.rb

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 module Plum
   module BinaryString
     refine String do

data/lib/plum/connection.rb

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 using Plum::BinaryString
 
 module Plum
@@ -6,7 +7,7 @@ module Plum
     include FlowControl
     include ConnectionUtils
 
-    CLIENT_CONNECTION_PREFACE = "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n".freeze
+    CLIENT_CONNECTION_PREFACE = "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"
 
     DEFAULT_SETTINGS = {
       header_table_size:      4096,     # octets
@@ -25,7 +26,7 @@ module Plum
       @writer = writer
       @local_settings = Hash.new {|hash, key| DEFAULT_SETTINGS[key] }.merge!(local_settings)
       @remote_settings = Hash.new {|hash, key| DEFAULT_SETTINGS[key] }
-      @buffer = "".force_encoding(Encoding::BINARY)
+      @buffer = String.new
       @streams = {}
       @state = :negotiation
       @hpack_decoder = HPACK::Decoder.new(@local_settings[:header_table_size])
@@ -134,9 +135,7 @@ module Plum
       if frame.stream_id == 0
         receive_control_frame(frame)
       else
-        if @streams.key?(frame.stream_id)
-          stream = @streams[frame.stream_id]
-        else
+        unless stream = @streams[frame.stream_id]
           if frame.stream_id.even? || @max_odd_stream_id >= frame.stream_id
             raise Plum::ConnectionError.new(:protocol_error)
           end

data/lib/plum/connection_utils.rb

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 using Plum::BinaryString
 
 module Plum

data/lib/plum/errors.rb

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 module Plum
   class Error < StandardError; end
   class HPACKError < Error; end

data/lib/plum/event_emitter.rb

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 module Plum
   module EventEmitter
     # Registers an event handler to specified event. An event can have multiple handlers.

data/lib/plum/flow_control.rb

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 using Plum::BinaryString
 
 module Plum
@@ -27,7 +28,7 @@ module Plum
     # @param wsi [Integer] The amount to increase receiving window size. The legal range is 1 to 2^32-1.
     def window_update(wsi)
       @recv_remaining_window += wsi
-      payload = "".push_uint32(wsi)
+      payload = String.new.push_uint32(wsi)
       sid = (Stream === self) ? self.id : 0
       send_immediately Frame.new(type: :window_update, stream_id: sid, payload: payload)
     end

data/lib/plum/frame.rb

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 using Plum::BinaryString
 
 module Plum

data/lib/plum/frame_factory.rb

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 using Plum::BinaryString
 
 module Plum
@@ -6,7 +7,7 @@ module Plum
     # @param stream_id [Integer] The stream ID.
     # @param error_type [Symbol] The error type defined in RFC 7540 Section 7.
     def rst_stream(stream_id, error_type)
-      payload = "".push_uint32(HTTPError::ERROR_CODES[error_type])
+      payload = String.new.push_uint32(HTTPError::ERROR_CODES[error_type])
       Frame.new(type: :rst_stream, stream_id: stream_id, payload: payload)
     end
 
@@ -16,9 +17,9 @@ module Plum
     # @param message [String] Additional debug data.
     # @see RFC 7540 Section 6.8
     def goaway(last_id, error_type, message = "")
-      payload = "".push_uint32((last_id || 0) | (0 << 31))
-                  .push_uint32(HTTPError::ERROR_CODES[error_type])
-                  .push(message)
+      payload = String.new.push_uint32((last_id || 0) | (0 << 31))
+                          .push_uint32(HTTPError::ERROR_CODES[error_type])
+                          .push(message)
       Frame.new(type: :goaway, stream_id: 0, payload: payload)
     end
 
@@ -26,7 +27,7 @@ module Plum
     # @param ack [Symbol] Pass :ack to create an ACK frame.
     # @param args [Hash<Symbol, Integer>] The settings values to send.
     def settings(ack = nil, **args)
-      payload = args.inject("") {|payload, (key, value)|
+      payload = args.inject(String.new) {|payload, (key, value)|
         id = Frame::SETTINGS_TYPE[key] or raise ArgumentError.new("invalid settings type")
         payload.push_uint16(id)
         payload.push_uint32(value)
@@ -40,9 +41,10 @@ module Plum
     #   @param payload [String] 8 bytes length data to send.
     # @overload ping(payload = "plum\x00\x00\x00\x00")
     #   @param payload [String] 8 bytes length data to send.
-    def ping(arg1 = "plum\x00\x00\x00\x00", arg2 = nil)
+    def ping(arg1 = "plum\x00\x00\x00\x00".b, arg2 = nil)
       if !arg2
         raise ArgumentError.new("data must be 8 octets") if arg1.bytesize != 8
+        arg1 = arg1.b if arg1.encoding != Encoding::BINARY
         Frame.new(type: :ping, stream_id: 0, payload: arg1)
       else
         Frame.new(type: :ping, stream_id: 0, flags: [:ack], payload: arg2)
@@ -54,10 +56,11 @@ module Plum
     # @param payload [String] Payload.
     # @param flags [Array<Symbol>] Flags.
     def data(stream_id, payload, *flags)
+      payload = payload.b if payload && payload.encoding != Encoding::BINARY
       Frame.new(type: :data, stream_id: stream_id, flags: flags, payload: payload)
     end
 
-    # Creates a DATA frame.
+    # Creates a HEADERS frame.
     # @param stream_id [Integer] The stream ID.
     # @param encoded [String] Headers.
     # @param flags [Array<Symbol>] Flags.
@@ -71,8 +74,8 @@ module Plum
     # @param encoded [String] Request headers.
     # @param flags [Array<Symbol>] Flags.
     def push_promise(stream_id, new_id, encoded, *flags)
-      payload = "".push_uint32(0 << 31 | new_id)
-                  .push(encoded)
+      payload = String.new.push_uint32(new_id)
+                          .push(encoded)
       Frame.new(type: :push_promise, stream_id: stream_id, flags: flags, payload: payload)
     end
 

data/lib/plum/frame_utils.rb

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 using Plum::BinaryString
 
 module Plum

data/lib/plum/hpack/constants.rb

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 module Plum
   module HPACK
     # RFC7541 Appendix A

data/lib/plum/hpack/context.rb

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 module Plum
   module HPACK
     module Context

data/lib/plum/hpack/decoder.rb

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 using Plum::BinaryString
 
 module Plum
@@ -38,10 +39,9 @@ module Plum
 
       def read_integer(str, pos, prefix_length)
         raise HPACKError.new("integer: end of buffer") if str.empty?
-        first_byte = str.getbyte(pos)
 
         mask = 1 << prefix_length
-        ret = first_byte % mask
+        ret = str.getbyte(pos) % mask
         return [ret, 1] if ret != mask - 1
 
         octets = 0
@@ -104,18 +104,10 @@ module Plum
         # +---+---------------------------+
         # | Value String (Length octets)  |
         # +-------------------------------+
-        index, ilen = read_integer(str, pos, 6)
-        if index == 0
-          name, nlen = read_string(str, pos + ilen)
-        else
-          name, = fetch(index)
-          nlen = 0
-        end
+        ret, len = parse_literal(str, pos, 6)
+        store(*ret)
 
-        val, vlen = read_string(str, pos + ilen + nlen)
-        store(name, val)
-
-        [[name, val], ilen + nlen + vlen]
+        [ret, len]
       end
 
       def parse_no_indexing(str, pos)
@@ -138,7 +130,13 @@ module Plum
         # +---+---------------------------+
         # | Value String (Length octets)  |
         # +-------------------------------+
-        index, ilen = read_integer(str, pos, 4)
+        ret, len = parse_literal(str, pos, 4)
+
+        [ret, len]
+      end
+
+      def parse_literal(str, pos, pref)
+        index, ilen = read_integer(str, pos, pref)
         if index == 0
           name, nlen = read_string(str, pos + ilen)
         else

data/lib/plum/hpack/encoder.rb

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 using Plum::BinaryString
 
 module Plum
@@ -10,9 +11,8 @@ module Plum
         @indexing = indexing
         @huffman = huffman
       end
-
       def encode(headers)
-        out = ""
+        out = String.new.force_encoding(Encoding::BINARY)
         headers.each do |name, value|
           name = name.to_s
           value = value.to_s
@@ -24,7 +24,7 @@ module Plum
             out << encode_literal(name, value)
           end
         end
-        out.force_encoding(Encoding::BINARY)
+        out
       end
 
       private
@@ -46,7 +46,7 @@ module Plum
         else
           fb = "\x00"
         end
-        fb.force_encoding(Encoding::BINARY) << encode_string(name) << encode_string(value)
+        (fb + encode_string(name)) << encode_string(value)
       end
 
       # +---+---+---+---+---+---+---+---+
@@ -106,8 +106,7 @@ module Plum
 
       def encode_string_huffman(str)
         huffman_str = Huffman.encode(str)
-        lenstr = encode_integer(huffman_str.bytesize, 7, 0b10000000)
-        lenstr << huffman_str
+        encode_integer(huffman_str.bytesize, 7, 0b10000000) << huffman_str
       end
     end
   end

data/lib/plum/hpack/huffman.rb

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 using Plum::BinaryString
 
 module Plum
@@ -7,7 +8,7 @@ module Plum
 
       # Static-Huffman-encodes the specified String.
       def encode(bytestr)
-        out = ""
+        out = String.new
         bytestr.each_byte do |b|
           out << HUFFMAN_TABLE[b]
         end
@@ -19,13 +20,13 @@ module Plum
       def decode(encoded)
         bits = encoded.unpack("B*")[0]
         out = []
-        buf = ""
+        buf = String.new
         bits.each_char do |cb|
           buf << cb
           if c = HUFFMAN_TABLE_INVERSED[buf]
             raise HPACKError.new("huffman: EOS detected") if c == 256
             out << c
-            buf = ""
+            buf.clear
           end
         end
 

data/lib/plum/http_connection.rb

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 using Plum::BinaryString
 
 module Plum
@@ -7,7 +8,7 @@ module Plum
     def initialize(sock, local_settings = {})
       require "http/parser"
       @_headers = nil
-      @_body = ""
+      @_body = String.new
       @_http_parser = setup_parser
       @sock = sock
       super(@sock.method(:write), local_settings)
@@ -65,12 +66,11 @@ module Plum
         process_first_request
       }
 
-      resp = ""
-      resp << "HTTP/1.1 101 Switching Protocols\r\n"
-      resp << "Connection: Upgrade\r\n"
-      resp << "Upgrade: h2c\r\n"
-      resp << "Server: plum/#{Plum::VERSION}\r\n"
-      resp << "\r\n"
+      resp = "HTTP/1.1 101 Switching Protocols\r\n"
+             "Connection: Upgrade\r\n"
+             "Upgrade: h2c\r\n"
+             "Server: plum/#{Plum::VERSION}\r\n"
+             "\r\n"
 
       @sock.write(resp)
     end

data/lib/plum/https_connection.rb

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 module Plum
   class HTTPSConnection < Connection
     attr_reader :sock

data/lib/plum/rack.rb

@@ -7,4 +7,4 @@ require "plum/rack/config"
 require "plum/rack/dsl"
 require "plum/rack/listener"
 require "plum/rack/server"
-require "plum/rack/connection"
+require "plum/rack/session"

data/lib/plum/rack/cli.rb

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 require "optparse"
 require "rack/builder"
 

data/lib/plum/rack/config.rb

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 module Plum
   module Rack
     class Config

data/lib/plum/rack/dsl.rb

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 module Plum
   module Rack
     module DSL

data/lib/plum/rack/listener.rb

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 module Plum
   module Rack
     class BaseListener
@@ -76,7 +77,7 @@ module Plum
         ef.subject_certificate = cert
         ef.issuer_certificate = cert
         cert.extensions = [
-          ef.create_extension("basicConstraints","CA:TRUE", true),
+          ef.create_extension("basicConstraints", "CA:TRUE", true),
           ef.create_extension("subjectKeyIdentifier", "hash"),
         ]
         cert.add_extension ef.create_extension("authorityKeyIdentifier", "keyid:always,issuer:always")

data/lib/plum/rack/server.rb

@@ -1,7 +1,11 @@
+# -*- frozen-string-literal: true -*-
 module Plum
   module Rack
     class Server
+      attr_reader :config
+
       def initialize(app, config)
+        @config = config
         @state = :null
         @app = config[:debug] ? ::Rack::CommonLogger.new(app) : app
         @logger = Logger.new(config[:log] || $stdout).tap { |l|
@@ -46,7 +50,11 @@ module Plum
             sock = sock.accept if sock.respond_to?(:accept)
             plum = svr.plum(sock)
 
-            con = Connection.new(@app, plum, @logger)
+            con = Session.new(app: @app,
+                              plum: plum,
+                              logger: @logger,
+                              server_push: @config[:server_push],
+                              remote_addr: sock.peeraddr.last)
             con.run
           rescue Errno::ECONNRESET, Errno::ECONNABORTED, Errno::EPROTO, Errno::EINVAL => e # closed
             sock.close if sock

data/lib/plum/rack/{connection.rb → session.rb}

@@ -1,14 +1,19 @@
+# -*- frozen-string-literal: true -*-
 using Plum::BinaryString
 
 module Plum
   module Rack
-    class Connection
+    INVALID_HEADERS = Set["connection", "keep-alive", "proxy-connection", "transfer-encoding", "upgrade"].freeze
+
+    class Session
       attr_reader :app, :plum
 
-      def initialize(app, plum, logger)
+      def initialize(app:, plum:, logger:, server_push: true, remote_addr: "127.0.0.1")
         @app = app
         @plum = plum
         @logger = logger
+        @server_push = server_push
+        @remote_addr = remote_addr
 
         setup_plum
       end
@@ -35,7 +40,7 @@ module Plum
 
         reqs = {}
         @plum.on(:headers) { |stream, h|
-          reqs[stream] = { headers: h, data: "".force_encoding(Encoding::BINARY) }
+          reqs[stream] = { headers: h, data: String.new.force_encoding(Encoding::BINARY) }
         }
 
         @plum.on(:data) { |stream, d|
@@ -49,13 +54,16 @@ module Plum
 
       def send_body(stream, body)
         begin
-          if body.is_a?(Array)
+          if body.is_a?(IO)
+            stream.send_data(body, end_stream: true)
+          elsif body.respond_to?(:size)
             last = body.size - 1
-            body.each_with_index { |part, i|
+            i = 0
+            body.each { |part|
               stream.send_data(part, end_stream: last == i)
+              i += 1
             }
-          elsif body.is_a?(IO)
-            stream.send_data(body, end_stream: true)
+            stream.send_data(nil, end_stream: true) if i == 0
           else
             body.each { |part| stream.send_data(part, end_stream: false) }
             stream.send_data(nil, end_stream: true)
@@ -65,9 +73,22 @@ module Plum
         end
       end
 
-      def extract_push(r_extheaders)
-        if pushs = r_extheaders["plum.serverpush"]
-          pushs.split(";").map { |push| push.split(" ", 2) }
+      def extract_push(reqheaders, extheaders)
+        if @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.to_s.upcase,
+              ":scheme" => scheme,
+              ":path" => path
+            }
+          }
         else
           []
         end
@@ -77,21 +98,16 @@ module Plum
         env = new_env(headers, data)
         r_status, r_rawheaders, r_body = @app.call(env)
         r_headers, r_extheaders = extract_headers(r_status, r_rawheaders)
-        r_topushs = extract_push(r_extheaders)
 
         stream.send_headers(r_headers, end_stream: false)
-        r_pushstreams = r_topushs.map { |method, path|
-          preq = { ":authority" => headers.find { |k, v| k == ":authority" }[1],
-                   ":method" => method.to_s.upcase,
-                   ":scheme" => headers.find { |k, v| k == ":scheme" }[1],
-                   ":path" => path }
-          st = stream.promise(preq)
-          [st, preq]
+
+        push_sts = extract_push(headers, r_extheaders).map { |preq|
+          [stream.promise(preq), preq]
         }
 
         send_body(stream, r_body)
 
-        r_pushstreams.each { |st, preq|
+        push_sts.each { |st, preq|
           penv = new_env(preq, "")
           p_status, p_h, p_body = @app.call(penv)
           p_headers = extract_headers(p_status, p_h)
@@ -102,7 +118,6 @@ module Plum
 
       def new_env(h, data)
         ebase = {
-          "SCRIPT_NAME"       => "",
           "rack.version"      => ::Rack::VERSION,
           "rack.input"        => StringIO.new(data),
           "rack.errors"       => $stderr,
@@ -110,6 +125,8 @@ module Plum
           "rack.multiprocess" => false,
           "rack.run_once"     => false,
           "rack.hijack?"      => false,
+          "SCRIPT_NAME"       => "",
+          "REMOTE_ADDR"       => @remote_addr,
         }
 
         h.each { |k, v|
@@ -123,21 +140,19 @@ module Plum
           when ":authority"
             chost, cport = v.split(":", 2)
             ebase["SERVER_NAME"] = chost
-            ebase["SERVER_PORT"] = (cport || 443).to_i
+            ebase["SERVER_PORT"] = cport || "443"
           when ":scheme"
             ebase["rack.url_scheme"] = v
           else
-            if k.start_with?(":")
-              # unknown HTTP/2 pseudo-headers
-            else
-              if "cookie" == k && ebase["HTTP_COOKIE"]
+            unless k.start_with?(":") # ignore unknown pseudo-headers
+              if k == "cookie" && ebase["HTTP_COOKIE"]
                 if ebase["HTTP_COOKIE"].frozen?
-                  ebase["HTTP_COOKIE"] += "; " << v
+                  (ebase["HTTP_COOKIE"] += "; ") << v
                 else
                   ebase["HTTP_COOKIE"] << "; " << v
                 end
               else
-                ebase["HTTP_" << k.tr("-", "_").upcase!] = v
+                ebase["HTTP_" + k.tr("-", "_").upcase!] = v
               end
             end
           end
@@ -161,7 +176,7 @@ module Plum
 
             if "set-cookie" == key
               rbase[key] = v_.gsub("\n", "; ") # RFC 7540 8.1.2.5
-            else
+            elsif !INVALID_HEADERS.member?(key)
               key.byteshift(2) if key.start_with?("x-")
               rbase[key] = v_.tr("\n", ",") # RFC 7230 7
             end

data/lib/plum/stream.rb

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 using Plum::BinaryString
 
 module Plum
@@ -111,40 +112,35 @@ module Plum
       end
 
       if frame.padded?
-        padding_length = frame.payload.uint8(0)
+        padding_length = frame.payload.uint8
         if padding_length >= frame.length
           raise ConnectionError.new(:protocol_error, "padding is too long")
         end
-        body = frame.payload.byteslice(1, frame.length - padding_length - 1)
+        callback(:data, frame.payload.byteslice(1, frame.length - padding_length - 1))
       else
-        body = frame.payload
+        callback(:data, frame.payload)
       end
-      callback(:data, body)
 
       receive_end_stream if frame.end_stream?
     end
 
     def receive_complete_headers(frames)
       first = frames.shift
-
       payload = first.payload
-      first_length = first.length
-      padding_length = 0
 
       if first.padded?
         padding_length = payload.uint8
-        first_length -= 1 + padding_length
-        payload = payload.byteslice(1, first_length)
+        payload = payload.byteslice(1, payload.bytesize - padding_length - 1)
       else
+        padding_length = 0
         payload = payload.dup
       end
 
       if first.priority?
         receive_priority_payload(payload.byteshift(5))
-        first_length -= 5
       end
 
-      if padding_length > first_length
+      if padding_length > payload.bytesize
         raise ConnectionError.new(:protocol_error, "padding is too long")
       end
 

data/lib/plum/stream_utils.rb

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 using Plum::BinaryString
 
 module Plum

data/lib/plum/version.rb

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 module Plum
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/rack/handler/plum.rb

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 module Rack
   module Handler
     class Plum

data/plum.gemspec

@@ -1,3 +1,4 @@
+# -*- frozen-string-literal: true -*-
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "plum/version"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plum
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - rhenium
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-25 00:00:00.000000000 Z
+date: 2015-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -190,10 +190,10 @@ files:
 - lib/plum/rack.rb
 - lib/plum/rack/cli.rb
 - lib/plum/rack/config.rb
-- lib/plum/rack/connection.rb
 - lib/plum/rack/dsl.rb
 - lib/plum/rack/listener.rb
 - lib/plum/rack/server.rb
+- lib/plum/rack/session.rb
 - lib/plum/stream.rb
 - lib/plum/stream_utils.rb
 - lib/plum/version.rb