yahns 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e1ce64c8f47f927355913c766a4c7cc3d007089
-  data.tar.gz: 29d5d3c75d4b05671d62f30987c71afa544d6950
+  metadata.gz: 0bea696fff5f5d58044ab6f62df4b89d0b03a4d5
+  data.tar.gz: 7936ab7581a763fac0e466a98f5d88e8ff1e8a1a
 SHA512:
-  metadata.gz: 5fdfdb0cf9f3baf831cdf5d8af0f6779f2efc930c6736bdd5f31a18ea4248cf93643476208bfa93e2d43eb9026988b14a084cd708121098489bec599bf55f8d1
-  data.tar.gz: 6c1f462a5a96ae40eed022c339994e2254ddd3fdb9b95a453ddda67ab04b509badf35868a69840b97a28a66a613fc20407f9104ac6eb769d11ca72a1d553d10d
+  metadata.gz: a8ead2093e262430942ffbd4fc438d1160903b0fbb5c61f32f2339022d46488d9e7ad370714494f2232e09a1759e3c2d4b8216e1dad68f5b0abcf82cccf3abf1
+  data.tar.gz: cd8b7d89b7341c7aa1da9681ccadff2d9d2a828107d8b1ca37354daffeee8b46039b752babd326ef5e51ecb1b97720e3a75d2c7ea55e687758b17aa87e3ee6b8

data/GIT-VERSION-GEN

@@ -4,7 +4,7 @@
 CONSTANT = "Yahns::VERSION"
 RVF = "lib/yahns/version.rb"
 GVF = "GIT-VERSION-FILE"
-DEF_VER = "v1.7.0"
+DEF_VER = "v1.8.0"
 vn = DEF_VER
 
 # First see if there is a version file (included in release tarballs),

data/lib/yahns/http_client.rb

@@ -20,7 +20,6 @@ class Yahns::HttpClient < Kgio::Socket # :nodoc:
   # called from acceptor thread
   def yahns_init
     @hs = Unicorn::HttpRequest.new
-    @response_start_sent = false
     @state = :headers # :body, :trailers, :pipelined, Wbuf, StreamFile
     @input = nil
   end
@@ -194,9 +193,9 @@ class Yahns::HttpClient < Kgio::Socket # :nodoc:
       mkinput_preread # keep looping (@state == :body)
       true
     else # :lazy, false
-      r = k.app.call(env = @hs.env)
-      return :ignore if env.include?(RACK_HIJACK_IO)
-      http_response_write(*r)
+      status, headers, body = k.app.call(env = @hs.env)
+      return :ignore if app_hijacked?(env, body)
+      http_response_write(status, headers, body)
     end
   end
 
@@ -218,7 +217,7 @@ class Yahns::HttpClient < Kgio::Socket # :nodoc:
 
     # run the rack app
     status, headers, body = k.app.call(env.merge!(k.app_defaults))
-    return :ignore if env.include?(RACK_HIJACK_IO)
+    return :ignore if app_hijacked?(env, body)
     if status.to_i == 100
       rv = http_100_response(env) and return rv
       status, headers, body = k.app.call(env)
@@ -299,4 +298,10 @@ class Yahns::HttpClient < Kgio::Socket # :nodoc:
     shutdown rescue nil
     return # always drop the connection on uncaught errors
   end
+
+  def app_hijacked?(env, body)
+    return false unless env.include?(RACK_HIJACK_IO)
+    body.close if body.respond_to?(:close)
+    true
+  end
 end

data/lib/yahns/http_response.rb

@@ -46,7 +46,7 @@ module Yahns::HttpResponse # :nodoc:
   end
 
   def response_start
-    @response_start_sent ? Z : RESPONSE_START
+    @hs.response_start_sent ? Z : RESPONSE_START
   end
 
   def response_wait_write(rv)
@@ -69,7 +69,9 @@ module Yahns::HttpResponse # :nodoc:
     end
     wbuf = Yahns::Wbuf.new(body, alive, self.class.output_buffer_tmpdir, ret)
     rv = wbuf.wbuf_write(self, header)
-    body.each { |chunk| rv = wbuf.wbuf_write(self, chunk) } if body
+    if body && ! alive.respond_to?(:call) # skip body.each if hijacked
+      body.each { |chunk| rv = wbuf.wbuf_write(self, chunk) }
+    end
     wbuf_maybe(wbuf, rv)
   end
 
@@ -94,7 +96,6 @@ module Yahns::HttpResponse # :nodoc:
   def http_response_done(alive)
     @input = @input.close if @input
     if alive
-      @response_start_sent = false
       # @hs.buf will have data if the client pipelined
       if @hs.buf.empty?
         @state = :headers
@@ -156,7 +157,6 @@ module Yahns::HttpResponse # :nodoc:
           buf << kv_str(key, value)
         when "rack.hijack"
           hijack = value
-          body = nil # ensure we do not close body
         else
           buf << kv_str(key, value)
         end
@@ -224,7 +224,7 @@ module Yahns::HttpResponse # :nodoc:
   # returns nil on success
   # :wait_readable/:wait_writable/:close for epoll
   def do_ccc
-    @response_start_sent = true
+    @hs.response_start_sent = true
     wbuf = nil
     rv = nil
     CCC_RESPONSE_START.each do |buf|
@@ -256,8 +256,8 @@ module Yahns::HttpResponse # :nodoc:
   # returns :close, :wait_writable, or :wait_readable
   def http_100_response(env)
     env.delete("HTTP_EXPECT") =~ /\A100-continue\z/i or return
-    buf = @response_start_sent ? "100 Continue\r\n\r\nHTTP/1.1 ".freeze
-                               : "HTTP/1.1 100 Continue\r\n\r\n".freeze
+    buf = @hs.response_start_sent ? "100 Continue\r\n\r\nHTTP/1.1 ".freeze
+                                  : "HTTP/1.1 100 Continue\r\n\r\n".freeze
 
     case rv = kgio_trywrite(buf)
     when String

data/lib/yahns/proxy_http_response.rb

@@ -66,6 +66,7 @@ module Yahns::HttpResponse # :nodoc:
                 env[REQUEST_METHOD] != HEAD
     flags = MSG_DONTWAIT
     alive = @hs.next? && self.class.persistent_connections
+    response_headers = env['yahns.proxy_pass.response_headers']
 
     res = "HTTP/1.1 #{status}\r\n"
     headers.each do |key,value| # n.b.: headers is an Array of 2-element Arrays
@@ -76,6 +77,14 @@ module Yahns::HttpResponse # :nodoc:
         flags |= MSG_MORE if have_body && value.to_i > 0
       end
 
+      # response header mapping
+      case val = response_headers[key]
+      when :ignore
+        next
+      when String
+        value = val
+      end
+
       res << "#{key}: #{value}\r\n"
     end
 

data/lib/yahns/proxy_pass.rb

@@ -149,8 +149,10 @@ class Yahns::ProxyPass # :nodoc:
     end
 
     def close_req_body(input)
+      # we cannot use respond_to?(:close) here since Rack::Lint::InputWrapper
+      # tries to prevent that (and hijack means all Rack specs go out the door)
       case input
-      when Yahns::TeeInput, IO, StringIO
+      when Yahns::TeeInput, IO
         input.close
       end
     end
@@ -170,7 +172,7 @@ class Yahns::ProxyPass # :nodoc:
     end
   end # class ReqRes
 
-  def initialize(dest)
+  def initialize(dest, opts = {})
     case dest
     when %r{\Aunix:([^:]+)(?::(/.*))?\z}
       path = $2
@@ -182,6 +184,12 @@ class Yahns::ProxyPass # :nodoc:
     else
       raise ArgumentError, "destination must be an HTTP URL or unix: path"
     end
+    @response_headers = opts[:response_headers] || {}
+
+    # It's wrong to send the backend Server tag through.  Let users say
+    # { "Server => "yahns" } if they want to advertise for us, but don't
+    # advertise by default (for security)
+    @response_headers['Server'] ||= :ignore
     init_path_vars(path)
   end
 
@@ -235,6 +243,7 @@ class Yahns::ProxyPass # :nodoc:
     ctype = env["CONTENT_TYPE"] and req << "Content-Type: #{ctype}\r\n"
     clen = env["CONTENT_LENGTH"] and req << "Content-Length: #{clen}\r\n"
     input = chunked || (clen && clen.to_i > 0) ? env['rack.input'] : nil
+    env['yahns.proxy_pass.response_headers'] = @response_headers
 
     # finally, prepare to emit the headers
     rr.req_start(c, req << "\r\n".freeze, input, chunked)

data/lib/yahns/queue_epoll.rb

@@ -15,7 +15,7 @@ class Yahns::Queue < SleepyPenguin::Epoll::IO # :nodoc:
   QEV_WR = Epoll::OUT | Epoll::ONESHOT
 
   def self.new
-    super(SleepyPenguin::Epoll::CLOEXEC)
+    super(Epoll::CLOEXEC)
   end
 
   # for HTTP and HTTPS servers, we rely on the io writing to us, first

data/lib/yahns/server_mp.rb

@@ -103,13 +103,13 @@ module Yahns::ServerMP # :nodoc:
       when :USR2 # exec binary, stay alive in case something went wrong
         reexec
       when :WINCH
-        if @daemon_pipe
+        if $stdin.tty?
+          @logger.info "SIGWINCH ignored because we're not daemonized"
+        else
           state = :WINCH
           @logger.info "gracefully stopping all workers"
           soft_kill_each_worker("QUIT")
           @worker_processes = 0
-        else
-          @logger.info "SIGWINCH ignored because we're not daemonized"
         end
       when :TTIN
         state = :respawn unless state == :QUIT

data/lib/yahns/sigevent_efd.rb

@@ -4,7 +4,7 @@
 class Yahns::Sigevent < SleepyPenguin::EventFD # :nodoc:
   include Kgio::DefaultWaiters
   def self.new
-    super(0, SleepyPenguin::EventFD::CLOEXEC)
+    super(0, :CLOEXEC)
   end
 
   def sev_signal

data/test/helper.rb

@@ -134,12 +134,13 @@ def require_exec(cmd)
 end
 
 class DieIfUsed
+  @@n = 0
   def each
     abort "body.each called after response hijack\n"
   end
 
   def close
-    abort "body.close called after response hijack\n"
+    warn "INFO #$$ closed DieIfUsed #{@@n += 1}"
   end
 end
 

data/test/test_extras_proxy_pass.rb

@@ -1,6 +1,10 @@
 # Copyright (C) 2015 all contributors <yahns-public@yhbt.net>
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative 'server_helper'
+begin
+  require 'kcar'
+rescue LoadError
+end
 
 class TestExtrasProxyPass < Testcase
   ENV["N"].to_i > 1 and parallelize_me!
@@ -27,6 +31,7 @@ class TestExtrasProxyPass < Testcase
   def setup
     @srv2 = TCPServer.new(ENV["TEST_HOST"] || "127.0.0.1", 0)
     server_helper_setup
+    skip "kcar missing for extras/proxy_pass" unless defined?(Kcar)
   end
 
   def teardown

data/test/test_proxy_pass.rb

@@ -3,6 +3,10 @@
 require_relative 'server_helper'
 require 'json'
 require 'digest'
+begin
+  require 'kcar'
+rescue LoadError
+end
 
 class TestProxyPass < Testcase
   ENV["N"].to_i > 1 and parallelize_me!
@@ -163,6 +167,7 @@ class TestProxyPass < Testcase
   def setup
     @srv2 = TCPServer.new(ENV["TEST_HOST"] || "127.0.0.1", 0)
     server_helper_setup
+    skip "kcar missing yahns/proxy_pass" unless defined?(Kcar)
   end
 
   def teardown

data/test/test_rack_hijack.rb

@@ -48,6 +48,7 @@ class TestRackHijack < Testcase
     cfg.instance_eval do
       GTL.synchronize { app(:rack, HIJACK_APP) { listen "#{host}:#{port}" } }
       logger(Logger.new(err.path))
+      stderr_path err.path
     end
     pid = mkserver(cfg)
     res = Net::HTTP.start(host, port) { |h| h.get("/hijack_req") }
@@ -61,6 +62,10 @@ class TestRackHijack < Testcase
     assert_equal "zzz", res["X-Test"]
     assert_equal "1.1", res.http_version
 
+    errs = File.readlines(err.path).grep(/DieIfUsed/)
+    assert_equal([ "INFO #{pid} closed DieIfUsed 1\n",
+                   "INFO #{pid} closed DieIfUsed 2\n" ], errs)
+
     res = Net::HTTP.start(host, port) do |h|
       hdr = { "Content-Type" => 'application/octet-stream' }
       h.put("/hijack_input", "BLAH", hdr)

data/test/test_ssl.rb

@@ -124,10 +124,11 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
               p [ :ERR, req ]
             end until s.closed?
           end
-          [ 200, DieIfUsed, DieIfUsed ]
+          [ 200, DieIfUsed.new, DieIfUsed.new ]
         end
         app(:rack, ru) { listen "#{host}:#{port}", ssl_ctx: ctx }
         logger(Logger.new(err.path))
+        stderr_path err.path
       end
     end
     client = ssl_client(host, port)
@@ -147,6 +148,8 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
       %w(a b c d).each { |x| client.puts(x) }
       assert_equal "abcd", client.gets.strip
     end
+    errs = File.readlines(err.path).grep(/DieIfUsed/)
+    assert_equal([ "INFO #{pid} closed DieIfUsed 1\n" ], errs)
   ensure
     client.close if client
     quit_wait(pid)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yahns
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - yahns hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio