yahns 1.6.0 → 1.7.0

data/test/test_rack_hijack.rb

@@ -8,18 +8,14 @@ class TestRackHijack < Testcase
   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_input"
+      io = env["rack.hijack"].call
+      env["rack.hijack_io"].write("HTTP/1.0 201 OK\r\n\r\n")
+      io.write("rack.input contents: #{env['rack.input'].read}")
+      io.close
+      return [ 500, {}, DieIfUsed.new ]
     when "/hijack_req"
       io = env["rack.hijack"].call
       if io.respond_to?(:read_nonblock) &&
@@ -64,6 +60,14 @@ class TestRackHijack < Testcase
     assert_equal 200, res.code.to_i
     assert_equal "zzz", res["X-Test"]
     assert_equal "1.1", res.http_version
+
+    res = Net::HTTP.start(host, port) do |h|
+      hdr = { "Content-Type" => 'application/octet-stream' }
+      h.put("/hijack_input", "BLAH", hdr)
+    end
+    assert_equal "rack.input contents: BLAH", res.body
+    assert_equal 201, res.code.to_i
+    assert_equal "1.0", res.http_version
   ensure
     quit_wait(pid)
   end

data/test/test_server.rb

@@ -815,7 +815,7 @@ class TestServer < Testcase
       GTL.synchronize { app(:rack, ru) { listen "#{host}:#{port}" } }
       logger(Logger.new(err.path))
     end
-    mkserver(cfg, @srv) do
+    pid = mkserver(cfg, @srv) do
       s2.autoclose = false
       ENV["YAHNS_FD"] = "#{@srv.fileno},#{s2.fileno}"
     end
@@ -842,5 +842,7 @@ class TestServer < Testcase
     assert_nil a2.read(1)
     a2.close
     s2.close
+  ensure
+    quit_wait(pid)
   end
 end

data/test/test_ssl.rb

@@ -71,6 +71,15 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
       end
     end
     client = ssl_client(host, port)
+    client.write("GET / HTTP/1.1\r\nHost: example.com\r\n\r\n")
+    buf = ''
+    Timeout.timeout(60) do
+      buf << client.readpartial(111) until buf =~ /HI\z/
+    end
+    head, body = buf.split("\r\n\r\n", 2)
+    assert_equal "HI", body
+    assert_match %r{\AHTTP/1\.\d 200 OK\r\n}, head
+
     client.write("GET / HTTP/1.0\r\n\r\n")
     head, body = client.read.split("\r\n\r\n", 2)
     assert_equal "HI", body
@@ -79,4 +88,67 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
     client.close if client
     quit_wait(pid)
   end
+
+  def test_ssl_hijack
+    err, cfg, host, port = @err, Yahns::Config.new, @srv.addr[3], @srv.addr[1]
+    ctx = srv_ctx
+    pid = mkserver(cfg) do
+      cfg.instance_eval do
+        ru = lambda do |env|
+          io = env['rack.hijack'].call
+          Thread.new(io) do |s|
+            s.write "HTTP/1.1 201 Switching Protocols\r\n\r\n"
+            case req = s.gets
+            when "inspect\n"
+              s.puts(s.instance_variable_get(:@ssl).inspect)
+            when "remote_address\n"
+              s.puts(s.remote_address.inspect)
+            when "each\n"
+              line = ''
+              s.each do |l|
+                l.strip!
+                line << l
+                break if l == 'd'
+              end
+              s.puts line
+            when "missing\n"
+              begin
+                s.any_old_invalid_test_method
+                s.puts "FAIL"
+              rescue => e
+                s.puts "#{e.class}: #{e.message}"
+              end
+            when nil
+              s.close
+            else
+              p [ :ERR, req ]
+            end until s.closed?
+          end
+          [ 200, DieIfUsed, DieIfUsed ]
+        end
+        app(:rack, ru) { listen "#{host}:#{port}", ssl_ctx: ctx }
+        logger(Logger.new(err.path))
+      end
+    end
+    client = ssl_client(host, port)
+    client.write("GET / HTTP/1.0\r\n\r\n")
+
+    Timeout.timeout(60) do
+      assert_equal "HTTP/1.1 201 Switching Protocols\r\n", client.gets
+      assert_equal "\r\n", client.gets
+      client.puts "inspect"
+      assert_match %r{SSLSocket}, client.gets
+      client.puts "remote_address"
+      assert_equal client.to_io.local_address.inspect, client.gets.strip
+      client.puts "missing"
+      assert_match %r{NoMethodError}, client.gets
+
+      client.puts "each"
+      %w(a b c d).each { |x| client.puts(x) }
+      assert_equal "abcd", client.gets.strip
+    end
+  ensure
+    client.close if client
+    quit_wait(pid)
+  end
 end if defined?(OpenSSL)

data/test/test_tmpio.rb

@@ -0,0 +1,20 @@
+# -*- encoding: binary -*-
+# Copyright (C) 2009-2015 all contributors <yahns-public@yhbt.net>
+# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-2.0.txt)
+require_relative 'helper'
+
+class TestTmpIO < Testcase
+  def test_writev
+    a, b = UNIXSocket.pair
+    a.extend Kgio::PipeMethods
+    tmpio = Yahns::TmpIO.new(Dir.tmpdir)
+    ary = [ "hello\n".freeze, "world\n".freeze ].freeze
+    tmpio.kgio_trywritev(ary)
+    a.trysendfile(tmpio, 0, 12)
+    assert_equal "hello\nworld\n", b.read(12)
+  ensure
+    b.close
+    a.close
+    tmpio.close
+  end
+end

data/test/test_wbuf.rb

@@ -19,7 +19,8 @@ class TestWbuf < Testcase
     buf = "*" * (16384 * 2)
     nr = 1000
     [ true, false ].each do |persist|
-      wbuf = Yahns::Wbuf.new([], persist, Dir.tmpdir)
+      wbuf = Yahns::Wbuf.new([], persist, Dir.tmpdir, :wait_writable)
+      assert_equal :wait_writable, wbuf.busy
       a, b = socketpair
       assert_nil wbuf.wbuf_write(a, "HIHI")
       assert_equal "HIHI", b.read(4)
@@ -69,7 +70,7 @@ class TestWbuf < Testcase
         break
       end while true
     end
-    wbuf = Yahns::Wbuf.new([], true, Dir.tmpdir)
+    wbuf = Yahns::Wbuf.new([], true, Dir.tmpdir, :wait_writable)
     assert_equal :wait_writable, wbuf.wbuf_write(a, buf)
     assert_equal :wait_writable, wbuf.wbuf_flush(a)
 
@@ -93,7 +94,7 @@ class TestWbuf < Testcase
   def test_wbuf_flush_close
     pipe = cloexec_pipe
     persist = true
-    wbuf = Yahns::Wbuf.new(pipe[0], persist, Dir.tmpdir)
+    wbuf = Yahns::Wbuf.new(pipe[0], persist, Dir.tmpdir, :wait_writable)
     refute wbuf.respond_to?(:close) # we don't want this for HttpResponse body
     sp = socketpair
     rv = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yahns
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - yahns hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
@@ -138,6 +138,8 @@ files:
 - lib/yahns/max_body/wrapper.rb
 - lib/yahns/openssl_client.rb
 - lib/yahns/openssl_server.rb
+- lib/yahns/proxy_http_response.rb
+- lib/yahns/proxy_pass.rb
 - lib/yahns/queue.rb
 - lib/yahns/queue_egg.rb
 - lib/yahns/queue_epoll.rb
@@ -185,6 +187,7 @@ files:
 - test/test_input.rb
 - test/test_mt_accept.rb
 - test/test_output_buffering.rb
+- test/test_proxy_pass.rb
 - test/test_rack.rb
 - test/test_rack_hijack.rb
 - test/test_reopen_logs.rb
@@ -193,6 +196,7 @@ files:
 - test/test_server.rb
 - test/test_ssl.rb
 - test/test_stream_file.rb
+- test/test_tmpio.rb
 - test/test_unix_socket.rb
 - test/test_wbuf.rb
 - yahns.gemspec