h1p 0.2 → 0.5

data/test/{test_h1p.rb → test_h1p_server.rb}

@@ -4,14 +4,15 @@ require_relative 'helper'
 require 'h1p'
 require 'socket'
 require_relative '../ext/h1p/limits'
+require 'securerandom'
 
-class H1PTest < MiniTest::Test
+class H1PRequestTest < MiniTest::Test
   Error = H1P::Error
 
   def setup
     super
     @i, @o = IO.pipe
-    @parser = H1P::Parser.new(@i)
+    @parser = H1P::Parser.new(@i, :server)
   end
   alias_method :reset_parser, :setup
 
@@ -75,7 +76,7 @@ class H1PTest < MiniTest::Test
     @o.close
 
     assert_raises(Error) { @parser.parse_headers }
-  
+
     max_length = H1P_LIMITS[:max_method_length]
 
     reset_parser
@@ -96,7 +97,7 @@ class H1PTest < MiniTest::Test
   def test_bad_path
     @o << "GET HTTP/1.1\r\n\r\n"
     assert_raises(Error) { @parser.parse_headers }
-  
+
     max_length = H1P_LIMITS[:max_path_length]
 
     reset_parser
@@ -149,26 +150,26 @@ class H1PTest < MiniTest::Test
     assert_raises(Error) { @parser.parse_headers }
 
     reset_parser
-    @o << "GET / http/1.1.1\r\n\r\n"
+    @o << "GET / HTTP/1.1.1\r\n\r\n"
     assert_raises(Error) { @parser.parse_headers }
   end
 
   def test_headers_eof
     @o << "GET / HTTP/1.1\r\na"
     @o.close
-    
+
     assert_nil @parser.parse_headers
 
     reset_parser
     @o << "GET / HTTP/1.1\r\na:"
     @o.close
-    
+
     assert_nil @parser.parse_headers
 
     reset_parser
     @o << "GET / HTTP/1.1\r\na:      "
     @o.close
-    
+
     assert_nil @parser.parse_headers
   end
 
@@ -197,46 +198,46 @@ class H1PTest < MiniTest::Test
   end
 
   def test_bad_headers
-    @o << "GET / http/1.1\r\n   a: b\r\n\r\n"
+    @o << "GET / HTTP/1.1\r\n   a: b\r\n\r\n"
     assert_raises(Error) { @parser.parse_headers }
 
     reset_parser
-    @o << "GET / http/1.1\r\na b\r\n\r\n"
+    @o << "GET / HTTP/1.1\r\na b\r\n\r\n"
     assert_raises(Error) { @parser.parse_headers }
 
     max_key_length = H1P_LIMITS[:max_header_key_length]
 
     reset_parser
-    @o << "GET / http/1.1\r\n#{'a' * max_key_length}: b\r\n\r\n"
+    @o << "GET / HTTP/1.1\r\n#{'a' * max_key_length}: b\r\n\r\n"
     headers = @parser.parse_headers
     assert_equal 'b', headers['a' * max_key_length]
 
     reset_parser
-    @o << "GET / http/1.1\r\n#{'a' * (max_key_length + 1)}: b\r\n\r\n"
+    @o << "GET / HTTP/1.1\r\n#{'a' * (max_key_length + 1)}: b\r\n\r\n"
     assert_raises(Error) { @parser.parse_headers }
 
     max_value_length = H1P_LIMITS[:max_header_value_length]
 
     reset_parser
-    @o << "GET / http/1.1\r\nfoo: #{'a' * max_value_length}\r\n\r\n"
+    @o << "GET / HTTP/1.1\r\nfoo: #{'a' * max_value_length}\r\n\r\n"
     headers = @parser.parse_headers
     assert_equal 'a' * max_value_length, headers['foo']
 
     reset_parser
-    @o << "GET / http/1.1\r\nfoo: #{'a' * (max_value_length + 1)}\r\n\r\n"
+    @o << "GET / HTTP/1.1\r\nfoo: #{'a' * (max_value_length + 1)}\r\n\r\n"
     assert_raises(Error) { @parser.parse_headers }
 
     max_header_count = H1P_LIMITS[:max_header_count]
 
     reset_parser
     hdrs = (1..max_header_count).map { |i| "foo#{i}: bar\r\n" }.join
-    @o << "GET / http/1.1\r\n#{hdrs}\r\n"
+    @o << "GET / HTTP/1.1\r\n#{hdrs}\r\n"
     headers = @parser.parse_headers
     assert_equal (max_header_count + 4), headers.size
 
     reset_parser
     hdrs = (1..(max_header_count + 1)).map { |i| "foo#{i}: bar\r\n" }.join
-    @o << "GET / http/1.1\r\n#{hdrs}\r\n"
+    @o << "GET / HTTP/1.1\r\n#{hdrs}\r\n"
     assert_raises(Error) { @parser.parse_headers }
   end
 
@@ -256,7 +257,7 @@ class H1PTest < MiniTest::Test
   def test_read_body_with_content_length
     10.times do
       data = ' ' * rand(20..60000)
-      msg = "POST /foo HTTP/1.1\r\nContent-Length: #{data.bytesize}\r\n\r\n#{data}"
+      msg = "GET / HTTP/1.1\r\nContent-Length: #{data.bytesize}\r\n\r\n#{data}"
       Thread.new { @o << msg }
 
       headers = @parser.parse_headers
@@ -270,7 +271,7 @@ class H1PTest < MiniTest::Test
 
   def test_read_body_chunk_with_content_length
     data = 'abc' * 20000
-    msg = "POST /foo HTTP/1.1\r\nContent-Length: #{data.bytesize}\r\n\r\n#{data}"
+    msg = "GET / HTTP/1.1\r\nContent-Length: #{data.bytesize}\r\n\r\n#{data}"
     Thread.new { @o << msg }
     headers = @parser.parse_headers
     assert_equal data.bytesize.to_s, headers['content-length']
@@ -290,7 +291,7 @@ class H1PTest < MiniTest::Test
   def test_read_body_with_content_length_incomplete
     data = ' ' * rand(20..60000)
     Thread.new do
-      @o << "POST /foo HTTP/1.1\r\nContent-Length: #{data.bytesize + 1}\r\n\r\n#{data}"
+      @o << "GET / HTTP/1.1\r\nContent-Length: #{data.bytesize + 1}\r\n\r\n#{data}"
       @o.close # !!! otherwise the parser will keep waiting
     end
     headers = @parser.parse_headers
@@ -300,7 +301,7 @@ class H1PTest < MiniTest::Test
 
   def test_read_body_chunk_with_content_length_incomplete
     data = 'abc' * 50
-    @o << "POST /foo HTTP/1.1\r\nContent-Length: #{data.bytesize + 1}\r\n\r\n#{data}"
+    @o << "GET / HTTP/1.1\r\nContent-Length: #{data.bytesize + 1}\r\n\r\n#{data}"
     @o.close
     headers = @parser.parse_headers
 
@@ -311,7 +312,7 @@ class H1PTest < MiniTest::Test
     chunks = []
     total_sent = 0
     Thread.new do
-      msg = "POST /foo HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
+      msg = "GET / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
       @o << msg
       total_sent += msg.bytesize
       rand(8..16).times do |i|
@@ -324,7 +325,7 @@ class H1PTest < MiniTest::Test
       msg = "0\r\n\r\n"
       @o << msg
       total_sent += msg.bytesize
-    end 
+    end
     headers = @parser.parse_headers
     assert_equal 'chunked', headers['transfer-encoding']
 
@@ -337,7 +338,7 @@ class H1PTest < MiniTest::Test
     chunks = []
     total_sent = 0
     Thread.new do
-      msg = "POST /foo HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
+      msg = "GET / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
       @o << msg
       total_sent += msg.bytesize
       rand(8..16).times do |i|
@@ -350,7 +351,7 @@ class H1PTest < MiniTest::Test
       msg = "0\r\n\r\n"
       @o << msg
       total_sent += msg.bytesize
-    end 
+    end
     headers = @parser.parse_headers
     assert_equal 'chunked', headers['transfer-encoding']
 
@@ -364,7 +365,7 @@ class H1PTest < MiniTest::Test
 
   def test_read_body_with_chunked_encoding_malformed
     Thread.new do
-      @o << "POST /foo HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
+      @o << "GET / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
       chunk = ' '.to_s * rand(40000..360000)
       @o << "#{chunk.bytesize.to_s(16)}\r\n#{chunk}\r\n3"
       @o << "0\r\n\r\n"
@@ -376,22 +377,22 @@ class H1PTest < MiniTest::Test
     reset_parser
     # missing last empty chunk
     Thread.new do
-      @o << "POST /foo HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
+      @o << "GET / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
       chunk = ' '.to_s * rand(40000..360000)
       @o << "#{chunk.bytesize.to_s(16)}\r\n#{chunk}\r\n"
       @o.close
-    end 
+    end
     headers = @parser.parse_headers
     assert_raises(H1P::Error) { @parser.read_body }
 
     reset_parser
     # bad chunk size
     Thread.new do
-      @o << "POST /foo HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
+      @o << "GET / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
       chunk = ' '.to_s * rand(40000..360000)
       @o << "-#{chunk.bytesize.to_s(16)}\r\n#{chunk}\r\n"
       @o.close
-    end 
+    end
     headers = @parser.parse_headers
     assert_raises(H1P::Error) { @parser.read_body }
   end
@@ -399,7 +400,7 @@ class H1PTest < MiniTest::Test
   def test_read_body_chunk_with_chunked_encoding_malformed
     chunk = nil
     Thread.new do
-      @o << "POST /foo HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
+      @o << "GET / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
       chunk = ' ' * rand(40000..360000)
       @o << "#{chunk.bytesize.to_s(16)}\r\n#{chunk}\r\n3"
       @o << "0\r\n\r\n"
@@ -415,7 +416,7 @@ class H1PTest < MiniTest::Test
     # missing last empty chunk
     chunk = nil
     Thread.new do
-      @o << "POST /foo HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
+      @o << "GET / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
       chunk = ' '.to_s * rand(20..1600)
       @o << "#{chunk.bytesize.to_s(16)}\r\n#{chunk}\r\n"
       @o.close
@@ -429,23 +430,77 @@ class H1PTest < MiniTest::Test
 
     # bad chunk size
     Thread.new do
-      @o << "POST /foo HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
+      @o << "GET / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
       chunk = ' '.to_s * rand(20..1600)
       @o << "-#{chunk.bytesize.to_s(16)}\r\n#{chunk}\r\n"
       @o.close
-    end 
+    end
     headers = @parser.parse_headers
     assert_raises(H1P::Error) { @parser.read_body_chunk(false) }
 
     reset_parser
 
     # missing body
-    @o << "POST /foo HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
+    @o << "GET / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
     @o.close
     headers = @parser.parse_headers
     assert_raises(H1P::Error) { @parser.read_body_chunk(false) }
   end
 
+  PolyphonyMockup = Object.new
+  def PolyphonyMockup.backend_write(io, buf)
+    io << buf
+  end
+  def PolyphonyMockup.backend_splice(src, dest, len)
+    buf = src.read(len)
+    len = dest.write(buf)
+    len
+  end
+  Object::Polyphony = PolyphonyMockup
+
+  def test_splice_body_to_chunked_encoding
+    req_body = SecureRandom.alphanumeric(60000)
+    req_headers = "POST / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
+    r, w = IO.pipe
+
+    Thread.new do
+      @o << req_headers
+      @o << "#{req_body.bytesize.to_s(16)}\r\n"
+      @o << req_body
+      @o << "\r\n0\r\n\r\n"
+      @o.close
+    end
+    def w.__write_method__; :backend_write; end
+    
+    headers = @parser.parse_headers
+    @parser.splice_body_to(w)
+    w.close
+    assert_equal req_body, r.read
+
+    chunk_header_size = "#{req_body.bytesize.to_s(16)}\r\n".bytesize + "\r\n0\r\n\r\n".bytesize
+    assert_equal req_headers.bytesize + req_body.bytesize + chunk_header_size, headers[':rx']
+  end
+
+  def test_splice_body_to_content_length
+    req_body = SecureRandom.alphanumeric(60000)
+    req_headers = "POST / HTTP/1.1\r\nContent-Length: #{req_body.bytesize}\r\n\r\n"
+    r, w = IO.pipe
+
+    Thread.new do
+      @o << req_headers
+      @o << req_body
+      @o.close
+    end
+    def w.__write_method__; :backend_write; end
+    
+    headers = @parser.parse_headers
+    @parser.splice_body_to(w)
+    w.close
+    assert_equal req_body, r.read
+
+    assert_equal req_headers.bytesize + req_body.bytesize, headers[':rx']
+  end
+
   def test_complete?
     @o << "GET / HTTP/1.1\r\n\r\n"
     headers = @parser.parse_headers
@@ -519,7 +574,7 @@ class H1PTest < MiniTest::Test
     server_thread = Thread.new do
       while (socket = server.accept)
         Thread.new do
-          parser = H1P::Parser.new(socket)
+          parser = H1P::Parser.new(socket, :server)
           headers = parser.parse_headers
           socket << headers.inspect
           socket.shutdown
@@ -556,7 +611,7 @@ class H1PTest < MiniTest::Test
       request
     end
 
-    parser = H1P::Parser.new(callable)
+    parser = H1P::Parser.new(callable, :server)
 
     headers = parser.parse_headers
     assert_equal({

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: h1p
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.5'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-20 00:00:00.000000000 Z
+date: 2022-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -70,6 +70,7 @@ files:
 - Rakefile
 - TODO.md
 - benchmarks/bm_http1_parser.rb
+- benchmarks/pipelined.rb
 - examples/callable.rb
 - examples/http_server.rb
 - ext/h1p/extconf.rb
@@ -80,7 +81,9 @@ files:
 - lib/h1p.rb
 - lib/h1p/version.rb
 - test/helper.rb
-- test/test_h1p.rb
+- test/run.rb
+- test/test_h1p_client.rb
+- test/test_h1p_server.rb
 homepage: http://github.com/digital-fabric/h1p
 licenses:
 - MIT
@@ -105,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: H1P is a blocking HTTP/1 parser for Ruby