yahns 0.0.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fff238b384ecd740912bd989b3f9f5940f1a8ed1
-  data.tar.gz: 4f0a23620f3de110285e6f0da568dbb8448713ec
+  metadata.gz: 33525c7e184e8f29a1667fb401ce20bcda42f30e
+  data.tar.gz: 13d18fdee5cfbd47bb3d83046c5e388e06c08495
 SHA512:
-  metadata.gz: 019a14bdaf0613f75c89b1b170f705373698645a115f06f260e008080f3cb1b365091a2cfface0695bc841b090fd1d528d35b0ea54f0fa4b74424c6d28fc4cd0
-  data.tar.gz: ff28c0cee74dc2602ca0eb74dca63e9b98e84c28179f043db8875f29537b15a3d6df9b93439fbdc12cdfe6deb7006575248d7e54cce56351baefde378ba62494
+  metadata.gz: c1cdd01498c6a8719efa5e246783ca00fd7dd2c31caaf4e7a345cbd3716f67ab962ecd1dd3c39819cc74cb4e58900fa08c6497554dfeefb1152c7cabf89d1b40
+  data.tar.gz: 3b087200a116d46b7b7c4ebfc5e2c58f7315ff53c19ff02414b289258f43d40e0ecd79348ba96731bbd081d1bea6cd04695aeb18d0cfbcef96ec359db782600d

data/GIT-VERSION-GEN

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

data/HACKING

@@ -4,6 +4,7 @@ development dependencies
 * minitest RubyGem (version 4 or 5, standard in Ruby 2.0+)
 * curl - http://curl.haxx.se/ - we don't trust our own Ruby abilities :>
 * dd(1) - standard POSIX tool - to feed curl
+* ab - http://httpd.apache.org - for concurrent testing
 * GNU make - https://www.gnu.org/software/make/
 * git - http://www.git-scm.com/
 * ruby - http://www.ruby-lang.org/

data/extras/autoindex.rb

@@ -42,7 +42,7 @@ class Autoindex
       return res if status.to_i != 404
 
       path_info = env["PATH_INFO"]
-      path_info_ue = Rack::Utils.unescape(path_info)
+      path_info_ue = Rack::Utils.unescape(path_info, Encoding::BINARY)
 
       # reject requests to go up a level (browser takes care of it)
       path_info_ue =~ /\.\./ and return r(403)
@@ -112,15 +112,18 @@ class Autoindex
   rescue Errno::ENOENT, Errno::ENOTDIR # from Dir.open
     r(404)
   rescue => e
-    r(500, e.message, env)
+    r(500, e, env)
   ensure
     dir.close if dir
   end
 
   def r(code, msg = nil, env = nil)
-    if env && logger = env["rack.logger"]
+    if env && exc && logger = env["rack.logger"]
+      msg = exc.message
+      msg = msg.dump if /[[:cntrl:]]/ =~ msg # prevent code injection
       logger.warn("#{env['REQUEST_METHOD']} #{env['PATH_INFO']} " \
-                  "#{code} #{msg.inspect}")
+                  "#{code} #{msg}")
+      exc.backtrace.each { |line| logger.warn(line) }
     end
 
     if Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.include?(code)

data/extras/exec_cgi.rb

@@ -4,23 +4,26 @@
 #
 # if running under yahns, worker_processes is recommended to avoid conflicting
 # with the SIGCHLD handler in yahns.
+
+# Be careful if using Rack::Deflater, this needs the following commit
+# (currently in rack.git, not yet in 1.5.2):
+#  commit 7bda8d485b38403bf07f43793d37b66b7a8281d6
+#  (delfater: ensure that parent body is always closed)
+# Otherwise you will get zombies from HEAD requests which accept compressed
+# responses.
 class ExecCgi
   class MyIO < Kgio::Pipe
     attr_writer :my_pid
     attr_writer :body_tip
-    attr_writer :chunked
 
     def each
       buf = @body_tip || ""
       if buf.size > 0
-        buf = "#{buf.size.to_s(16)}\r\n#{buf}\r\n" if @chunked
         yield buf
       end
       while tmp = kgio_read(8192, buf)
-        tmp = "#{tmp.size.to_s(16)}\r\n#{tmp}\r\n" if @chunked
         yield tmp
       end
-      yield("0\r\n\r\n") if @chunked
       self
     ensure
       # do this sooner, since the response body may be buffered, we want
@@ -46,7 +49,6 @@ class ExecCgi
   PASS_VARS = %w(
     CONTENT_LENGTH
     CONTENT_TYPE
-    GATEWAY_INTERFACE
     AUTH_TYPE
     PATH_INFO
     PATH_TRANSLATED
@@ -88,9 +90,10 @@ class ExecCgi
         tmp = pipe.kgio_read(8192) or break
         head << tmp
       end
-      head, body = head.split(/\r?\n\r?\n/)
+      head, body = head.split(/\r?\n\r?\n/, 2)
       pipe.body_tip = body
-      pipe.chunked = false
+
+      env["HTTP_VERSION"] ||= "HTTP/1.0" # stop Rack::Chunked for HTTP/0.9
 
       headers = Rack::Utils::HeaderHash.new
       prev = nil
@@ -101,16 +104,6 @@ class ExecCgi
         end
       end
       status = headers.delete("Status") || 200
-      unless headers.include?("Content-Length") ||
-             headers.include?("Transfer-Encoding")
-        case env['HTTP_VERSION']
-        when 'HTTP/1.0', nil
-          # server will drop connection anyways
-        else
-          headers["Transfer-Encoding"] = "chunked"
-          pipe.chunked = true
-        end
-      end
       errbody = nil
       [ status, headers, pipe ]
     else

data/extras/try_gzip_static.rb

@@ -1,3 +1,4 @@
+# -*- encoding: binary -*-
 # 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 'time'
@@ -11,9 +12,9 @@ class TryGzipStatic
     # attr_writer :sf_range
 
     # only used if the server does not handle #to_path,
-    # yahns should never hit this
+    # we actually hit this if serving the gzipped file in the first place,
+    # _and_ Rack::Deflater is used in the middleware stack.  Oh well...
     def each
-      raise "we should never get here in yahns"
       buf = ""
       rsize = 8192
       if @sf_range
@@ -32,12 +33,12 @@ class TryGzipStatic
   end
 
   def initialize(root, default_type = 'text/plain')
-    @root = root
+    @root = root.b
     @default_type = default_type
   end
 
   def fspath(env)
-    path_info = Rack::Utils.unescape(env["PATH_INFO"])
+    path_info = Rack::Utils.unescape(env["PATH_INFO"], Encoding::BINARY)
     path_info =~ /\.\./ ? nil : "#@root#{path_info}"
   end
 
@@ -76,6 +77,7 @@ class TryGzipStatic
       "Last-Modified" => st.mtime.httpdate,
       "Accept-Ranges" => "bytes",
     }
+    h["Cache-Control"] = "no-transform" unless mime =~ %r{\Atext\/}
     h["Content-Encoding"] = "gzip" if gz_st
     h
   end
@@ -91,12 +93,12 @@ class TryGzipStatic
     begin
       st = File.stat(path)
       st.file? ? [ path, st ] : r(404)
-    rescue Errno::ENOENT
+    rescue Errno::ENOENT, Errno::ENOTDIR
       r(404)
     rescue Errno::EACCES
       r(403)
     rescue => e
-      r(500, e.message, env)
+      r(500, e, env)
     end
   end
 
@@ -127,7 +129,7 @@ class TryGzipStatic
         rescue Errno::ENOENT, Errno::EACCES
           head_no_gz(res, env, path, st)
         rescue => e
-          r(500, e.message, env)
+          r(500, e, env)
         end
       end
     else # 416, 304
@@ -189,13 +191,18 @@ class TryGzipStatic
   rescue Errno::EACCES # could get here from a race
     r(403)
   rescue => e
-    r(500, e.message, env)
+    r(500, e, env)
   end
 
-  def r(code, msg = nil, env = nil)
-    if env && logger = env["rack.logger"]
+  def r(code, exc = nil, env = nil)
+    if env && exc && logger = env["rack.logger"]
+      msg = exc.message if exc.respond_to?(:message)
+      msg = msg.dump if /[[:cntrl:]]/ =~ msg # prevent code injection
       logger.warn("#{env['REQUEST_METHOD']} #{env['PATH_INFO']} " \
-                  "#{code} #{msg.inspect}")
+                  "#{code} #{msg}")
+      if exc.respond_to?(:backtrace)
+        exc.backtrace.each { |line| logger.warn(line) }
+      end
     end
 
     if Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.include?(code)

data/lib/yahns/http_response.rb

@@ -15,11 +15,18 @@ require_relative 'wbuf_str'
 module Yahns::HttpResponse # :nodoc:
   include Unicorn::HttpResponse
 
+  if defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
+    MTX = Mutex.new
+    def httpdate
+      MTX.synchronize { super }
+    end
+  end
+
   # avoid GC overhead for frequently used-strings:
   CONN_KA = "Connection: keep-alive\r\n\r\n"
   CONN_CLOSE = "Connection: close\r\n\r\n"
   Z = ""
-  CCC_RESPONSE_START = [ 'HTTP', '/1.1 ' ].map!(&:freeze)
+  CCC_RESPONSE_START = [ 'HTTP', '/1.1 ' ]
   RESPONSE_START = CCC_RESPONSE_START.join('')
   R100_RAW = "HTTP/1.1 100 Continue\r\n\r\n"
   R100_CCC = "100 Continue\r\n\r\nHTTP/1.1 "

data/test/helper.rb

@@ -119,6 +119,14 @@ def cloexec_pipe
   IO.pipe.each { |io| io.close_on_exec = true }
 end
 
+def require_exec(cmd)
+  ENV["PATH"].split(/:/).each do |path|
+    return true if File.executable?("#{path}/#{cmd}")
+  end
+  skip "#{cmd} not found in PATH"
+  false
+end
+
 require 'yahns'
 
 # needed for parallel (MT) tests)

data/test/test_client_expire.rb

@@ -32,6 +32,7 @@ class TestClientExpire < Testcase
   end
 
   def test_client_expire
+    require_exec "ab"
     nr = 32
     err = @err
     cfg = Yahns::Config.new
@@ -74,6 +75,7 @@ class TestClientExpire < Testcase
 
   # test EMFILE handling
   def test_client_expire_desperate
+    require_exec "ab"
     err = @err
     cfg = Yahns::Config.new
     host, port = @srv.addr[3], @srv.addr[1]

data/test/test_extras_exec_cgi.rb

@@ -17,7 +17,8 @@ class TestExtrasExecCGI < Testcase
     pid = mkserver(cfg) do
       require './extras/exec_cgi'
       cfg.instance_eval do
-        app(:rack, ExecCgi.new(RUNME)) { listen "#{host}:#{port}" }
+        stack = Rack::ContentLength.new(Rack::Chunked.new(ExecCgi.new(RUNME)))
+        app(:rack, stack) { listen "#{host}:#{port}" }
         stderr_path err.path
         worker_processes 1
       end
@@ -96,7 +97,8 @@ class TestExtrasExecCGI < Testcase
     pid = mkserver(cfg) do
       require './extras/exec_cgi'
       cfg.instance_eval do
-        app(:rack, ExecCgi.new(RUNME)) { listen "#{host}:#{port}" }
+        stack = Rack::ContentLength.new(Rack::Chunked.new(ExecCgi.new(RUNME)))
+        app(:rack, stack) { listen "#{host}:#{port}" }
         stderr_path err.path
         worker_processes 1
       end
@@ -133,7 +135,8 @@ class TestExtrasExecCGI < Testcase
       Yahns::HttpClient.__send__(:include, TrywriteBlocked)
       require './extras/exec_cgi'
       cfg.instance_eval do
-        app(:rack, ExecCgi.new(RUNME)) { listen "#{host}:#{port}" }
+        stack = Rack::ContentLength.new(Rack::Chunked.new(ExecCgi.new(RUNME)))
+        app(:rack, stack) { listen "#{host}:#{port}" }
         stderr_path err.path
         worker_processes 1
       end

data/test/test_extras_try_gzip_static.rb

@@ -172,6 +172,11 @@ class TestExtrasTryGzipStatic < Testcase
       end
       assert_nil body
     end
+
+    Net::HTTP.start(host, port) do |http|
+      res = http.request(Net::HTTP::Get.new('/COPYING/foo'))
+      assert_equal 404, res.code.to_i
+    end
   ensure
     quit_wait(pid)
   end

data/yahns.gemspec

@@ -13,10 +13,15 @@ Gem::Specification.new do |s|
   s.add_dependency(%q<kgio>, '~> 2.8')
   s.add_dependency(%q<sleepy_penguin>, '~> 3.2')
   s.add_dependency(%q<sendfile>, '~> 1.2.1')
-  s.add_dependency(%q<unicorn>, '~> 4.6.3')
+  s.add_dependency(%q<unicorn>, '~> 4.6', '>= 4.6.3')
+
+  # minitest is standard in Ruby 2.0, 4.3 is packaged with Ruby 2.0.0,
+  # 4.7.5 with 2.1.  We work with minitest 5, too.  6.x does not exist
+  # at the time of this writing.  We should always be compatible with
+  # minitest (or test-unit) library packaged with the latest official
+  # Matz Ruby release.
+  s.add_development_dependency(%q<minitest>, '>= 4.3', '< 6.0')
 
-  # minitest is standard in Ruby 2.0
-  s.add_development_dependency(%q<minitest>, '~> 4.3', '~> 5.0')
   s.homepage = "http://yahns.yhbt.net/README"
   s.licenses = "GPLv3+"
 end

metadata

@@ -1,91 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: yahns
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.0.0
 platform: ruby
 authors:
 - yahns hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-10 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
 - !ruby/object:Gem::Dependency
   name: sleepy_penguin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: sendfile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: unicorn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.6'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.6'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.6.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.3'
-    - - ~>
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.3'
-    - - ~>
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 description: |-
   A Free Software, multi-threaded, non-blocking network application server
   designed for low _idle_ power consumption.  It is primarily optimized
@@ -100,7 +106,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - COPYING
 - Documentation/.gitignore
 - Documentation/GNUmakefile
@@ -206,17 +212,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: sleepy, multi-threaded, non-blocking application server