puma 2.9.1 → 2.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4587d687f274e6f12836cc110a0b9f69800e96a2
-  data.tar.gz: deac8749f171c5b8a6bf10666ba748676f8e3049
+  metadata.gz: a3ba7fc9d6258288ee3ccd24615ee3f1cb9bb24e
+  data.tar.gz: 7acc27c67161d2ccb65cd8dfeabca6bbbafcdc14
 SHA512:
-  metadata.gz: b555eb3bc18a5679d72540458a20813161cb828c9be652f861e74ca7b00be2f05f7c44594088cf6e578d8df3a96152d2fc105d68b01b5e350596fa32529bdf70
-  data.tar.gz: f4be4cc2cc0bd2d9f880047c3547a4204995bf54a127ca72fcbfcc3f6bfb3854499701406c56515b66bcb0067caee762b44cd8eff8dbeb91dfb5564a96aa3014
+  metadata.gz: 21029428eda1b5b455a3e8257438211d6635da18ee17375af4ee588a0b968c8d542b86e8d3f73629926b690071c184e47db5e2af159a8ab24302be9f56aad9c4
+  data.tar.gz: e6e4b25b8e2aa6c8aee2ec52b274ef9af44b2fab47d99396c0cc4f207f394727d4a804348d13008e17a5db6b32e27989ce373a3f2d1af338453c0c03d05c18a4

data/History.txt

@@ -1,3 +1,23 @@
+=== 2.9.2 / 1024-10-25
+
+* 8 bug fixes:
+  * Fix puma-wild handling a restart properly. Fixes #550
+  * JRuby SSL POODLE update
+  * Keep deprecated features warnings
+  * Log the current time when Puma shuts down.
+  * Fix cross-platform extension library detection
+  * Use the correct Windows names for OpenSSL.
+  * Better error logging during startup
+  * Fixing sexist error messages
+
+* 6 PRs merged:
+  * Merge pull request #549 from bsnape/log-shutdown-time
+  * Merge pull request #553 from lowjoel/master
+  * Merge pull request #568 from mariuz/patch-1
+  * Merge pull request #578 from danielbuechele/patch-1
+  * Merge pull request #581 from alexch/slightly-better-logging
+  * Merge pull request #590 from looker/jruby_disable_sslv3
+
 === 2.9.1 / 2014-09-05
 
 * 4 bug fixes:

data/README.md

@@ -248,4 +248,4 @@ $ bundle exec rake
 
 ## License
 
-Puma is copyright 2013 Evan Phoenix and contributors. It is licensed under the BSD 3-Clause license. See the include LICENSE file for details.
+Puma is copyright 2014 Evan Phoenix and contributors. It is licensed under the BSD 3-Clause license. See the include LICENSE file for details.

data/bin/puma-wild

@@ -5,11 +5,25 @@
 
 require 'rubygems'
 
-deps = ARGV.shift.split(",").each do |s|
+gems = ARGV.shift
+
+inc = ""
+
+if gems == "-I"
+  inc = ARGV.shift
+  $LOAD_PATH.concat inc.split(":")
+  gems = ARGV.shift
+end
+
+gems.split(",").each do |s|
   name, ver = s.split(":",2)
   gem name, ver
 end
 
+module Puma; end
+
+Puma.const_set("WILD_ARGS", ["-I", inc, gems])
+
 require 'puma/cli'
 
 cli = Puma::CLI.new ARGV

data/ext/puma_http11/extconf.rb

@@ -2,7 +2,8 @@ require 'mkmf'
 
 dir_config("puma_http11")
 
-$defs.push "-Wno-deprecated-declarations"
-$libs += " -lssl -lcrypto "
+if %w'ssl ssleay32'.find {|ssl| have_library(ssl, 'SSL_CTX_new')} and
+  %w'crypto libeay32'.find {|crypto| have_library(crypto, 'BIO_read')}
 
-create_makefile("puma/puma_http11")
+  create_makefile("puma/puma_http11")
+end

data/ext/puma_http11/org/jruby/puma/MiniSSL.java

@@ -1,6 +1,7 @@
 package org.jruby.puma;
 
 import org.jruby.Ruby;
+import org.jruby.RubyBoolean;
 import org.jruby.RubyClass;
 import org.jruby.RubyModule;
 import org.jruby.RubyObject;
@@ -151,6 +152,15 @@ public class MiniSSL extends RubyObject {
 
     sslCtx.init(kmf.getKeyManagers(), null, null);
     engine = sslCtx.createSSLEngine();
+
+    IRubyObject enableSSLv3 = miniSSLContext.callMethod(threadContext, "enable_SSLv3");
+    String[] protocols;
+    if (enableSSLv3 instanceof RubyBoolean && enableSSLv3.isTrue()) {
+      protocols = new String[] { "SSLv2Hello", "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2" };
+    } else {
+      protocols = new String[] { "TLSv1", "TLSv1.1", "TLSv1.2" };
+    }
+    engine.setEnabledProtocols(protocols);
     engine.setUseClientMode(false);
 
     SSLSession session = engine.getSession();

data/lib/puma/cli.rb

@@ -322,6 +322,7 @@ module Puma
 
     def graceful_stop
       @runner.stop_blocked
+      log "=== puma shutdown: #{Time.now} ==="
       log "- Goodbye!"
     end
 
@@ -362,7 +363,11 @@ module Puma
         lib = File.expand_path "lib"
         arg0[1,0] = ["-I", lib] if $:[0] == lib
 
-        @restart_argv = arg0 + ARGV
+        if defined? Puma::WILD_ARGS
+          @restart_argv = arg0 + Puma::WILD_ARGS + ARGV
+        else
+          @restart_argv = arg0 + ARGV
+        end
       end
     end
 
@@ -430,6 +435,7 @@ module Puma
         Dir.chdir @restart_dir
 
         argv += [redirects] unless RUBY_VERSION < '1.9'
+
         Kernel.exec(*argv)
       end
     end
@@ -466,8 +472,9 @@ module Puma
 
             wild = File.expand_path(File.join(puma_lib_dir, "../bin/puma-wild"))
 
-            args = [Gem.ruby] + dirs.map { |x| ["-I", x] }.flatten +
-                   [wild, deps] + @original_argv
+            wild_loadpath = dirs.join(":")
+
+            args = [Gem.ruby] + [wild, "-I", wild_loadpath, deps] + @original_argv
 
             Kernel.exec(*args)
           end

data/lib/puma/const.rb

@@ -28,7 +28,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.9.1".freeze
+    PUMA_VERSION = VERSION = "2.9.2".freeze
     CODE_NAME = "Team High Five".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2

data/lib/puma/minissl.rb

@@ -95,6 +95,11 @@ module Puma
         # jruby-specific Context properties: java uses a keystore and password pair rather than a cert/key pair
         attr_reader :keystore
         attr_accessor :keystore_pass
+        attr_accessor :enable_SSLv3
+
+        def initialize
+          @enable_SSLv3 = false
+        end
 
         def keystore=(keystore)
           raise ArgumentError, "No such keystore file '#{keystore}'" unless File.exist? keystore

data/lib/puma/runner.rb

@@ -112,7 +112,7 @@ module Puma
       begin
         @app = @cli.config.app
       rescue Exception => e
-        log "! Unable to load application"
+        log "! Unable to load application: #{e.class}: #{e.message}"
         raise e
       end
 

data/lib/puma/server.rb

@@ -714,7 +714,7 @@ module Puma
       if @leak_stack_on_error
         [500, {}, ["Puma caught this error: #{e.message} (#{e.class})\n#{e.backtrace.join("\n")}"]]
       else
-        [500, {}, ["A really lowlevel plumbing error occured. Please contact your local Maytag(tm) repair man.\n"]]
+        [500, {}, ["A really lowlevel plumbing error occured. Please contact your local Maytag(tm) repair person.\n"]]
       end
     end
 

data/test/test_puma_server_ssl.rb

@@ -16,21 +16,21 @@ class TestPumaServerSSL < Test::Unit::TestCase
 
     @app = lambda { |env| [200, {}, [env['rack.url_scheme']]] }
 
-    ctx = Puma::MiniSSL::Context.new
+    @ctx = Puma::MiniSSL::Context.new
 
     if defined?(JRUBY_VERSION)
-      ctx.keystore =  File.expand_path "../../examples/puma/keystore.jks", __FILE__
-      ctx.keystore_pass = 'blahblah'
+      @ctx.keystore =  File.expand_path "../../examples/puma/keystore.jks", __FILE__
+      @ctx.keystore_pass = 'blahblah'
     else
-      ctx.key =  File.expand_path "../../examples/puma/puma_keypair.pem", __FILE__
-      ctx.cert = File.expand_path "../../examples/puma/cert_puma.pem", __FILE__
+      @ctx.key =  File.expand_path "../../examples/puma/puma_keypair.pem", __FILE__
+      @ctx.cert = File.expand_path "../../examples/puma/cert_puma.pem", __FILE__
     end
 
-    ctx.verify_mode = Puma::MiniSSL::VERIFY_NONE
+    @ctx.verify_mode = Puma::MiniSSL::VERIFY_NONE
 
     @events = Puma::Events.new STDOUT, STDERR
     @server = Puma::Server.new @app, @events
-    @server.add_ssl_listener @host, @port, ctx
+    @server.add_ssl_listener @host, @port, @ctx
     @server.run
 
     @http = Net::HTTP.new @host, @port
@@ -88,4 +88,50 @@ class TestPumaServerSSL < Test::Unit::TestCase
     assert_equal "https", body
   end
 
+  if defined?(JRUBY_VERSION)
+    def test_ssl_v3_support_disabled_by_default
+      @http.ssl_version='SSLv3'
+      assert_raises(OpenSSL::SSL::SSLError) do
+        @http.start do
+          Net::HTTP::Get.new '/'
+        end
+      end
+    end
+
+    def test_enabling_ssl_v3_support
+      @server.stop(true)
+      @ctx.enable_SSLv3 = true
+      @server = Puma::Server.new @app, @events
+      @server.add_ssl_listener @host, @port, @ctx
+      @server.run
+      @http.ssl_version='SSLv3'
+
+      body = nil
+      @http.start do
+        req = Net::HTTP::Get.new "/", {}
+
+        @http.request(req) do |rep|
+          body = rep.body
+        end
+      end
+
+      assert_equal "https", body
+    end
+
+    def test_enabling_ssl_v3_support_requires_true
+      @server.stop(true)
+      @ctx.enable_SSLv3 = "truthy but not true"
+      @server = Puma::Server.new @app, @events
+      @server.add_ssl_listener @host, @port, @ctx
+      @server.run
+      @http.ssl_version='SSLv3'
+
+      assert_raises(OpenSSL::SSL::SSLError) do
+        @http.start do
+          Net::HTTP::Get.new '/'
+        end
+      end
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.9.2
 platform: ruby
 authors:
 - Evan Phoenix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
 description: Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server
   for Ruby/Rack applications. Puma is intended for use in both development and production
   environments. In order to get the best throughput, it is highly recommended that