passenger 5.0.9 → 5.0.10

data/helper-scripts/prespawn

@@ -28,6 +28,7 @@ STDERR.sync = true
 require 'uri'
 require 'socket'
 require 'timeout'
+require 'base64'
 
 class PrespawnLocation
   class InvalidURLError < RuntimeError
@@ -90,6 +91,7 @@ class PrespawnLocation
   def head_request
     socket.write("HEAD #{request_path} HTTP/1.1\r\n")
     socket.write("Host: #{request_host}\r\n")
+    socket.write("Authorization: Basic " + Base64.encode64(@uri.userinfo) + "\r\n") if @uri.userinfo
     socket.write("Connection: close\r\n")
     socket.write("\r\n")
 

data/lib/phusion_passenger.rb

@@ -30,7 +30,7 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake ext/common/Constants.h' after changing this number.
-  VERSION_STRING = '5.0.9'
+  VERSION_STRING = '5.0.10'
 
   PREFERRED_NGINX_VERSION = '1.8.0'
   NGINX_SHA256_CHECKSUM = '23cca1239990c818d8f6da118320c4979aadf5386deda691b1b7c2c96b9df3d5'

data/lib/phusion_passenger/admin_tools/instance.rb

@@ -174,7 +174,7 @@ module PhusionPassenger
 
         version_supported =
           major_version == PhusionPassenger::SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION &&
-          minor_version <= PhusionPassenger::SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION
+          minor_version >= PhusionPassenger::SERVER_INSTANCE_DIR_STRUCTURE_MIN_SUPPORTED_MINOR_VERSION
         if !version_supported
           @state = :structure_version_unsupported
           return

data/lib/phusion_passenger/common_library.rb

@@ -421,28 +421,41 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
     :source   => 'ApplicationPool2/Implementation.cpp',
     :category => :other,
     :deps     => %w(
-      ApplicationPool2/Spawner.h
       ApplicationPool2/Common.h
       ApplicationPool2/Pool.h
-      ApplicationPool2/Pool/AnalyticsCollection.h
-      ApplicationPool2/Pool/GarbageCollection.h
-      ApplicationPool2/Pool/GeneralUtils.h
-      ApplicationPool2/Pool/ProcessUtils.h
-      ApplicationPool2/Pool/Inspection.h
-      ApplicationPool2/Pool/Debug.h
-      ApplicationPool2/SuperGroup.h
+      ApplicationPool2/Pool/InitializationAndShutdown.cpp
+      ApplicationPool2/Pool/AnalyticsCollection.cpp
+      ApplicationPool2/Pool/GarbageCollection.cpp
+      ApplicationPool2/Pool/GeneralUtils.cpp
+      ApplicationPool2/Pool/GroupUtils.cpp
+      ApplicationPool2/Pool/ProcessUtils.cpp
+      ApplicationPool2/Pool/StateInspection.cpp
+      ApplicationPool2/Pool/Miscellaneous.cpp
       ApplicationPool2/Group.h
+      ApplicationPool2/Group/InitializationAndShutdown.cpp
+      ApplicationPool2/Group/LifetimeAndBasics.cpp
+      ApplicationPool2/Group/SessionManagement.cpp
+      ApplicationPool2/Group/SpawningAndRestarting.cpp
+      ApplicationPool2/Group/ProcessListManagement.cpp
+      ApplicationPool2/Group/OutOfBandWork.cpp
+      ApplicationPool2/Group/Miscellaneous.cpp
+      ApplicationPool2/Group/InternalUtils.cpp
+      ApplicationPool2/Group/StateInspection.cpp
+      ApplicationPool2/Group/Verification.cpp
+      ApplicationPool2/BasicGroupInfo.h
+      ApplicationPool2/BasicProcessInfo.h
+      ApplicationPool2/Context.h
       ApplicationPool2/Process.h
       ApplicationPool2/Socket.h
       ApplicationPool2/Session.h
       ApplicationPool2/Options.h
-      ApplicationPool2/PipeWatcher.h
       ApplicationPool2/AppTypes.h
-      ApplicationPool2/Spawner.h
-      ApplicationPool2/SpawnerFactory.h
-      ApplicationPool2/SmartSpawner.h
-      ApplicationPool2/DirectSpawner.h
-      ApplicationPool2/DummySpawner.h
+      SpawningKit/Spawner.h
+      SpawningKit/Factory.h
+      SpawningKit/SmartSpawner.h
+      SpawningKit/DirectSpawner.h
+      SpawningKit/DummySpawner.h
+      SpawningKit/PipeWatcher.h
     )
   define_component 'ApplicationPool2/AppTypes.o',
     :source   => 'ApplicationPool2/AppTypes.cpp',

data/lib/phusion_passenger/config/{admin_command_command.rb → api_call_command.rb}

@@ -33,11 +33,11 @@ PhusionPassenger.require_passenger_lib 'utils/json'
 module PhusionPassenger
   module Config
 
-    class AdminCommandCommand < Command
+    class ApiCallCommand < Command
       include PhusionPassenger::Config::Utils
 
       def self.create_default_options
-        return { :agent_name => "server_admin" }
+        { :agent_name => "server_api" }
       end
 
       def run
@@ -51,29 +51,29 @@ module PhusionPassenger
       def self.create_option_parser(options)
         OptionParser.new do |opts|
           nl = "\n" + ' ' * 37
-          opts.banner = "Usage: passenger-config invoke-command <METHOD> <PATH> [OPTIONS]\n"
+          opts.banner = "Usage: passenger-config api-call <METHOD> <PATH> [OPTIONS]\n"
           opts.separator ""
-          opts.separator "  Invoke an internal #{PROGRAM_NAME} admin command. #{PROGRAM_NAME} listens"
-          opts.separator "  on a local HTTP server for admin commands. Other `passenger-config` commands"
-          opts.separator "  are just shortcuts for sending specific HTTP requests to the"
-          opts.separator "  #{PROGRAM_NAME} admin HTTP server. `passenger-config invoke-command` allows"
-          opts.separator "  you to send requests directly."
+          opts.separator "  Makes an API call to one of the #{PROGRAM_NAME} agents. #{PROGRAM_NAME}"
+          opts.separator "  listens on a local HTTP server for admin commands. Many `passenger-config`"
+          opts.separator "  commands are just shortcuts for sending HTTP API calls to the"
+          opts.separator "  #{PROGRAM_NAME} admin HTTP server. `passenger-config api-call` allows"
+          opts.separator "  you to send API calls directly."
           opts.separator ""
           opts.separator "  METHOD is an HTTP verb, like 'GET', 'POST', 'PUT' or 'DELETE'."
           opts.separator "  PATH is the admin URI. You can pass POST data with '-d'."
           opts.separator ""
-          opts.separator "  Example 1: passenger-config admin-command GET /server.json"
+          opts.separator "  Example 1: passenger-config api-call GET /server.json"
           opts.separator "  Sends the 'GET /server.json' command to the HTTP server agent."
           opts.separator ""
-          opts.separator "  Example 2: passenger-config admin-command PUT /config.json \\"
+          opts.separator "  Example 2: passenger-config api-call PUT /config.json \\"
           opts.separator "             -d '{\"log_level\", 7}'"
           opts.separator "  Sends the 'PUT /config.json' command to the HTTP server agent, with the"
           opts.separator "  given PUT data."
           opts.separator ""
-          opts.separator "  Example 3: passenger-config admin-command POST /shutdown.json -a watchdog"
+          opts.separator "  Example 3: passenger-config api-call POST /shutdown.json -a watchdog"
           opts.separator "  Sends the 'POST /shutdown.json' command to the watchdog, with no POST data."
           opts.separator ""
-          opts.separator "  Example 4: passenger-config admin-command POST /shutdown.json \\"
+          opts.separator "  Example 4: passenger-config api-call POST /shutdown.json \\"
           opts.separator "             -S /tmp/watchdog.sock"
           opts.separator "  Sends the 'POST /shutdown.json' command to the watchdog listening at the"
           opts.separator "  specific socket file /tmp/watchdog.sock. No POST data."
@@ -92,9 +92,9 @@ module PhusionPassenger
           end
           opts.on("-a", "--agent NAME", String, "The name of the socket to send the command#{nl}" +
             "to. This specifies which agent the request#{nl}" +
-            "is sent to. Choices: watchdog,#{nl}" +
-            "server_admin, logging_admin.#{nl}" +
-            "Default: server_admin") do |val|
+            "is sent to. Choices: watchdog_api,#{nl}" +
+            "server_api, logging_api.#{nl}" +
+            "Default: server_api") do |val|
             options[:agent_name] = val
           end
           opts.on("-S", "--socket PATH", String, "Instead of inferring the socket path from#{nl}" +
@@ -162,7 +162,10 @@ module PhusionPassenger
         else
           select_passenger_instance
           @socket_path = "#{@instance.path}/agents.s/#{@options[:agent_name]}"
-          @password = obtain_full_admin_password(@instance)
+          begin
+            @password = @instance.full_admin_password
+          rescue Errno::EACCES
+          end
         end
       end
 

data/lib/phusion_passenger/config/detach_process_command.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014 Phusion
+#  Copyright (c) 2014-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -89,10 +89,10 @@ module PhusionPassenger
 
       def perform_detach
         request = Net::HTTP::Post.new("/pool/detach_process.json")
-        request.basic_auth("admin", obtain_full_admin_password(@instance))
+        try_performing_full_admin_basic_auth(request, @instance)
         request.content_type = "application/json"
         request.body = PhusionPassenger::Utils::JSON.generate(:pid => @pid)
-        response = @instance.http_request("agents.s/server_admin", request)
+        response = @instance.http_request("agents.s/server_api", request)
         if response.code.to_i / 100 == 2
           body = PhusionPassenger::Utils::JSON.parse(response.body)
           if body['detached']
@@ -102,6 +102,9 @@ module PhusionPassenger
           else
             abort "Could not detach process #{@pid}."
           end
+        elsif response.code.to_i == 401
+          print_full_admin_command_permission_error
+          abort
         else
           STDERR.puts "*** An error occured while communicating with the #{PROGRAM_NAME} server:"
           STDERR.puts response.body

data/lib/phusion_passenger/config/main.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013-2014 Phusion
+#  Copyright (c) 2013-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -32,7 +32,7 @@ module PhusionPassenger
       ["restart-app", "RestartAppCommand"],
       ["list-instances", "ListInstancesCommand"],
       ["reopen-logs", "ReopenLogsCommand"],
-      ["admin-command", "AdminCommandCommand"],
+      ["api-call", "ApiCallCommand"],
       ["validate-install", "ValidateInstallCommand"],
       ["build-native-support", "BuildNativeSupportCommand"],
 
@@ -90,9 +90,7 @@ module PhusionPassenger
       puts "  restart-app            Restart an application"
       puts "  reopen-logs            Instruct #{PROGRAM_NAME} agents to reopen their log"
       puts "                         files"
-      if all
-        puts "  admin-command          Invoke an internal #{PROGRAM_NAME} admin command."
-      end
+      puts "  api-call               Makes an API call to a #{PROGRAM_NAME} agent."
       puts
       puts "Informational commands:"
       puts "  list-instances         List running #{PROGRAM_NAME} instances"

data/lib/phusion_passenger/config/reopen_logs_command.rb

@@ -68,20 +68,42 @@ module PhusionPassenger
       end
 
       def perform_reopen_logs
-        password = obtain_full_admin_password(@instance)
-        perform_reopen_logs_on("watchdog", "watchdog", password)
-        perform_reopen_logs_on("server", "server_admin", password)
-        perform_reopen_logs_on("logger", "logging_admin", password)
+        perform_reopen_logs_on("watchdog", "watchdog")
+        perform_reinherit_logs_on("server", "server_api")
+        perform_reinherit_logs_on("logger", "logging_api")
         puts "All done"
       end
 
-      def perform_reopen_logs_on(name, socket_name, password)
+      def perform_reopen_logs_on(name, socket_name)
         puts "Reopening logs for #{AGENT_EXE} #{name}"
         request = Net::HTTP::Post.new("/reopen_logs.json")
-        request.basic_auth("admin", password)
+        try_performing_full_admin_basic_auth(request, @instance)
         request.content_type = "application/json"
         response = @instance.http_request("agents.s/#{socket_name}", request)
-        if response["content-type"] == "application/json"
+        if response.code.to_i == 401
+          print_full_admin_command_permission_error
+          abort
+        elsif response["content-type"] == "application/json"
+          if response.code.to_i / 100 != 2
+            handle_error(name, response)
+          end
+        else
+          STDERR.puts "*** An error occured while communicating with the #{AGENT_EXE} #{name} (code #{response.code}):"
+          STDERR.puts response.body
+          abort
+        end
+      end
+
+      def perform_reinherit_logs_on(name, socket_name)
+        puts "Reopen logs for #{AGENT_EXE} #{name} (through reinheritance)"
+        request = Net::HTTP::Post.new("/reinherit_logs.json")
+        try_performing_full_admin_basic_auth(request, @instance)
+        request.content_type = "application/json"
+        response = @instance.http_request("agents.s/#{socket_name}", request)
+        if response.code.to_i == 401
+          print_full_admin_command_permission_error
+          abort
+        elsif response["content-type"] == "application/json"
           if response.code.to_i / 100 != 2
             handle_error(name, response)
           end

data/lib/phusion_passenger/config/restart_app_command.rb

@@ -173,6 +173,9 @@ module PhusionPassenger
           index, name = menu.query
         rescue Interrupt
           abort
+        ensure
+          STDOUT.write(colors.reset)
+          STDOUT.flush
         end
 
         if index == choices.size - 1
@@ -202,14 +205,17 @@ module PhusionPassenger
           group_name = group.elements["name"].text
           puts "Restarting #{group_name}"
           request = Net::HTTP::Post.new("/pool/restart_app_group.json")
-          request.basic_auth("admin", obtain_full_admin_password(@instance))
+          try_performing_full_admin_basic_auth(request, @instance)
           request.content_type = "application/json"
           request.body = PhusionPassenger::Utils::JSON.generate(
             :name => group_name,
             :method => restart_method)
-          response = @instance.http_request("agents.s/server_admin", request)
+          response = @instance.http_request("agents.s/server_api", request)
           if response.code.to_i / 100 == 2
             response.body
+          elsif response.code.to_i == 401
+            print_full_admin_command_permission_error
+            abort
           else
             STDERR.puts "*** An error occured while communicating with the #{PROGRAM_NAME} server:"
             STDERR.puts response.body
@@ -229,10 +235,13 @@ module PhusionPassenger
 
       def query_pool_xml
         request = Net::HTTP::Get.new("/pool.xml")
-        request.basic_auth("ro_admin", obtain_read_only_admin_password(@instance))
-        response = @instance.http_request("agents.s/server_admin", request)
+        try_performing_ro_admin_basic_auth(request, @instance)
+        response = @instance.http_request("agents.s/server_api", request)
         if response.code.to_i / 100 == 2
           REXML::Document.new(response.body)
+        elsif response.code.to_i == 401
+          print_instance_querying_permission_error
+          abort
         else
           STDERR.puts "*** An error occured while querying the #{PROGRAM_NAME} server:"
           STDERR.puts response.body

data/lib/phusion_passenger/config/utils.rb

@@ -96,22 +96,22 @@ module PhusionPassenger
         end
       end
 
-      def obtain_read_only_admin_password(instance)
+      def try_performing_ro_admin_basic_auth(request, instance)
         begin
-          return instance.read_only_admin_password
+          password = instance.read_only_admin_password
         rescue Errno::EACCES
-          print_instance_querying_permission_error
-          abort
+          return
         end
+        request.basic_auth("ro_admin", password)
       end
 
-      def obtain_full_admin_password(instance)
+      def try_performing_full_admin_basic_auth(request, instance)
         begin
-          return instance.full_admin_password
+          password = instance.full_admin_password
         rescue Errno::EACCES
-          print_instance_querying_permission_error
-          abort
+          return
         end
+        request.basic_auth("admin", password)
       end
 
 
@@ -122,6 +122,13 @@ module PhusionPassenger
           "'#{PhusionPassenger::PlatformInfo.ruby_sudo_command}'."
       end
 
+      def print_full_admin_command_permission_error
+        PhusionPassenger.require_passenger_lib 'platform_info/ruby'
+        STDERR.puts "*** ERROR: You are not authorized to perform this particular " +
+          "administration command on this #{PROGRAM_NAME} instance. Please try again with " +
+          "'#{PhusionPassenger::PlatformInfo.ruby_sudo_command}'."
+      end
+
       def is_enterprise?
         return defined?(PhusionPassenger::PASSENGER_IS_ENTERPRISE) && PhusionPassenger::PASSENGER_IS_ENTERPRISE
       end

data/lib/phusion_passenger/constants.rb

@@ -67,7 +67,7 @@ module PhusionPassenger
     DEFAULT_UNION_STATION_GATEWAY_PORT = 443
     DEFAULT_HTTP_SERVER_LISTEN_ADDRESS = "tcp://127.0.0.1:3000"
     DEFAULT_LOGGING_AGENT_LISTEN_ADDRESS = "tcp://127.0.0.1:9344"
-    DEFAULT_LOGGING_AGENT_ADMIN_LISTEN_ADDRESS = "tcp://127.0.0.1:9345"
+    DEFAULT_LOGGING_AGENT_API_LISTEN_ADDRESS = "tcp://127.0.0.1:9345"
 
     # Size limits
     MESSAGE_SERVER_MAX_USERNAME_SIZE = 100
@@ -83,8 +83,12 @@ module PhusionPassenger
 
     # Versions
     PASSENGER_VERSION = PhusionPassenger::VERSION_STRING
+    PASSENGER_API_VERSION_MAJOR = 0
+    PASSENGER_API_VERSION_MINOR = 2
+    PASSENGER_API_VERSION = "#{PASSENGER_API_VERSION_MAJOR}.#{PASSENGER_API_VERSION_MINOR}"
     SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION = 2
-    SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION = 0
+    SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION = 1
+    SERVER_INSTANCE_DIR_STRUCTURE_MIN_SUPPORTED_MINOR_VERSION = 1
 
     # Misc
     FEEDBACK_FD = 3

data/lib/phusion_passenger/platform_info/apache.rb

@@ -106,6 +106,10 @@ module PhusionPassenger
     #
     # We used to run `httpd -V`, but on systems like Ubuntu it depends on various
     # environment variables or directories, wich apache2ctl loads or initializes.
+    #
+    # Because on some systems (mostly Ubuntu) `apache2ctl -V` attempts to parse
+    # and load the config file, this command can fail because of configuration file
+    # errors.
     def self.apache2ctl_V(options = nil)
       if options
         apache2ctl = options[:apache2ctl] || self.apache2ctl(options)

data/lib/phusion_passenger/platform_info/apache_detector.rb

@@ -42,24 +42,37 @@ module PhusionPassenger
     class ApacheDetector
       class Result
         # These are required and are never nil.
-        attr_accessor :apxs2, :httpd, :ctl, :version, :config_file
+        attr_accessor :apxs2, :httpd, :ctl, :version
         # These are optional and may be nil.
         attr_accessor :a2enmod, :a2dismod
+        # Ttis may be nil. It depends on whether 'apache2ctl -V' succeeds.
+        attr_accessor :config_file
         # This may be nil. It depends on how well we can infer information from the config file.
         attr_accessor :error_log
+        attr_writer :config_file_broken
 
         def initialize(detector)
           @detector = detector
         end
 
+        def config_file_broken?
+          @config_file_broken
+        end
+
         def report
           log " <b>* Found Apache #{version}!</b>"
           log "   Information:"
           log "      apxs2          : #{apxs2}"
           log "      Main executable: #{httpd}"
           log "      Control command: #{ctl}"
-          log "      Config file    : #{config_file}"
+          log "      Config file    : #{config_file || 'unknown'}"
           log "      Error log file : #{error_log || 'unknown'}"
+          if config_file_broken?
+            log ""
+            log "   WARNING:"
+            log "      <red>The configuration file seems to be broken! Please double-check it by running:</red>"
+            log "      <red>#{ctl} -t</red>"
+          end
           log ""
           log "   To install #{PROGRAM_NAME} against this specific Apache version:"
           log "      #{PlatformInfo.ruby_command} #{PhusionPassenger.bin_dir}/passenger-install-apache2-module --apxs2-path='#{apxs2}'"
@@ -145,7 +158,6 @@ module PhusionPassenger
               log " --> #{result.config_file}"
             else
               log "<red> --> Cannot detect default config file location!</red>"
-              result.httpd = nil
             end
           end
           if result.httpd
@@ -162,6 +174,9 @@ module PhusionPassenger
             result.a2enmod = PlatformInfo.a2enmod(:apxs2 => apxs2)
             result.a2dismod = PlatformInfo.a2dismod(:apxs2 => apxs2)
           end
+          if result.httpd
+            result.config_file_broken = PlatformInfo.apache2ctl_V(:apxs2 => apxs2).nil?
+          end
           if result.httpd
             log "<green>Found a usable Apache installation using #{apxs2}.</green>"
             true