passenger 4.0.60 → 5.0.0.beta1

data/lib/phusion_passenger/abstract_installer.rb

@@ -183,7 +183,7 @@ protected
 	end
 
 	def check_gem_install_permission_problems
-		return true if PhusionPassenger.natively_packaged?
+		return true if PhusionPassenger.custom_packaged?
 		begin
 			require 'rubygems'
 		rescue LoadError
@@ -203,7 +203,7 @@ protected
 	end
 
 	def check_directory_accessible_by_web_server
-		return true if PhusionPassenger.natively_packaged?
+		return true if PhusionPassenger.custom_packaged?
 		inaccessible_directories = []
 		list_parent_directories(PhusionPassenger.build_system_dir).each do |path|
 			if !world_executable?(path)
@@ -360,6 +360,31 @@ protected
 		raise Abort
 	end
 
+	def prompt_confirmation_with_default(message, default)
+		if default
+			default_str = "[Y/n]"
+		else
+			default_str = "[y/N]"
+		end
+		result = prompt("#{message} #{default_str}") do |value|
+			if value.downcase == 'y' || value.downcase == 'n'
+				true
+			elsif value.empty?
+				true
+			else
+				puts_error "Invalid input '#{value}'; please enter either 'y' or 'n'."
+				false
+			end
+		end
+		if result.empty?
+			return default
+		else
+			return result.downcase == 'y'
+		end
+	rescue Interrupt
+		raise Abort
+	end
+
 	def wait(timeout = nil)
 		if interactive?
 			if timeout
@@ -380,7 +405,7 @@ protected
 	end
 
 	def home_dir
-		Etc.getpwuid(Process.uid).dir
+		return PhusionPassenger.home_dir
 	end
 
 

data/lib/phusion_passenger/admin_tools.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -25,14 +25,14 @@ module PhusionPassenger
 
 module AdminTools
 	def self.tmpdir
-		["PASSENGER_TEMP_DIR", "PASSENGER_TMPDIR"].each do |name|
+		["PASSENGER_INSTANCE_REGISTRY_DIR", "TMPDIR"].each do |name|
 			if ENV.has_key?(name) && !ENV[name].empty?
 				return ENV[name]
 			end
 		end
 		return "/tmp"
 	end
-	
+
 	def self.process_is_alive?(pid)
 		begin
 			Process.kill(0, pid)

data/lib/phusion_passenger/admin_tools/instance.rb

@@ -0,0 +1,207 @@
+# encoding: utf-8
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2014 Phusion
+#
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#
+#  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 'constants'
+PhusionPassenger.require_passenger_lib 'utils/json'
+
+module PhusionPassenger
+module AdminTools
+
+class Instance
+	STALE_TIMEOUT = 60
+
+	attr_reader :path, :state, :name, :server_software, :properties
+
+	def initialize(path)
+		@path = path
+		# Possible states:
+		#
+		# * :good - Everything is good. But the Watchdog process that created
+		#   it might have died. In that case, the directory should be cleaned up.
+		#   Use `locked?` to check.
+		#
+		# * :not_finalized - The instance directory hasn't been finalized yet,
+		#   so we can't read any information from it. It is possible that the
+		#   process that has created it has died, i.e. that it will never
+		#   become finalized. In that case, the directory should be cleaned up.
+		#   Use `stale?` to check.
+		#
+		# * :structure_version_unsupported - The properties file advertised a
+		#   structure version that we don't support. We can't read any
+		#   information from it.
+		#
+		# * :corrupted - The instance directory is corrupted in some way.
+		@state = nil
+
+		reload_properties
+	end
+
+	def locked?
+		if defined?(File::LOCK_EX)
+			return !File.open("#{@path}/lock", "r") do |f|
+				f.flock(File::LOCK_EX | File::LOCK_NB)
+			end
+		else
+			# Solaris :-(
+			# Since using fcntl locks in Ruby is a huge pain,
+			# we'll fallback to checking the watchdog PID.
+			return watchdog_alive?
+		end
+	end
+
+	def stale?
+		stat = File.stat(@path)
+		if stat.mtime < Time.now - STALE_TIMEOUT
+			return !locked?
+		else
+			return false
+		end
+	end
+
+	def watchdog_alive?
+		return process_is_alive?(@watchdog_pid)
+	end
+
+	def http_request(socket_path, request)
+		sock = Net::BufferedIO.new(UNIXSocket.new("#{@path}/#{socket_path}"))
+		begin
+			request.exec(sock, "1.1", request.path)
+
+			done = false
+			while !done
+				response = Net::HTTPResponse.read_new(sock)
+				done = !response.kind_of?(Net::HTTPContinue)
+			end
+
+			response.reading_body(sock, request.response_body_permitted?) do
+				# Nothing
+			end
+		ensure
+			sock.close
+		end
+
+		return response
+	end
+
+	def server_pid
+		@server_pid ||= File.read("#{@path}/server.pid").to_i
+	end
+
+	def full_admin_password
+		@full_admin_password ||= File.read("#{@path}/full_admin_password.txt")
+	end
+
+	def read_only_admin_password
+		@read_only_admin_password ||= File.read("#{@path}/read_only_admin_password.txt")
+	end
+
+private
+	class CorruptedError < StandardError
+	end
+
+	def reload_properties
+		@properties = nil
+		@state      = nil
+		begin
+			reload_properties_internal
+		rescue CorruptedError
+			@state = :corrupted
+		end
+	end
+
+	def reload_properties_internal
+		if !File.exist?("#{@path}/creation_finalized")
+			@state = :unfinalized
+			return
+		end
+		check(File.file?("#{@path}/creation_finalized"))
+
+		properties = nil
+		begin
+			File.open("#{@path}/properties.json", "r") do |f|
+				properties = Utils::JSON.parse(f.read)
+			end
+		rescue Errno::ENOENT
+			raise CorruptedError
+		rescue RuntimeError => e
+			if e.message =~ /parse error/
+				raise CorruptedError
+			else
+				raise
+			end
+		end
+
+		check(!properties.nil?)
+		props = properties["instance_dir"]
+		check(!props.nil?)
+		major_version = props["major_version"]
+		minor_version = props["minor_version"]
+		check(major_version.is_a?(Integer))
+		check(minor_version.is_a?(Integer))
+		name = properties["name"]
+		check(name.is_a?(String))
+		check(!name.empty?)
+		server_software = properties["server_software"]
+		check(server_software.is_a?(String))
+		check(!server_software.empty?)
+		watchdog_pid = properties["watchdog_pid"]
+		check(watchdog_pid.is_a?(Integer))
+
+		version_supported =
+			major_version == PhusionPassenger::SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION &&
+			minor_version <= PhusionPassenger::SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION
+		if !version_supported
+			@state = :structure_version_unsupported
+			return
+		end
+
+		check(File.file?("#{@path}/lock"))
+		check(File.directory?("#{@path}/agents.s"))
+		check(File.directory?("#{@path}/apps.s"))
+
+		@properties = properties
+		@name = name
+		@server_software = server_software
+		@watchdog_pid = watchdog_pid
+		@state = :good
+	end
+
+	def check(val)
+		raise CorruptedError if !val
+	end
+
+	def process_is_alive?(pid)
+		begin
+			Process.kill(0, pid)
+			return true
+		rescue Errno::ESRCH
+			return false
+		rescue SystemCallError => e
+			return true
+		end
+	end
+end
+
+end # module AdminTools
+end # module PhusionPassenger

data/lib/phusion_passenger/admin_tools/instance_registry.rb

@@ -0,0 +1,98 @@
+# encoding: utf-8
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2014 Phusion
+#
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#
+#  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.
+
+require 'fileutils'
+PhusionPassenger.require_passenger_lib 'admin_tools/instance'
+
+module PhusionPassenger
+module AdminTools
+
+class InstanceRegistry
+	def initialize(path = nil)
+		@path = path || default_path
+	end
+
+	def list(options = {})
+		options = {
+			:clean_stale_or_corrupted => true
+		}.merge(options)
+		instances = []
+
+		Dir["#{@path}/passenger.*"].each do |dir|
+			instance = Instance.new(dir)
+			case instance.state
+			when :good
+				if instance.locked?
+					instances << instance
+				elsif options[:clean_stale_or_corrupted]
+					cleanup(dir)
+				end
+			when :structure_version_unsupported
+				next
+			when :corrupted
+				if !instance.locked? && options[:clean_stale_or_corrupted]
+					cleanup(dir)
+				end
+			when :not_finalized
+				if instance.stale? && options[:clean_stale_or_corrupted]
+					cleanup(dir)
+				end
+			end
+		end
+		return instances
+	end
+
+	def find_by_name(name, options = {})
+		return list(options).find { |instance| instance.name == name }
+	end
+
+	def find_by_name_prefix(name, options = {})
+		prefix = /^#{Regexp.escape name}/
+		results = list(options).find_all { |instance| instance.name =~ prefix }
+		if results.size <= 1
+			return results.first
+		else
+			return :ambiguous
+		end
+	end
+
+private
+	def default_path
+		["PASSENGER_INSTANCE_REGISTRY_DIR", "TMPDIR"].each do |name|
+			if ENV.has_key?(name) && !ENV[name].empty?
+				return ENV[name]
+			end
+		end
+		return "/tmp"
+	end
+
+	def cleanup(path)
+		puts "*** Cleaning stale instance directory #{path}"
+		FileUtils.chmod_R(0700, path) rescue nil
+		FileUtils.remove_entry_secure(path)
+	end
+end
+
+end # module AdminTools
+end # module PhusionPassenger

data/lib/phusion_passenger/apache2/config_options.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013 Phusion
+#  Copyright (c) 2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -24,16 +24,16 @@
 # This file defines all supported Apache per-directory configuration options. The
 # build system automatically generates the corresponding Apache module boilerplate
 # code from the definitions in this file.
-# 
+#
 # Main configuration options are not defined in this file, but are defined in
 # ext/apache2/Configuraion.cpp instead.
-# 
+#
 # The following boilerplate code is generated:
-# 
+#
 #  * command_rec array members (ConfigurationCommands.cpp.erb)
-# 
+#
 # Options:
-# 
+#
 #  * name - The configuration option name. Required.
 #  * context - The context in which this configuration option is valid.
 #              Defaults to ["OR_OPTIONS", "ACCESS_CONF", "RSRC_CONF"]
@@ -48,6 +48,9 @@
 #             Setting this to nil will disable auto-generation of CGI header
 #             generation code. You are then responsible for writing CGI header
 #             passing code yourself in Hooks.cpp.
+#  * header_expression - The expression to be passed to `addHeader()`.
+#  * function - If nil, a setter function will be automatically generated. If
+#               non-nil, must be the name of the setter function.
 
 APACHE2_DIRECTORY_CONFIGURATION_OPTIONS = [
 	{
@@ -71,18 +74,6 @@ APACHE2_DIRECTORY_CONFIGURATION_OPTIONS = [
 		:type => :string,
 		:desc => "The environment under which applications are run."
 	},
-	{
-		:name => "RailsEnv",
-		:type => :string,
-		:desc => "The environment under which applications are run.",
-		:alias_for => "PassengerAppEnv"
-	},
-	{
-		:name => "RackEnv",
-		:type => :string,
-		:desc => "The environment under which applications are run.",
-		:alias_for => "PassengerAppEnv"
-	},
 	{
 		:name => "PassengerMinInstances",
 		:type => :integer,
@@ -146,11 +137,18 @@ APACHE2_DIRECTORY_CONFIGURATION_OPTIONS = [
 		:header  => nil
 	},
 	{
-		:name => "PassengerMaxRequestQueueSize",
-		:type => :integer,
+		:name      => "PassengerMaxRequestQueueSize",
+		:type      => :integer,
 		:min_value => 0,
-		:context => ["OR_ALL"],
-		:desc => "The maximum number of queued requests."
+		:context   => ["OR_ALL"],
+		:desc      => "The maximum number of queued requests."
+	},
+	{
+		:name      => "PassengerMaxPreloaderIdleTime",
+		:type      => :integer,
+		:min_value => 0,
+		:context   => ["RSRC_CONF"],
+		:desc      => "The maximum number of seconds that a preloader process may be idle before it is shutdown."
 	},
 	{
 		:name => "PassengerLoadShellEnvvars",
@@ -188,5 +186,57 @@ APACHE2_DIRECTORY_CONFIGURATION_OPTIONS = [
 		:type    => :flag,
 		:context => ["OR_ALL"],
 		:desc    => "The cookie name to use for sticky sessions."
+	},
+	{
+		:name     => "PassengerSpawnMethod",
+		:type     => :string,
+		:context  => ["RSRC_CONF"],
+		:desc     => "The spawn method to use.",
+		:function => "cmd_passenger_spawn_method"
+	},
+	{
+		:name     => "PassengerShowVersionInHeader",
+		:type     => :flag,
+		:desc     => "Whether to show the Phusion Passenger version number in the X-Powered-By header."
+	},
+	{
+		:name     => "PassengerFriendlyErrorPages",
+		:type     => :flag,
+		:desc     => "Whether to display friendly error pages when something goes wrong."
+	},
+	{
+		:name     => "PassengerRestartDir",
+		:type     => :string,
+		:desc     => "The directory in which Passenger should look for restart.txt."
+	},
+	{
+		:name     => "PassengerAppGroupName",
+		:type     => :string,
+		:desc     => "Application process group name."
+	},
+
+	##### Aliases #####
+
+	{
+		:name => "RailsEnv",
+		:type => :string,
+		:desc => "The environment under which applications are run.",
+		:alias_for => "PassengerAppEnv"
+	},
+	{
+		:name => "RackEnv",
+		:type => :string,
+		:desc => "The environment under which applications are run.",
+		:alias_for => "PassengerAppEnv"
+	},
+
+	##### Deprecated options #####
+
+	{
+		:name      => "RailsSpawnMethod",
+		:type      => :string,
+		:context   => ["RSRC_CONF"],
+		:desc      => "Deprecated option.",
+		:alias_for => "PassengerSpawnMethod"
 	}
 ]