puma 2.11.3 → 2.12.0

data/lib/puma/capistrano.rb

@@ -22,7 +22,7 @@ Capistrano::Configuration.instance.load do
   namespace :puma do
     desc 'Start puma'
     task :start, :roles => lambda { puma_role }, :on_no_matching_servers => :continue do
-      run "cd #{current_path} && #{puma_cmd} #{start_options}", :pty => false
+      run "cd #{current_path} && #{puma_rails_additional_env} #{puma_cmd} #{start_options}", :pty => false
     end
 
     desc 'Stop puma'
@@ -33,7 +33,7 @@ Capistrano::Configuration.instance.load do
     desc 'Restart puma'
     task :restart, :roles => lambda { puma_role }, :on_no_matching_servers => :continue do
       begin
-        run "cd #{current_path} && #{pumactl_cmd} -S #{state_path} restart"
+        run "cd #{current_path} && #{puma_rails_additional_env} #{pumactl_cmd} -S #{state_path} restart"
       rescue Capistrano::CommandError => ex
         puts "Failed to restart puma: #{ex}\nAssuming not started."
         start
@@ -43,7 +43,7 @@ Capistrano::Configuration.instance.load do
     desc 'Restart puma (phased restart)'
     task :phased_restart, :roles => lambda { puma_role }, :on_no_matching_servers => :continue do
       begin
-        run "cd #{current_path} && #{pumactl_cmd} -S #{state_path} phased-restart"
+        run "cd #{current_path} && #{puma_rails_additional_env} #{pumactl_cmd} -S #{state_path} phased-restart"
       rescue Capistrano::CommandError => ex
         puts "Failed to restart puma: #{ex}\nAssuming not started."
         start
@@ -72,6 +72,11 @@ Capistrano::Configuration.instance.load do
     fetch(:rack_env, fetch(:rails_env, 'production'))
   end
 
+  #add additional env when start rails, such as : secret key, db username, db pwd or other what you want.
+  def puma_rails_additional_env
+    fetch(:puma_rails_additional_env, '')
+  end
+
   def state_path
     (config_file ? configuration.options[:state] : nil) || puma_state
   end

data/lib/puma/cli.rb

@@ -11,8 +11,7 @@ require 'puma/util'
 require 'puma/single'
 require 'puma/cluster'
 
-require 'rack/commonlogger'
-require 'rack/utils'
+require 'puma/commonlogger'
 
 module Puma
   class << self
@@ -408,7 +407,7 @@ module Puma
 
         o.on "-V", "--version", "Print the version information" do
           puts "puma version #{Puma::Const::VERSION}"
-          exit 1
+          exit 0
         end
 
         o.on "-w", "--workers COUNT",
@@ -424,7 +423,7 @@ module Puma
 
         o.on_tail "-h", "--help", "Show help" do
           log o
-          exit 1
+          exit 0
         end
       end
     end
@@ -445,32 +444,28 @@ module Puma
 
       @restart_dir ||= Dir.pwd
 
-      @original_argv = ARGV.dup
+      @original_argv = @argv.dup
 
-      if defined? Rubinius::OS_ARGV
-        @restart_argv = Rubinius::OS_ARGV
+      require 'rubygems'
+
+      # if $0 is a file in the current directory, then restart
+      # it the same, otherwise add -S on there because it was
+      # picked up in PATH.
+      #
+      if File.exist?($0)
+        arg0 = [Gem.ruby, $0]
       else
-        require 'rubygems'
-
-        # if $0 is a file in the current directory, then restart
-        # it the same, otherwise add -S on there because it was
-        # picked up in PATH.
-        #
-        if File.exist?($0)
-          arg0 = [Gem.ruby, $0]
-        else
-          arg0 = [Gem.ruby, "-S", $0]
-        end
+        arg0 = [Gem.ruby, "-S", $0]
+      end
 
-        # Detect and reinject -Ilib from the command line
-        lib = File.expand_path "lib"
-        arg0[1,0] = ["-I", lib] if $:[0] == lib
+      # Detect and reinject -Ilib from the command line
+      lib = File.expand_path "lib"
+      arg0[1,0] = ["-I", lib] if $:[0] == lib
 
-        if defined? Puma::WILD_ARGS
-          @restart_argv = arg0 + Puma::WILD_ARGS + ARGV
-        else
-          @restart_argv = arg0 + ARGV
-        end
+      if defined? Puma::WILD_ARGS
+        @restart_argv = arg0 + Puma::WILD_ARGS + @original_argv
+      else
+        @restart_argv = arg0 + @original_argv
       end
     end
 

data/lib/puma/cluster.rb

@@ -176,6 +176,8 @@ module Puma
     end
 
     def wakeup!
+      return unless @wakeup
+
       begin
         @wakeup.write "!" unless @wakeup.closed?
       rescue SystemCallError, IOError

data/lib/puma/commonlogger.rb

@@ -0,0 +1,107 @@
+module Puma
+  # Rack::CommonLogger forwards every request to the given +app+, and
+  # logs a line in the
+  # {Apache common log format}[http://httpd.apache.org/docs/1.3/logs.html#common]
+  # to the +logger+.
+  #
+  # If +logger+ is nil, CommonLogger will fall back +rack.errors+, which is
+  # an instance of Rack::NullLogger.
+  #
+  # +logger+ can be any class, including the standard library Logger, and is
+  # expected to have either +write+ or +<<+ method, which accepts the CommonLogger::FORMAT.
+  # According to the SPEC, the error stream must also respond to +puts+
+  # (which takes a single argument that responds to +to_s+), and +flush+
+  # (which is called without arguments in order to make the error appear for
+  # sure)
+  class CommonLogger
+    # Common Log Format: http://httpd.apache.org/docs/1.3/logs.html#common
+    #
+    #   lilith.local - - [07/Aug/2006 23:58:02 -0400] "GET / HTTP/1.1" 500 -
+    #
+    #   %{%s - %s [%s] "%s %s%s %s" %d %s\n} %
+    FORMAT = %{%s - %s [%s] "%s %s%s %s" %d %s %0.4f\n}
+
+    def initialize(app, logger=nil)
+      @app = app
+      @logger = logger
+    end
+
+    def call(env)
+      began_at = Time.now
+      status, header, body = @app.call(env)
+      header = Util::HeaderHash.new(header)
+
+      # If we've been hijacked, then output a special line
+      if env['rack.hijack_io']
+        log_hijacking(env, 'HIJACK', header, began_at)
+      else
+        ary = env['rack.after_reply']
+        ary << lambda { log(env, status, header, began_at) }
+      end
+
+      [status, header, body]
+    end
+
+    HIJACK_FORMAT = %{%s - %s [%s] "%s %s%s %s" HIJACKED -1 %0.4f\n}
+
+    private
+
+    def log_hijacking(env, status, header, began_at)
+      now = Time.now
+
+      logger = @logger || env['rack.errors']
+      logger.write HIJACK_FORMAT % [
+        env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-",
+        env["REMOTE_USER"] || "-",
+        now.strftime("%d/%b/%Y %H:%M:%S"),
+        env["REQUEST_METHOD"],
+        env["PATH_INFO"],
+        env["QUERY_STRING"].empty? ? "" : "?"+env["QUERY_STRING"],
+        env["HTTP_VERSION"],
+        now - began_at ]
+    end
+
+    PATH_INFO      = 'PATH_INFO'.freeze
+    REQUEST_METHOD = 'REQUEST_METHOD'.freeze
+    SCRIPT_NAME    = 'SCRIPT_NAME'.freeze
+    QUERY_STRING   = 'QUERY_STRING'.freeze
+    CACHE_CONTROL  = 'Cache-Control'.freeze
+    CONTENT_LENGTH = 'Content-Length'.freeze
+    CONTENT_TYPE   = 'Content-Type'.freeze
+
+    GET  = 'GET'.freeze
+    HEAD = 'HEAD'.freeze
+    
+
+    def log(env, status, header, began_at)
+      now = Time.now
+      length = extract_content_length(header)
+
+      msg = FORMAT % [
+        env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-",
+        env["REMOTE_USER"] || "-",
+        now.strftime("%d/%b/%Y:%H:%M:%S %z"),
+        env[REQUEST_METHOD],
+        env[PATH_INFO],
+        env[QUERY_STRING].empty? ? "" : "?"+env[QUERY_STRING],
+        env["HTTP_VERSION"],
+        status.to_s[0..3],
+        length,
+        now - began_at ]
+
+      logger = @logger || env['rack.errors']
+      # Standard library logger doesn't support write but it supports << which actually
+      # calls to write on the log device without formatting
+      if logger.respond_to?(:write)
+        logger.write(msg)
+      else
+        logger << msg
+      end
+    end
+
+    def extract_content_length(headers)
+      value = headers[CONTENT_LENGTH] or return '-'
+      value.to_s == '0' ? '-' : value
+    end
+  end
+end

data/lib/puma/configuration.rb

@@ -1,3 +1,5 @@
+require 'puma/rack/builder'
+
 module Puma
 
   module ConfigDefault
@@ -77,7 +79,7 @@ module Puma
 
       if !@options[:quiet] and @options[:environment] == "development"
         logger = @options[:logger] || STDOUT
-        found = Rack::CommonLogger.new(found, logger)
+        found = CommonLogger.new(found, logger)
       end
 
       ConfigMiddleware.new(self, found)
@@ -99,11 +101,11 @@ module Puma
     def load_rackup
       raise "Missing rackup file '#{rackup}'" unless File.exist?(rackup)
 
-      rack_app, rack_options = Rack::Builder.parse_file(rackup)
+      rack_app, rack_options = Puma::Rack::Builder.parse_file(rackup)
       @options.merge!(rack_options)
 
       config_ru_binds = rack_options.each_with_object([]) do |(k, v), b|
-        b << v if k.to_s[0,4] == "bind"
+        b << v if k.to_s.start_with?("bind")
       end
       @options[:binds] = config_ru_binds unless config_ru_binds.empty?
 

data/lib/puma/const.rb

@@ -1,5 +1,3 @@
-require 'rack'
-
 module Puma
   class UnsupportedOption < RuntimeError
   end
@@ -8,12 +6,85 @@ module Puma
   # Every standard HTTP code mapped to the appropriate message.  These are
   # used so frequently that they are placed directly in Puma for easy
   # access rather than Puma::Const itself.
-  HTTP_STATUS_CODES = Rack::Utils::HTTP_STATUS_CODES
+
+  # Every standard HTTP code mapped to the appropriate message.
+  # Generated with:
+  # curl -s https://www.iana.org/assignments/http-status-codes/http-status-codes-1.csv | \
+  #   ruby -ne 'm = /^(\d{3}),(?!Unassigned|\(Unused\))([^,]+)/.match($_) and \
+  #             puts "#{m[1]} => \x27#{m[2].strip}\x27,"'
+  HTTP_STATUS_CODES = {
+    100 => 'Continue',
+    101 => 'Switching Protocols',
+    102 => 'Processing',
+    200 => 'OK',
+    201 => 'Created',
+    202 => 'Accepted',
+    203 => 'Non-Authoritative Information',
+    204 => 'No Content',
+    205 => 'Reset Content',
+    206 => 'Partial Content',
+    207 => 'Multi-Status',
+    208 => 'Already Reported',
+    226 => 'IM Used',
+    300 => 'Multiple Choices',
+    301 => 'Moved Permanently',
+    302 => 'Found',
+    303 => 'See Other',
+    304 => 'Not Modified',
+    305 => 'Use Proxy',
+    307 => 'Temporary Redirect',
+    308 => 'Permanent Redirect',
+    400 => 'Bad Request',
+    401 => 'Unauthorized',
+    402 => 'Payment Required',
+    403 => 'Forbidden',
+    404 => 'Not Found',
+    405 => 'Method Not Allowed',
+    406 => 'Not Acceptable',
+    407 => 'Proxy Authentication Required',
+    408 => 'Request Timeout',
+    409 => 'Conflict',
+    410 => 'Gone',
+    411 => 'Length Required',
+    412 => 'Precondition Failed',
+    413 => 'Payload Too Large',
+    414 => 'URI Too Long',
+    415 => 'Unsupported Media Type',
+    416 => 'Range Not Satisfiable',
+    417 => 'Expectation Failed',
+    422 => 'Unprocessable Entity',
+    423 => 'Locked',
+    424 => 'Failed Dependency',
+    426 => 'Upgrade Required',
+    428 => 'Precondition Required',
+    429 => 'Too Many Requests',
+    431 => 'Request Header Fields Too Large',
+    500 => 'Internal Server Error',
+    501 => 'Not Implemented',
+    502 => 'Bad Gateway',
+    503 => 'Service Unavailable',
+    504 => 'Gateway Timeout',
+    505 => 'HTTP Version Not Supported',
+    506 => 'Variant Also Negotiates',
+    507 => 'Insufficient Storage',
+    508 => 'Loop Detected',
+    510 => 'Not Extended',
+    511 => 'Network Authentication Required'
+  }
+
+  SYMBOL_TO_STATUS_CODE = Hash[*HTTP_STATUS_CODES.map { |code, message|
+    [message.downcase.gsub(/\s|-|'/, '_').to_sym, code]
+  }.flatten]
 
   # For some HTTP status codes the client only expects headers.
-  STATUS_WITH_NO_ENTITY_BODY = Hash[Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.map { |s|
-    [s, true]
-  }]
+  #
+
+  no_body = {}
+  ((100..199).to_a << 204 << 205 << 304).each do |code|
+    no_body[code] = true
+  end
+
+  STATUS_WITH_NO_ENTITY_BODY = no_body
 
   # Frequently used constants when constructing requests or responses.  Many times
   # the constant just refers to a string with the same contents.  Using these constants
@@ -28,8 +99,8 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.11.3".freeze
-    CODE_NAME = "Intrepid Squirrel".freeze
+    PUMA_VERSION = VERSION = "2.12.0".freeze
+    CODE_NAME = "Plutonian Photo Shoot".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2
 
@@ -111,6 +182,7 @@ module Puma
     PORT_80 = "80".freeze
     PORT_443 = "443".freeze
     LOCALHOST = "localhost".freeze
+    LOCALHOST_IP = "127.0.0.1".freeze
 
     SERVER_PROTOCOL = "SERVER_PROTOCOL".freeze
     HTTP_11 = "HTTP/1.1".freeze
@@ -129,6 +201,7 @@ module Puma
     RACK_AFTER_REPLY = "rack.after_reply".freeze
     PUMA_SOCKET = "puma.socket".freeze
     PUMA_CONFIG = "puma.config".freeze
+    PUMA_PEERCERT = "puma.peercert".freeze
 
     HTTP = "http".freeze
     HTTPS = "https".freeze

data/lib/puma/control_cli.rb

@@ -66,7 +66,15 @@ module Puma
       command = argv.shift
       @options[:command] = command if command
 
-      Puma::Configuration.new(@options).load if @options[:config_file]
+      unless @options[:config_file] == '-'
+        if @options[:config_file].nil? and File.exist?('config/puma.rb')
+          @options[:config_file] = 'config/puma.rb'
+        end
+
+        if @options[:config_file]
+          Puma::Configuration.new(@options).load
+        end
+      end
 
       # check present of command
       unless @options[:command]

data/lib/puma/events.rb

@@ -96,6 +96,15 @@ module Puma
       @stderr.puts "#{Time.now}: ENV: #{env.inspect}\n---\n"
     end
 
+    # An SSL error has occured.
+    # +server+ is the Server object, +peeraddr+ peer address, +peercert+
+    # any peer certificate (if present), and +error+ an exception object.
+    #
+    def ssl_error(server, peeraddr, peercert, error)
+      subject = peercert ? peercert.subject : nil
+      @stderr.puts "#{Time.now}: SSL error, peer: #{peeraddr}, peer cert: #{subject}, #{error.inspect}"
+    end
+
     # An unknown error has occured.
     # +server+ is the Server object, +env+ the request, +error+ an exception
     # object, and +kind+ some additional info.

data/lib/puma/minissl.rb

@@ -4,6 +4,7 @@ module Puma
       def initialize(socket, engine)
         @socket = socket
         @engine = engine
+        @peercert = nil
       end
 
       def to_io
@@ -86,6 +87,21 @@ module Puma
       def peeraddr
         @socket.peeraddr
       end
+
+      def peercert
+        return @peercert if @peercert
+
+        raw = @engine.peercert
+        return nil unless raw
+
+        @peercert = OpenSSL::X509::Certificate.new raw
+      end
+    end
+
+    if defined?(JRUBY_VERSION)
+      class SSLError < StandardError
+        # Define this for jruby even though it isn't used.
+      end
     end
 
     class Context
@@ -104,6 +120,7 @@ module Puma
         # non-jruby Context properties
         attr_reader :key
         attr_reader :cert
+        attr_reader :ca
 
         def key=(key)
           raise ArgumentError, "No such key file '#{key}'" unless File.exist? key
@@ -114,11 +131,17 @@ module Puma
           raise ArgumentError, "No such cert file '#{cert}'" unless File.exist? cert
           @cert = cert
         end
+
+        def ca=(ca)
+          raise ArgumentError, "No such ca file '#{ca}'" unless File.exist? ca
+          @ca = ca
+        end
       end
     end
 
     VERIFY_NONE = 0
     VERIFY_PEER = 1
+    VERIFY_FAIL_IF_NO_PEER_CERT = 2
 
     class Server
       def initialize(socket, ctx)