yahns 1.12.1 → 1.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fd3617f72db8e2c7a45a5b0273571b721c9cfad
-  data.tar.gz: 144a50bd647079d46b5e78a80b659eed0b107a8d
+  metadata.gz: 7e7f2c5c9c51e65d39f39ecb7424434393e72673
+  data.tar.gz: dbbc9e3459a4f89ab0bd2ad46bd72f60001d04be
 SHA512:
-  metadata.gz: 606ab401acd65b522b5f340103f958d68ff4ff4ca3d2f7b7d563115e0b53bf9dd27a207c2581b6bc3ec0bdfad92b3a47ff1e75bec53d8d1e1223e5023e6e0f66
-  data.tar.gz: c1b03ad4decab3a575873e8925d207809ab9201c805525eaa97d5d2822eb9d797c47354220035d4ef01eadc3a2f2dd2c5faf7de8ce34d327b071c6f398fb47db
+  metadata.gz: 8840e5441afcda2aa8b20c3b0ae3a2fc935d97260f86cea8b04e29ca78d0dfcbaaac717400ca3f7249d1b97c76302b3f1a20758a4d90154b0b0b577f6dc178ae
+  data.tar.gz: a4d783b2ae2a860dfe948bb1d4747afb2dd8bf465bf3faf0c9a530ec5c7cde7fc38fdb0e3fb05c8782364c081ced26728d4a24a7837994738ad586d1fab76229

data/Documentation/yahns_config.pod

@@ -446,11 +446,20 @@ An example which seems to work is:
   ssl_ctx.key = OpenSSL::PKey::RSA.new(
     IO.read('/etc/ssl/private/example.key')
   )
+  ssl_ctx.set_params # use defaults provided by Ruby on top of OpenSSL
 
   app(:rack, "/path/to/my/app/config.ru") do
     listen 443, ssl_ctx: ssl_ctx
   end
 
+yahns gives you full control of of how OpenSSL::SSL::SSLContext is
+configured.  To avoid bugs, yahns only ensures
+OpenSSL::SSL::SSLContext#session_id_context is set (if not previously
+set by the user) and calls OpenSSL::SSL::SSLContext#setup before
+spawning threads to avoid race conditions.  yahns itself does not and
+will not enforce any opinion on the compatibility/performance/security
+trade-offs regarding TLS configuration.
+
 =item umask: MODE
 
 Sets the file mode creation mask for UNIX sockets.  If specified,

data/GIT-VERSION-GEN

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

data/lib/yahns/server.rb

@@ -386,6 +386,13 @@ def fdmap_init
         env['HTTPS'] = 'on' # undocumented, but Rack::Request uses this
         env['rack.url_scheme'] = 'https'
 
+        # avoid "session id context uninitialized" errors when a client
+        # attempts to reuse a cached SSL session.  Server admins may
+        # configure their own cache and session_id_context if desired.
+        # 32 bytes is SSL_MAX_SSL_SESSION_ID_LENGTH and has been since
+        # the SSLeay days
+        ssl_ctx.session_id_context ||= OpenSSL::Random.random_bytes(32)
+
         # call OpenSSL::SSL::SSLContext#setup explicitly here to detect
         # errors and avoid race conditions.  We avoid calling this in the
         # parent process since

data/test/helper.rb

@@ -88,21 +88,23 @@ def __covmerge
 
 require "tempfile"
 require 'tmpdir'
-class Dir
-  def Dir.mktmpdir
-    begin
-      d = "#{Dir.tmpdir}/#$$.#{rand}"
-      Dir.mkdir(d)
-    rescue Errno::EEXIST
-    end while true
-    return d unless block_given?
-    begin
-      yield d
-    ensure
-      FileUtils.remove_entry(d)
-    end
+
+# Can't rely on mktmpdir until we drop Ruby 1.9.3 support
+def yahns_mktmpdir
+  d = nil
+  begin
+    dir = "#{Dir.tmpdir}/yahns.#$$.#{rand}"
+    Dir.mkdir(dir)
+    d = dir
+  rescue Errno::EEXIST
+  end until d
+  return d unless block_given?
+  begin
+    yield d
+  ensure
+    FileUtils.remove_entry(d)
   end
-end unless Dir.respond_to?(:mktmpdir)
+end
 
 def tmpfile(*args)
   tmp = Tempfile.new(*args)

data/test/test_bin.rb

@@ -149,7 +149,7 @@ def test_usr2_nopreload_worker; usr2(false, true); end
   def test_usr2_nopreload_noworker; usr2(false, false); end
 
   def usr2(preload, worker)
-    Dir.mktmpdir { |tmpdir| usr2_dir(tmpdir, preload, worker) }
+    yahns_mktmpdir { |tmpdir| usr2_dir(tmpdir, preload, worker) }
   end
 
   def usr2_dir(tmpdir, preload, worker)

data/test/test_buffer_tmpdir.rb

@@ -16,7 +16,7 @@ def setup
     rescue
       skip "test needs inotify"
     end
-    @tmpdir = Dir.mktmpdir
+    @tmpdir = yahns_mktmpdir
     server_helper_setup
   end
 

data/test/test_config.rb

@@ -14,7 +14,7 @@ def test_initialize
 
   def test_multi_conf_example
     pid = fork do
-      tmpdir = Dir.mktmpdir
+      tmpdir = yahns_mktmpdir
 
       # modify the example config file for testing
       path = "examples/yahns_multi.conf.rb"
@@ -38,7 +38,7 @@ def test_multi_conf_example
 
   def test_rack_basic_conf_example
     pid = fork do
-      tmpdir = Dir.mktmpdir
+      tmpdir = yahns_mktmpdir
 
       # modify the example config file for testing
       path = "examples/yahns_rack_basic.conf.rb"

data/test/test_extras_autoindex.rb

@@ -10,7 +10,7 @@ class TestExtrasAutoindex < Testcase
   include ServerHelper
 
   def setup
-    @tmpdir = Dir.mktmpdir
+    @tmpdir = yahns_mktmpdir
     server_helper_setup
     skip 'Ruby 2.x required' unless ''.respond_to?(:b)
   end

data/test/test_extras_try_gzip_static.rb

@@ -11,7 +11,7 @@ class TestExtrasTryGzipStatic < Testcase
   GPL_TEXT = IO.binread("COPYING").freeze
 
   def setup
-    @tmpdir = Dir.mktmpdir
+    @tmpdir = yahns_mktmpdir
     server_helper_setup
     skip 'Ruby 2.x required' unless ''.respond_to?(:b)
   end

data/test/test_proxy_pass.rb

@@ -177,7 +177,7 @@ def teardown
   end
 
   def test_unix_socket_no_path
-    tmpdir = Dir.mktmpdir
+    tmpdir = yahns_mktmpdir
     unix_path = "#{tmpdir}/proxy_pass.sock"
     unix_srv = UNIXServer.new(unix_path)
     err, cfg, host, port = @err, Yahns::Config.new, @srv.addr[3], @srv.addr[1]

data/test/test_serve_static.rb

@@ -10,7 +10,7 @@ class TestServeStatic < Testcase
   alias teardown server_helper_teardown
 
   def test_serve_static
-    tmpdir = Dir.mktmpdir
+    tmpdir = yahns_mktmpdir
     sock = "#{tmpdir}/sock"
     err = @err
     cfg = Yahns::Config.new
@@ -120,7 +120,7 @@ def close
   end
 
   def test_aborted_sendfile_closes_opened_path
-    tmpdir = Dir.mktmpdir
+    tmpdir = yahns_mktmpdir
     mksparse(tmpdir)
     fifo = "#{tmpdir}/to_path--close"
     assert system("mkfifo", fifo), "mkfifo"
@@ -147,7 +147,7 @@ def test_aborted_sendfile_closes_opened_path
   end
 
   def test_truncated_sendfile
-    tmpdir = Dir.mktmpdir
+    tmpdir = yahns_mktmpdir
     size, sparse = mksparse(tmpdir)
     err, cfg, host, port = @err, Yahns::Config.new, @srv.addr[3], @srv.addr[1]
     pid = mkserver(cfg) do
@@ -169,7 +169,7 @@ def test_truncated_sendfile
   end
 
   def test_expanded_sendfile
-    tmpdir = Dir.mktmpdir
+    tmpdir = yahns_mktmpdir
     size, sparse = mksparse(tmpdir)
     err, cfg, host, port = @err, Yahns::Config.new, @srv.addr[3], @srv.addr[1]
     pid = mkserver(cfg) do

data/test/test_server.rb

@@ -179,7 +179,7 @@ def trailer(btype, delay = false)
   end
 
   def test_check_client_connection
-    tmpdir = Dir.mktmpdir
+    tmpdir = yahns_mktmpdir
     sock = "#{tmpdir}/sock"
     unix_srv = UNIXServer.new(sock)
     unix_srv.close_on_exec = true
@@ -511,7 +511,7 @@ def test_mp_hooks_worker_nr
   end
 
   def test_pidfile_usr2
-    tmpdir = Dir.mktmpdir
+    tmpdir = yahns_mktmpdir
     pidf = "#{tmpdir}/pid"
     old = "#{pidf}.oldbin"
     err = @err
@@ -635,7 +635,7 @@ def test_working_directory
     ru = lambda { |_|
       [ 200, {'Content-Length'=>Dir.pwd.size.to_s }, [Dir.pwd] ]
     }
-    Dir.mktmpdir do |tmpdir|
+    yahns_mktmpdir do |tmpdir|
       begin
         pid = mkserver(cfg) do
           $LOAD_PATH << File.expand_path("lib")
@@ -656,7 +656,7 @@ def test_working_directory
   end
 
   def test_errors
-    tmpdir = Dir.mktmpdir
+    tmpdir = yahns_mktmpdir
     sock = "#{tmpdir}/sock"
     err, cfg, host, port = @err, Yahns::Config.new, @srv.addr[3], @srv.addr[1]
     re = tmpfile(%w(rack .errors))

data/test/test_unix_socket.rb

@@ -23,7 +23,7 @@ def unix_socket(path)
   end
 
   def test_socket
-    tmpdir = Dir.mktmpdir
+    tmpdir = yahns_mktmpdir
     err, cfg = @err, Yahns::Config.new
     sock = "#{tmpdir}/sock"
     cfg.instance_eval do
@@ -48,7 +48,7 @@ def test_socket
   end
 
   def test_socket_perms
-    tmpdir = Dir.mktmpdir
+    tmpdir = yahns_mktmpdir
     err, cfg = @err, Yahns::Config.new
     sock = "#{tmpdir}/sock"
     cfg.instance_eval do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yahns
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 1.12.2
 platform: ruby
 authors:
 - yahns hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio