passenger 5.1.12 → 5.2.0

data/src/ruby_supportlib/phusion_passenger/packaging.rb

@@ -103,6 +103,7 @@ module PhusionPassenger
       'src/ruby_supportlib/phusion_passenger/vendor/*/hacking/**/*',
       'src/ruby_supportlib/phusion_passenger/vendor/*/spec/**/*',
       'src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_rails/rails_test_apps/**/*',
+      'src/cxx_supportlib/vendor-copy/*/.*',
       'packaging/**/*',
       'test/**/*'
     ]

data/src/ruby_supportlib/phusion_passenger/platform_info.rb

@@ -408,6 +408,23 @@ module PhusionPassenger
       end
       return result
     end
+
+    # Check whether the specified command is in $PATH or in
+    # /sbin:/usr/sbin:/usr/local/sbin (in case these aren't already in $PATH),
+    # and return its absolute filename. Returns nil if the command is not
+    # found.
+    def self.find_system_command(name)
+      result = find_command(name)
+      if result.nil?
+        ['/sbin', '/usr/sbin', '/usr/local/sbin'].each do |dir|
+          path = File.join(dir, name)
+          if File.file?(path) && File.executable?(path)
+            return path
+          end
+        end
+      end
+      result
+    end
   end
 
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/platform_info/apache.rb

@@ -612,8 +612,13 @@ module PhusionPassenger
         # macOS >= 10.13 High Sierra no longer includes apxs2
         # so we'll use hardcoded paths here.
         if os_name_simple == 'macosx' && os_version >= '10.13' && httpd == '/usr/sbin/httpd'
+          # High Sierra doesn't have a consistent location for the Apache header
+          # files. On Hongli's and Camden's systems it's inside the Xcode directory,
+          # while on https://github.com/phusion/passenger/issues/1986 it's inside
+          # /Library/Developer/CommandLineTools.
           xcode_prefix = `/usr/bin/xcode-select -p`.strip
           flags << "-I#{xcode_prefix}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/apache2"
+          flags << "-I/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/apache2"
         end
       else
         apxs2_flags = `#{apxs2} -q CFLAGS`.strip << " -I" << `#{apxs2} -q INCLUDEDIR`.strip
@@ -813,8 +818,13 @@ module PhusionPassenger
           if os_version >= '10.13'
             # On macOS >= 10.13 High Sierra /usr/include no longer
             # exists.
+            # High Sierra doesn't have a consistent location for the Apache header
+            # files. On Hongli's and Camden's systems it's inside the Xcode directory,
+            # while on https://github.com/phusion/passenger/issues/1986 it's inside
+            # /Library/Developer/CommandLineTools.
             xcode_prefix = `/usr/bin/xcode-select -p`.strip
-            ["-I#{xcode_prefix}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/apr-1",
+            ["-I#{xcode_prefix}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/apr-1 " \
+             "-I/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/apache2",
               '-lapr-1']
           else
             ['-I/usr/include/apr-1', '-lapr-1']

data/src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb

@@ -189,12 +189,12 @@ module PhusionPassenger
     memoize :cxx_is_gcc?
 
     def self.cc_is_clang?
-      `#{cc} --version 2>&1` =~ /clang version/
+      `#{cc} --version 2>&1` =~ /clang( version|-)/
     end
     memoize :cc_is_clang?
 
     def self.cxx_is_clang?
-      `#{cxx} --version 2>&1` =~ /clang version/
+      `#{cxx} --version 2>&1` =~ /clang( version|-)/
     end
     memoize :cxx_is_clang?
 
@@ -453,18 +453,18 @@ module PhusionPassenger
     end
     memoize :cxx_visibility_flag_generates_warnings?, true
 
-    def self.adress_sanitizer_flag
+    def self.address_sanitizer_flag
       if cc_is_clang?
         if `#{cc} --help` =~ /-fsanitize=/
-          return "-fsanitize=address"
+          "-fsanitize=address"
         else
-          return "-faddress-sanitizer"
+          "-faddress-sanitizer"
         end
       else
-        return nil
+        nil
       end
     end
-    memoize :adress_sanitizer_flag
+    memoize :address_sanitizer_flag
 
     def self.cxx_11_flag
       # C++11 support on FreeBSD 10.0 + Clang seems to be bugged.

data/src/ruby_supportlib/phusion_passenger/platform_info/networking.rb

@@ -0,0 +1,293 @@
+# frozen_string_literal: true
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2017 Phusion Holding B.V.
+#
+#  "Passenger", "Phusion Passenger" and "Union Station" are registered
+#  trademarks of Phusion Holding B.V.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
+
+PhusionPassenger.require_passenger_lib 'platform_info'
+PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
+PhusionPassenger.require_passenger_lib 'utils/shellwords'
+
+module PhusionPassenger
+
+  module PlatformInfo
+    # Returns a list of network interfaces active on the current system, or
+    # nil if unable to autodetect.
+    #
+    #   [
+    #     {
+    #       :device => 'en0',
+    #       :type   => :ethernet,
+    #       :flags  => [:promisc, :broadcast, :multicast],
+    #       :ipv4   => ['127.0.0.1'],
+    #       :ipv6   => ['::1']
+    #     },
+    #     ...
+    #   ]
+    def self.network_interfaces
+      case os_name_simple
+      when 'linux'
+        network_interfaces_linux
+      when 'macosx', 'freebsd'
+        network_interfaces_bsd
+      else
+        nil
+      end
+    end
+
+    # Returns the names of the network interfaces used for public
+    # Internet IPv4 and IPv6 traffic. This is autodetected
+    # by checking which interfaces can route to Google.
+    #
+    # The format is:
+    #
+    #   {
+    #     :ipv4 => "device name" | nil | :unknown,
+    #     :ipv6 => "device name" | nil | :unknown
+    #   }
+    #
+    # A value of nil means that there is no interface that supports
+    # the corresponding IP traffic.
+    # A value of :unknown means that the information cannot be
+    # autodetected.
+    def self.default_network_interfaces
+      case os_name_simple
+      when 'linux'
+        {
+          :ipv4 => default_network_interface_linux_for_ip_type(:ipv4),
+          :ipv6 => default_network_interface_linux_for_ip_type(:ipv6)
+        }
+      when 'macosx', 'freebsd'
+        {
+          :ipv4 => default_network_interface_bsd_for_ip_type(:ipv4),
+          :ipv6 => default_network_interface_bsd_for_ip_type(:ipv6)
+        }
+      else
+        {
+          :ipv4 => :unknown,
+          :ipv6 => :unknown
+        }
+      end
+    end
+
+  private
+    def self.network_interfaces_linux
+      result = {}
+      ip_command = find_system_command('ip')
+
+      if ip_command
+        current_iface = nil
+        output = `#{Shellwords.escape ip_command} addr show`
+        output.split("\n").each do |line|
+          elems = line.split
+
+          if line =~ /^[0-9]+: /
+            # Format:
+            # <NUMBER>: <DEVICE>: <<FLAGS>> ...
+            device = elems[1].sub(/:$/, '')
+            flags = parse_bsd_or_linux_ifconfig_flags(elems[2])
+            current_iface = {
+              :device => device,
+              :type   => flags.include?(:loopback) ? :loopback : :unknown,
+              :flags  => flags,
+              :ipv4   => [],
+              :ipv6   => []
+            }
+            result[device] = current_iface
+
+          elsif elems[0] == 'link/ether'
+            current_iface[:type] = :ethernet
+
+          elsif elems[0] == 'inet'
+            # Format: inet <IP[/CIDR PREFIX]> ... <ACTUAL DEVICE>
+            device = elems.last
+            ip = elems[1].sub(%r{/.*}, '')
+            if current_iface[:device] == device
+              actual_iface = current_iface
+            else
+              actual_iface = (result[device] ||= {
+                :device => device,
+                :type   => :unknown,
+                :flags  => [],
+                :ipv4   => [],
+                :ipv6   => []
+              })
+            end
+            actual_iface[:ipv4] << ip
+
+          elsif elems[0] == 'inet6'
+            # Format: inet6 <IP[/CIDR PREFIX]> ...
+            ip = elems[1].sub(%r{/.*}, '')
+            current_iface[:ipv6] << ip
+          end
+        end
+      end
+
+      Dir['/sys/class/net/*'].each do |path|
+        next if !File.directory?(path)
+        device = File.basename(path)
+        iface = (result[device] ||= {
+          :device => device,
+          :type   => :unknown,
+          :flags  => [],
+          :ipv4   => [],
+          :ipv6   => []
+        })
+
+        if iface[:type] == :unknown && File.exist?("#{path}/type")
+          case File.read("#{path}/type").strip
+          when '1'
+            iface[:type] = :ethernet
+          when '772'
+            iface[:type] = :loopback
+          end
+        end
+
+        if File.exist?("#{path}/flags")
+          flags = File.read("#{path}/flags").to_i(16)
+          if flags & 0x0100 && !iface[:flags].include?(:promisc)
+            iface[:flags] << :promisc
+          end
+        end
+      end
+
+      result.values
+    end
+
+    def self.default_network_interface_linux_for_ip_type(type)
+      ip_command = PlatformInfo.find_system_command('ip')
+      return :unknown if ip_command.nil?
+
+      # See the comments for default_network_interface_bsd_for_ip_type
+      if type == :ipv4
+        address = '8.8.8.8'
+        output = `#{Shellwords.escape ip_command} -4 route get #{address} 2>/dev/null`
+      else
+        address = '2404:6800:400a:800::1012'
+        output = `#{Shellwords.escape ip_command} -6 route get #{address} 2>/dev/null`
+      end
+
+      first_line = output.split("\n").first
+      elems = (first_line || '').split
+      if elems[0] == address
+        first_line =~ / dev (.+?) /
+        $1
+      else
+        nil
+      end
+    end
+
+
+    def self.network_interfaces_bsd
+      ifconfig = find_system_command('ifconfig')
+      return nil if ifconfig.nil?
+
+      result = []
+      current_interface = nil
+
+      lines = `#{Shellwords.escape ifconfig} -a`.split("\n")
+      lines.each do |line|
+        elems = line.split
+
+        if line =~ /^[a-z0-9\-_]+:/
+          device = elems[0].chomp(':')
+          flags = parse_bsd_or_linux_ifconfig_flags(elems[1])
+          current_interface = {
+            :device => device,
+            :type   => flags.include?(:loopback) ? :loopback : :unknown,
+            :flags  => flags,
+            :ipv4   => [],
+            :ipv6   => []
+          }
+          result << current_interface
+
+        elsif elems[0] == 'ether'
+          current_interface[:type] = :ethernet
+
+        elsif elems[0] == 'inet' || elems[0] == 'inet6'
+          # Format:
+          # inet [alias] <IP ADDRESS[/CIDR PREFIX]> ...
+
+          if elems[1] == 'alias'
+            ip = elems[2]
+          else
+            ip = elems[1]
+          end
+          if ip.include?('/')
+            ip = ip.split('/', 2)[0]
+          end
+
+          if elems[0] == 'inet'
+            current_interface[:ipv4] << ip
+          else
+            current_interface[:ipv6] << ip
+          end
+        end
+      end
+
+      result
+    end
+
+    def self.default_network_interface_bsd_for_ip_type(type)
+      route = PlatformInfo.find_system_command('route')
+      return :unknown if route.nil?
+
+      # We ping a public server to test which of our interfaces
+      # is used for outgoing Internet traffic.
+      # 8.8.8.8 = Google's public DNS
+      # 2404:6800:400a:800::1012 = ipv6.google.com
+      # This should work for everybody outside Google's cluster infrastructure,
+      # and who didn't block Google on the network routing level.
+      #
+      # Note that this even works for mainland Chinese users, as the GFW
+      # blocks on the TCP level.
+      #
+      # We redirect stderr to /dev/null because we don't want routing
+      # errors to be printed.
+      if type == :ipv4
+        output = `#{Shellwords.escape route} -n get 8.8.8.8 2>/dev/null`
+      else
+        output = `#{Shellwords.escape route} -n get -inet6 2404:6800:400a:800::1012 2>/dev/null`
+      end
+
+      lines = output.split("\n")
+      lines.each do |line|
+        elems = line.split
+        if elems[0] == 'interface:' && elems[1]
+          return elems[1]
+        end
+      end
+
+      nil
+    end
+
+
+    def self.parse_bsd_or_linux_ifconfig_flags(flags)
+      if flags =~ /<(.+)>/
+        $1.split(',').map { |x| x.downcase.to_sym }
+      else
+        []
+      end
+    end
+  end
+
+end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/standalone/config_options_list.rb

@@ -350,6 +350,14 @@ module PhusionPassenger
                       "application process can handle the given\n" \
                       "number of concurrent requests per process"
       },
+      {
+        :name      => :start_timeout,
+        :type      => :integer,
+        :type_desc => 'SECONDS',
+        :desc      => "The maximum time an application process may\n" \
+                      "take to start up, after which it will be killed\n" \
+                      "with SIGKILL, and logged with an error.\nDefault: #{DEFAULT_START_TIMEOUT / 1000}"
+      },
       {
         :name      => :concurrency_model,
         :type_desc => 'NAME',
@@ -467,59 +475,6 @@ module PhusionPassenger
       }
     ]
 
-    # Union Station configuration options
-    UNION_STATION_CONFIG_SPECS = [
-      {
-        :name      => :union_station_gateway_address,
-        :cli       => nil
-      },
-      {
-        :name      => :union_station_gateway_port,
-        :type      => :integer,
-        :cli       => nil
-      },
-      {
-        :type_desc => 'HOST:PORT',
-        :cli       => '--union-station-gateway',
-        :cli_parser => lambda do |options, value|
-          host, port = value.split(":", 2)
-          port = port.to_i
-          port = 443 if port == 0
-          options[:union_station_gateway_address] = host
-          options[:union_station_gateway_port] = port.to_i
-        end,
-        :desc      => 'Specify Union Station Gateway host and port'
-      },
-      {
-        :name      => :union_station_key,
-        :type_desc => 'KEY',
-        :desc      => 'Specify Union Station key'
-      },
-      {
-        :name      => :union_station_gateway_cert,
-        :type      => :path,
-        :desc      => "The certificate to use for contacting the\n" \
-                      "Union Station gateway, or '-' to disable\n" \
-                      "certificate checking",
-        :config_value_parser => lambda do |value, base_dir|
-          if value == '-'
-            '-'
-          else
-            File.absolute_logical_path(value.to_s, base_dir)
-          end
-        end,
-        :cli_parser => lambda do |options, value|
-          if value == '-'
-            options[:union_station_gateway_cert] = '-'
-          else
-            options[:union_station_gateway_cert] =
-              File.absolute_logical_path(value,
-                Dir.logical_pwd)
-          end
-        end
-      }
-    ]
-
     # Nginx engine configuration options
     NGINX_ENGINE_CONFIG_SPECS = [
       {
@@ -635,7 +590,6 @@ module PhusionPassenger
       APPLICATION_LOADING_CONFIG_SPECS,
       PROCESS_MANAGEMENT_CONFIG_SPECS,
       REQUEST_HANDLING_CONFIG_SPECS,
-      UNION_STATION_CONFIG_SPECS,
       NGINX_ENGINE_CONFIG_SPECS,
       ADVANCED_CONFIG_SPECS
     ]