yahns 0.0.0 → 0.0.1

data/test/test_config.rb

@@ -12,45 +12,51 @@ class TestConfig < Testcase
   end
 
   def test_multi_conf_example
-    tmpdir = Dir.mktmpdir
+    pid = fork do
+      tmpdir = Dir.mktmpdir
 
-    # modify the example config file for testing
-    path = "examples/yahns_multi.conf.rb"
-    cfgs = File.read(path)
-    cfgs.gsub!(%r{/path/to/}, "#{tmpdir}/")
-    conf = File.open("#{tmpdir}/yahns_multi.conf.rb", "w")
-    conf.sync = true
-    conf.write(cfgs)
-    File.open("#{tmpdir}/another.ru", "w") do |fp|
-      fp.puts("run Rack::Lobster.new\n")
-    end
-    FileUtils.mkpath("#{tmpdir}/another")
+      # modify the example config file for testing
+      path = "examples/yahns_multi.conf.rb"
+      cfgs = File.read(path)
+      cfgs.gsub!(%r{/path/to/}, "#{tmpdir}/")
+      conf = File.open("#{tmpdir}/yahns_multi.conf.rb", "w")
+      conf.sync = true
+      conf.write(cfgs)
+      File.open("#{tmpdir}/another.ru", "w") do |fp|
+        fp.puts("run Rack::Lobster.new\n")
+      end
+      FileUtils.mkpath("#{tmpdir}/another")
 
-    cfg = GTL.synchronize { Yahns::Config.new(conf.path) }
-    assert_instance_of Yahns::Config, cfg
-  ensure
-    FileUtils.rm_rf(tmpdir) if tmpdir
+      cfg = Yahns::Config.new(conf.path)
+      FileUtils.rm_rf(tmpdir)
+      exit!(Yahns::Config === cfg)
+    end
+    _, status = Process.waitpid2(pid)
+    assert status.success?
   end
 
   def test_rack_basic_conf_example
-    tmpdir = Dir.mktmpdir
+    pid = fork do
+      tmpdir = Dir.mktmpdir
 
-    # modify the example config file for testing
-    path = "examples/yahns_rack_basic.conf.rb"
-    cfgs = File.read(path)
-    cfgs.gsub!(%r{/path/to/}, "#{tmpdir}/")
-    Dir.mkdir("#{tmpdir}/my_app")
-    Dir.mkdir("#{tmpdir}/my_logs")
-    Dir.mkdir("#{tmpdir}/my_pids")
-    conf = File.open("#{tmpdir}/yahns_rack_basic.conf.rb", "w")
-    conf.sync = true
-    conf.write(cfgs)
-    File.open("#{tmpdir}/my_app/config.ru", "w") do |fp|
-      fp.puts("run Rack::Lobster.new\n")
+      # modify the example config file for testing
+      path = "examples/yahns_rack_basic.conf.rb"
+      cfgs = File.read(path)
+      cfgs.gsub!(%r{/path/to/}, "#{tmpdir}/")
+      Dir.mkdir("#{tmpdir}/my_app")
+      Dir.mkdir("#{tmpdir}/my_logs")
+      Dir.mkdir("#{tmpdir}/my_pids")
+      conf = File.open("#{tmpdir}/yahns_rack_basic.conf.rb", "w")
+      conf.sync = true
+      conf.write(cfgs)
+      File.open("#{tmpdir}/my_app/config.ru", "w") do |fp|
+        fp.puts("run Rack::Lobster.new\n")
+      end
+      cfg = Yahns::Config.new(conf.path)
+      FileUtils.rm_rf(tmpdir) if tmpdir
+      exit!(Yahns::Config === cfg)
     end
-    cfg = GTL.synchronize { Yahns::Config.new(conf.path) }
-    assert_instance_of Yahns::Config, cfg
-  ensure
-    FileUtils.rm_rf(tmpdir) if tmpdir
+    _, status = Process.waitpid2(pid)
+    assert status.success?
   end
 end

data/test/test_rack_hijack.rb

@@ -0,0 +1,74 @@
+# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+require_relative 'server_helper'
+
+class TestRackHijack < Testcase
+  parallelize_me!
+  include ServerHelper
+  alias setup server_helper_setup
+  alias teardown server_helper_teardown
+
+  class DieIfUsed
+    def each
+      abort "body.each called after response hijack\n"
+    end
+
+    def close
+      abort "body.close called after response hijack\n"
+    end
+  end
+
+  HIJACK_APP = lambda { |env|
+    case env["PATH_INFO"]
+    when "/hijack_req"
+      io = env["rack.hijack"].call
+      if io.respond_to?(:read_nonblock) &&
+         env["rack.hijack_io"].respond_to?(:read_nonblock)
+
+        # exercise both, since we Rack::Lint may use different objects
+        env["rack.hijack_io"].write("HTTP/1.0 200 OK\r\n\r\n")
+        io.write("request.hijacked")
+        io.close
+        return [ 500, {}, DieIfUsed.new ]
+      end
+      [ 500, {}, [ "hijack BAD\n" ] ]
+    when "/hijack_res"
+      r = "response.hijacked"
+      [ 200,
+        {
+          "X-Test" => "zzz",
+          "Content-Length" => r.bytesize.to_s,
+          "rack.hijack" => proc { |x| x.write(r); x.close }
+        },
+        DieIfUsed.new
+      ]
+    end
+  }
+
+  def test_hijack
+    err = @err
+    cfg = Yahns::Config.new
+    host, port = @srv.addr[3], @srv.addr[1]
+    cfg.instance_eval do
+      GTL.synchronize { app(:rack, HIJACK_APP) { listen "#{host}:#{port}" } }
+      logger(Logger.new(err.path))
+    end
+    srv = Yahns::Server.new(cfg)
+    pid = fork do
+      ENV["YAHNS_FD"] = @srv.fileno.to_s
+      srv.start.join
+    end
+    res = Net::HTTP.start(host, port) { |h| h.get("/hijack_req") }
+    assert_equal "request.hijacked", res.body
+    assert_equal 200, res.code.to_i
+    assert_equal "1.0", res.http_version
+
+    res = Net::HTTP.start(host, port) { |h| h.get("/hijack_res") }
+    assert_equal "response.hijacked", res.body
+    assert_equal 200, res.code.to_i
+    assert_equal "zzz", res["X-Test"]
+    assert_equal "1.1", res.http_version
+  ensure
+    quit_wait(pid)
+  end
+end

data/test/test_reopen_logs.rb

@@ -0,0 +1,64 @@
+# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+require_relative 'server_helper'
+require 'rack/commonlogger'
+
+class TestReopenLogs < Testcase
+  parallelize_me!
+  include ServerHelper
+  alias setup server_helper_setup
+  alias teardown server_helper_teardown
+
+  def test_reopen_logs_noworker; reopen(false); end
+  def test_reopen_logs_worker; reopen(true); end
+
+  def reopen(worker)
+    err = @err
+    out = tmpfile(%w(log .out))
+    opath = out.path
+    cfg = Yahns::Config.new
+    host, port = @srv.addr[3], @srv.addr[1]
+    cfg.instance_eval do
+      stderr_path err.path
+      stdout_path opath
+      GTL.synchronize do
+        app = Rack::Builder.new do
+          use Rack::CommonLogger, $stdout
+          use Rack::ContentLength
+          use Rack::ContentType, "text/plain"
+          run lambda { |_| [ 200, {}, [ "#$$" ] ] }
+        end
+        app(:rack, app.to_app) { listen "#{host}:#{port}" }
+      end
+      worker_processes 1 if worker
+    end
+    pid = fork do
+      ENV["YAHNS_FD"] = @srv.fileno.to_s
+      Yahns::Server.new(cfg).start.join
+    end
+    Net::HTTP.start(host, port) do |http|
+      res = http.request(Net::HTTP::Get.new("/aaa"))
+      assert_equal 200, res.code.to_i
+      orig = res.body
+      Timeout.timeout(10) { Thread.pass until File.read(opath) =~ /aaa/ }
+      File.unlink(opath)
+      Process.kill(:USR1, pid)
+      Timeout.timeout(10) { sleep(0.01) until File.exist?(opath) }
+
+      # we need to repeat the HTTP request since the worker_processes
+      # may not have switched to the new file, yet.
+      Timeout.timeout(10) do
+        begin
+          res = http.request(Net::HTTP::Get.new("/bbb"))
+          assert_equal 200, res.code.to_i
+          assert_equal orig, res.body
+        end until File.read(opath) =~ /bbb/
+      end
+    end
+  rescue => e
+    Yahns::Log.exception(Logger.new($stderr), "test", e)
+    raise
+  ensure
+    quit_wait(pid)
+  end
+end

data/test/test_server.rb

@@ -51,8 +51,11 @@ class TestServer < Testcase
       end
     end
     Process.kill(:QUIT, pid)
-    "GET / HTTP/1.1\r\n\r\n".each_byte { |x| Thread.pass; c.write(x.chr) }
-    buf = Timeout.timeout(10) { c.read }
+    "GET / HTTP/1.1\r\nHost: example.com\r\n\r\n".each_byte do |x|
+      sleep(0.01)
+      c.write(x.chr)
+    end
+    buf = Timeout.timeout(30) { c.read }
     assert_match(/Connection: close/, buf)
     _, status = Timeout.timeout(10) { Process.waitpid2(pid) }
     assert status.success?, status.inspect
@@ -287,6 +290,7 @@ class TestServer < Testcase
 
   # Linux blocking accept() has fair behavior between multiple tasks
   def test_mp_balance
+    skip("this fails occasionally on Linux, still...")
     skip("linux-only test") unless RUBY_PLATFORM =~ /linux/
     pid, host, port = new_mp_server(2)
     seen = {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yahns
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors:
 - yahns hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
@@ -96,6 +96,7 @@ files:
 - examples/yahns_rack_basic.conf.rb
 - lib/yahns.rb
 - lib/yahns/acceptor.rb
+- lib/yahns/cap_input.rb
 - lib/yahns/client_expire.rb
 - lib/yahns/client_expire_portable.rb
 - lib/yahns/config.rb
@@ -105,6 +106,9 @@ files:
 - lib/yahns/http_context.rb
 - lib/yahns/http_response.rb
 - lib/yahns/log.rb
+- lib/yahns/max_body.rb
+- lib/yahns/max_body/rewindable_wrapper.rb
+- lib/yahns/max_body/wrapper.rb
 - lib/yahns/queue.rb
 - lib/yahns/queue_egg.rb
 - lib/yahns/queue_epoll.rb
@@ -128,11 +132,13 @@ files:
 - test/server_helper.rb
 - test/test_bin.rb
 - test/test_client_expire.rb
+- test/test_client_max_body_size.rb
 - test/test_config.rb
 - test/test_fdmap.rb
 - test/test_output_buffering.rb
-- test/test_queue.rb
 - test/test_rack.rb
+- test/test_rack_hijack.rb
+- test/test_reopen_logs.rb
 - test/test_serve_static.rb
 - test/test_server.rb
 - test/test_stream_file.rb
@@ -158,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.1.3
 signing_key: 
 specification_version: 4
 summary: sleepy, multi-threaded, non-blocking application server

data/test/test_queue.rb

@@ -1,59 +0,0 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
-require_relative 'helper'
-require 'timeout'
-require 'stringio'
-
-class TestQueue < Testcase
-  parallelize_me!
-
-  def setup
-    @q = Yahns::Queue.new
-    @err = StringIO.new
-    @logger = Logger.new(@err)
-    @q.fdmap = @fdmap = Yahns::Fdmap.new(@logger, 0.5)
-    assert @q.close_on_exec?
-  end
-
-  def test_queue
-    r, w = IO.pipe
-    assert_equal 0, @fdmap.size
-    @q.queue_add(r, Yahns::Queue::QEV_RD)
-    assert_equal 1, @fdmap.size
-    def r.yahns_step
-      begin
-        case read_nonblock(11)
-        when "delete"
-          return :delete
-        end
-      rescue Errno::EAGAIN
-        return :wait_readable
-      rescue EOFError
-        return nil
-      end while true
-    end
-    w.write('.')
-    Timeout.timeout(10) do
-      Thread.pass until r.nread > 0
-      @q.spawn_worker_threads(@logger, 1, 1)
-      Thread.pass until r.nread == 0
-
-      w.write("delete")
-      Thread.pass until r.nread == 0
-      Thread.pass until @fdmap.size == 0
-
-      # should not raise
-      @q.queue_add(r, Yahns::Queue::QEV_RD)
-      assert_equal 1, @fdmap.size
-      w.close
-      Thread.pass until @fdmap.size == 0
-    end
-    assert r.closed?
-  ensure
-    [ r, w ].each { |io| io.close unless io.closed? }
-  end
-
-  def teardown
-    @q.close
-  end
-end