passenger 4.0.14 → 4.0.16

data/lib/phusion_passenger/packaging.rb

@@ -76,8 +76,8 @@ module Packaging
 		'rpm/**/*',
 		'helper-scripts/**/*',
 		'ext/common/**/*.{cpp,c,h,hpp,md,erb}',
-		'ext/apache2/*.{cpp,h,hpp,c}',
-		'ext/nginx/*.{c,cpp,h}',
+		'ext/apache2/*.{cpp,h,hpp,c,erb}',
+		'ext/nginx/*.{c,cpp,h,erb}',
 		'ext/nginx/config',
 		'ext/boost/**/*',
 		'ext/libev/{LICENSE,Changes,README,Makefile.am,Makefile.in}',

data/lib/phusion_passenger/platform_info/apache.rb

@@ -182,6 +182,14 @@ module PlatformInfo
 				if filename.include?("${")
 					# We couldn't substitute everything.
 					return nil
+				end
+				if filename !~ /\A\//
+					# Not an absolute path. Infer from root.
+					if root = httpd_root(options)
+						return "#{root}/#{filename}"
+					else
+						return nil
+					end
 				else
 					return filename
 				end

data/lib/phusion_passenger/platform_info/compiler.rb

@@ -75,12 +75,12 @@ private
 				output = `#{command} 2>&1`
 				result = $?.exitstatus == 0
 			rescue SystemCallError => e
-				result = false
+				result = nil
 				exec_error_reason = e.message
 			end
 			log("Output:\n" <<
 				"-------------------------\n" <<
-				output <<
+				output.to_s <<
 				"\n-------------------------")
 		elsif verbose?
 			result = system(command)

data/lib/phusion_passenger/rails3_extensions/init.rb

@@ -27,8 +27,8 @@ require 'digest/md5'
 module PhusionPassenger
 
 module Rails3Extensions
-	def self.init!(options)
-		if !AnalyticsLogging.install!(options)
+	def self.init!(options, user_options = {})
+		if !AnalyticsLogging.install!(options, user_options)
 			# Remove code to save memory.
 			PhusionPassenger::Rails3Extensions.send(:remove_const, :AnalyticsLogging)
 			PhusionPassenger.send(:remove_const, :Rails3Extensions)
@@ -38,7 +38,7 @@ end
 
 module Rails3Extensions
 class AnalyticsLogging < ActiveSupport::LogSubscriber
-	def self.install!(options)
+	def self.install!(options, user_options)
 		analytics_logger = options["analytics_logger"]
 		app_group_name = options["app_group_name"]
 		return false if !analytics_logger || !options["analytics"]
@@ -47,7 +47,7 @@ class AnalyticsLogging < ActiveSupport::LogSubscriber
 		# so that the info can be logged.
 		GC.enable_stats if GC.respond_to?(:enable_stats)
 		
-		subscriber = self.new
+		subscriber = self.new(user_options)
 		AnalyticsLogging.attach_to(:action_controller, subscriber)
 		AnalyticsLogging.attach_to(:active_record, subscriber)
 		if defined?(ActiveSupport::Cache::Store)
@@ -87,6 +87,10 @@ class AnalyticsLogging < ActiveSupport::LogSubscriber
 		
 		return true
 	end
+
+	def initialize(options)
+		install_event_preprocessor(options[:event_preprocessor]) if options[:event_preprocessor]
+	end
 	
 	def process_action(event)
 		log = Thread.current[PASSENGER_ANALYTICS_WEB_LOG]
@@ -215,6 +219,17 @@ class AnalyticsLogging < ActiveSupport::LogSubscriber
 			end
 		end
 	end
+
+	private
+	def install_event_preprocessor(event_preprocessor)
+		public_methods(false).each do |name|
+			singleton = class << self; self end
+			singleton.send(:define_method, name, lambda do |event|
+				event_preprocessor.call(event)
+				super(event)
+			end)
+		end
+	end
 end # class AnalyticsLogging
 end # module Rails3Extensions
 

data/lib/phusion_passenger/ruby_core_enhancements.rb

@@ -22,7 +22,10 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-require 'rubygems'
+begin
+	require 'rubygems'
+rescue LoadError
+end
 require 'socket'
 require 'thread'
 if (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby") && RUBY_VERSION < "1.8.7"

data/lib/phusion_passenger/standalone/app_finder.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -33,7 +33,8 @@ class AppFinder
 	def self.looks_like_app_directory?(dir)
 		return File.exist?("#{dir}/config.ru") ||
 			File.exist?("#{dir}/config/environment.rb") ||
-			File.exist?("#{dir}/passenger_wsgi.py")
+			File.exist?("#{dir}/passenger_wsgi.py") ||
+			File.exist?("#{dir}/passenger_node.js")
 	end
 	
 	def initialize(dirs, options = {})

data/lib/phusion_passenger/standalone/command.rb

@@ -241,6 +241,7 @@ private
 	def create_nginx_controller(extra_options = {})
 		require_daemon_controller
 		require 'socket' unless defined?(UNIXSocket)
+		require 'thread' unless defined?(Mutex)
 		if @options[:socket_file]
 			ping_spec = [:unix, @options[:socket_file]]
 		else

data/lib/phusion_passenger/standalone/runtime_installer.rb

@@ -572,12 +572,7 @@ private
 			# work around the problem by configure Nginx with prefix
 			# /tmp.
 			command << "#{shell} ./configure --prefix=/tmp " <<
-				"--with-cc-opt='-Wno-error' " <<
-				"--without-http_fastcgi_module " <<
-				"--without-http_scgi_module " <<
-				"--without-http_uwsgi_module " <<
-				"--with-http_gzip_static_module " <<
-				"--with-http_stub_status_module " <<
+				"#{STANDALONE_NGINX_CONFIGURE_OPTIONS} " <<
 				"'--add-module=#{PhusionPassenger.nginx_module_source_dir}'"
 			run_command_with_throbber(command, "Preparing Nginx...") do |status_text|
 				yield(0, 1, status_text)

data/lib/phusion_passenger/standalone/runtime_locator.rb

@@ -138,8 +138,15 @@ class RuntimeLocator
 
 private
 	def default_runtime_dir
-		home = Etc.getpwuid.dir
-		return "#{home}/#{USER_NAMESPACE_DIRNAME}/standalone"
+		if Process.uid == 0
+			# It is important that the default runtime dir for the root user
+			# is a publicly accessible directory, because when --user is given,
+			# the agents are run as non-root users.
+			return "/var/lib/#{GLOBAL_NAMESPACE_DIRNAME}/standalone"
+		else
+			home = Etc.getpwuid.dir
+			return "#{home}/#{USER_NAMESPACE_DIRNAME}/standalone"
+		end
 	end
 
 	def debugging?

data/lib/phusion_passenger/standalone/start_command.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2012 Phusion
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -83,7 +83,7 @@ class StartCommand < Command
 			########################
 			touch_temp_dir_in_background
 			watch_log_files_in_background if should_watch_logs?
-			wait_until_nginx_has_exited
+			wait_until_nginx_has_exited if should_wait_until_nginx_has_exited?
 		rescue Interrupt
 			stop_threads
 			stop_nginx
@@ -101,6 +101,7 @@ class StartCommand < Command
 			stop_nginx
 			raise
 		ensure
+			stop_touching_temp_dir_in_background if should_wait_until_nginx_has_exited?
 			stop_threads
 		end
 	ensure
@@ -166,6 +167,18 @@ private
 				wrap_desc("Disable passenger_friendly_error_pages")) do
 				@options[:friendly_error_pages] = false
 			end
+			opts.on("--ssl",
+				wrap_desc("Enable SSL support")) do
+				@options[:ssl] = true
+			end
+			opts.on("--ssl-certificate PATH", String,
+				wrap_desc("Specify the SSL certificate path")) do |val|
+				@options[:ssl_certificate] = File.expand_path(val)
+			end
+			opts.on("--ssl-certificate-key PATH", String,
+				wrap_desc("Specify the SSL key path")) do |val|
+				@options[:ssl_certificate_key] = File.expand_path(val)
+			end
 			opts.on("--union-station-gateway HOST:PORT", String,
 				wrap_desc("Specify Union Station Gateway host and port")) do |value|
 				host, port = value.split(":", 2)
@@ -248,6 +261,14 @@ private
 			error "You cannot specify both --address/--port and --socket. Please choose either one."
 			exit 1
 		end
+		if @options[:ssl] && !@options[:ssl_certificate]
+			error "You specified --ssl. Please specify --ssl-certificate as well."
+			exit 1
+		end
+		if @options[:ssl] && !@options[:ssl_certificate_key]
+			error "You specified --ssl. Please specify --ssl-certificate-key as well."
+			exit 1
+		end
 		check_port_bind_permission_and_display_sudo_suggestion
 		check_port_availability
 	end
@@ -361,12 +382,21 @@ private
 		return !@options[:daemonize] && @options[:log_file] != "/dev/null"
 	end
 
+	def should_wait_until_nginx_has_exited?
+		return !@options[:daemonize]
+	end
+
 	# Returns the URL that Nginx will be listening on.
 	def listen_url
 		if @options[:socket_file]
 			return @options[:socket_file]
 		else
-			result = "http://#{@options[:address]}"
+			if @options[:ssl]
+				scheme = "https"
+			else
+				scheme = "http"
+			end
+			result = "#{scheme}://#{@options[:address]}"
 			if @options[:port] != 80
 				result << ":#{@options[:port]}"
 			end
@@ -524,13 +554,19 @@ private
 	end
 
 	def touch_temp_dir_in_background
-		@interruptable_threads << Thread.new do
-			while true
-				# Touch the temp dir every 30 minutes to prevent
-				# /tmp cleaners from removing it.
-				sleep 60 * 30
-				system("find '#{@temp_dir}' | xargs touch")
+		require 'shellwords'
+		script = Shellwords.escape("#{PhusionPassenger.helper_scripts_dir}/touch-dir.sh")
+		dir    = Shellwords.escape(@temp_dir)
+		@toucher = IO.popen("sh #{script} #{dir}", "r")
+	end
+
+	def stop_touching_temp_dir_in_background
+		if @toucher
+			begin
+				Process.kill('TERM', @toucher.pid)
+			rescue Errno::ESRCH, Errno::ECHILD
 			end
+			@toucher.close
 		end
 	end
 

data/lib/phusion_passenger/utils.rb

@@ -22,7 +22,10 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-require 'rubygems'
+begin
+	require 'rubygems'
+rescue LoadError
+end
 require 'phusion_passenger/native_support'
 
 module PhusionPassenger

data/resources/templates/{nginx → installer_common}/run_installer_as_root.txt.erb

@@ -5,4 +5,6 @@ This installer must be able to write to the following directory:
   <b><%= @dir %></b>
 
 But it can't do that, because you're running the installer as <b><%= `whoami`.strip %></b>.
-Please re-run this installer as <b>root</b>.
+Please re-run this installer using <%= @sudo %>:
+
+  <b><%= @sudo_e %> <%= @ruby %> <%= @installer %></b>

data/resources/templates/nginx/nginx_module_sources_not_available.txt.erb

@@ -0,0 +1,6 @@
+<red>Nginx module sources not available</red>
+
+You didn't install the Phusion Passenger Nginx module sources. If you're on
+Debian or Ubuntu, please run <b>sudo apt-get install ruby-passenger-dev</b>
+first. If you're not on Debian/Ubuntu, or if you cannot run apt-get, please
+install Phusion Passenger from source: https://www.phusionpassenger.com/

data/resources/templates/standalone/config.erb

@@ -10,13 +10,6 @@ worker_processes 1;
 daemon on;
 error_log '<%= @options[:log_file] %>' <% if debugging? %>info<% end %>;
 pid '<%= @options[:pid_file] %>';
-<% if Process.euid == 0 %>
-    <% if @options[:user] %>
-        user <%= @options[:user] %> <%= default_group_for(@options[:user]) %>;
-    <% else %>
-        user <%= current_user %> <%= default_group_for(current_user) %>;
-    <% end %>
-<% end %>
 
 events {
     worker_connections 1024;
@@ -34,9 +27,11 @@ http {
     <% if @options[:user] %>
         passenger_user <%= @options[:user] %>;
         passenger_default_user <%= @options[:user] %>;
+        passenger_analytics_log_user <%= @options[:user] %>;
     <% else %>
         passenger_user <%= current_user %>;
         passenger_default_user <%= current_user %>;
+        passenger_analytics_log_user <%= current_user %>;
     <% end %>
     <% if debugging? %>passenger_log_level 2;<% end %>
     <% if @options[:rolling_restarts] %>passenger_rolling_restarts on;<% end %>
@@ -79,7 +74,7 @@ http {
     
     <% for app in @apps %>
     server {
-        listen <%= nginx_listen_address(app) %>;
+        listen <%= nginx_listen_address(app) %> <%= "ssl" if app[:ssl] %>;
         server_name <%= app[:server_names].join(' ') %>;
         root '<%= app[:root] %>/public';
         passenger_app_root '<%= app[:root] %>';
@@ -91,6 +86,11 @@ http {
             union_station_support on;
             union_station_key <%= app[:union_station_key] %>;
         <% end %>
+        <% if app[:ssl] %>
+            ssl on;
+            ssl_certificate <%= app[:ssl_certificate] %>;
+            ssl_certificate_key <%= app[:ssl_certificate_key] %>;
+        <% end %>
 
         # Rails asset pipeline support.
         location ~ ^/assets/ {

data/test/cxx/ApplicationPool2/PoolTest.cpp

@@ -961,7 +961,8 @@ namespace tut {
 	}
 
 	TEST_METHOD(41) {
-		// Disabling the sole process in a group should trigger a new process spawn.
+		// Disabling the sole process in a group, in case the pool settings allow
+		// spawning another process, should trigger a new process spawn.
 		ensureMinProcesses(1);
 		Options options = createOptions();
 		SessionPtr session = pool->get(options, &ticket);
@@ -987,6 +988,20 @@ namespace tut {
 	}
 
 	TEST_METHOD(42) {
+		// Disabling the sole process in a group, in case pool settings don't allow
+		// spawning another process, should fail.
+		pool->setMax(1);
+		ensureMinProcesses(1);
+
+		vector<ProcessPtr> processes = pool->getProcesses();
+		ensure_equals("(1)", processes.size(), 1u);
+
+		DisableResult result = pool->disableProcess(processes[0]->gupid);
+		ensure_equals("(2)", result, DR_ERROR);
+		ensure_equals("(3)", pool->getProcessCount(), 1u);
+	}
+
+	TEST_METHOD(43) {
 		// If there are no enabled processes in the group, then disabling should
 		// succeed after the new process has been spawned.
 		initPoolDebugging();
@@ -1031,7 +1046,7 @@ namespace tut {
 		}
 	}
 
-	TEST_METHOD(43) {
+	TEST_METHOD(44) {
 		// Suppose that a previous disable command triggered a new process spawn,
 		// and the spawn fails. Then any disabling processes should become enabled
 		// again, and the callbacks for the previous disable commands should be called.
@@ -1116,6 +1131,27 @@ namespace tut {
 	// TODO: Enabling a process that's disabling succeeds immediately. The disable
 	//       callbacks will be called with DR_CANCELED.
 	
+	TEST_METHOD(51) {
+		// If the number of processes is already at maximum, then disabling
+		// a process will cause that process to be disabled, without spawning
+		// a new process.
+		pool->setMax(2);
+		ensureMinProcesses(2);
+
+		vector<ProcessPtr> processes = pool->getProcesses();
+		ensure_equals(processes.size(), 2u);
+		DisableResult result = pool->disableProcess(processes[0]->gupid);
+		ensure_equals(result, DR_SUCCESS);
+
+		{
+			ScopedLock l(pool->syncher);
+			GroupPtr group = processes[0]->getGroup();
+			ensure_equals(group->enabledCount, 1);
+			ensure_equals(group->disablingCount, 0);
+			ensure_equals(group->disabledCount, 1);
+		}
+	}
+
 	
 	/*********** Other tests ***********/
 	
@@ -1587,6 +1623,87 @@ namespace tut {
 		}
 	}
 
+	TEST_METHOD(76) {
+		// No more than maxOutOfBandWorkInstances process will be performing
+		// out-of-band work at the same time.
+		TempDirCopy dir("stub/wsgi", "tmp.wsgi");
+		Options options = createOptions();
+		options.appRoot = "tmp.wsgi";
+		options.appType = "wsgi";
+		options.spawnMethod = "direct";
+		options.maxOutOfBandWorkInstances = 2;
+		initPoolDebugging();
+		debug->restarting = false;
+		debug->spawning = false;
+		debug->oobw = true;
+
+		// Spawn 3 processes and initiate 2 OOBW requests.
+		SessionPtr session1 = pool->get(options, &ticket);
+		SessionPtr session2 = pool->get(options, &ticket);
+		SessionPtr session3 = pool->get(options, &ticket);
+		session1->requestOOBW();
+		session1.reset();
+		session2->requestOOBW();
+		session2.reset();
+
+		// 2 OOBW requests eventually start.
+		debug->debugger->recv("OOBW request about to start");
+		debug->debugger->recv("OOBW request about to start");
+
+		// Request another OOBW, but this one is not initiated.
+		session3->requestOOBW();
+		session3.reset();
+		SHOULD_NEVER_HAPPEN(100,
+			result = debug->debugger->peek("OOBW request about to start") != NULL;
+		);
+
+		// Let one OOBW request finish. The third one should eventually
+		// start.
+		debug->messages->send("Proceed with OOBW request");
+		debug->debugger->recv("OOBW request about to start");
+
+		debug->messages->send("Proceed with OOBW request");
+		debug->messages->send("Proceed with OOBW request");
+		debug->debugger->recv("OOBW request finished");
+		debug->debugger->recv("OOBW request finished");
+		debug->debugger->recv("OOBW request finished");
+	}
+
+	TEST_METHOD(77) {
+		// If the getWaitlist already has maxRequestQueueSize items,
+		// then an exception is returned.
+		Options options = createOptions();
+		options.appGroupName = "test1";
+		options.maxRequestQueueSize = 3;
+		GroupPtr group = pool->findOrCreateGroup(options);
+		spawnerConfig->concurrency = 3;
+		initPoolDebugging();
+		pool->setMax(1);
+
+		for (int i = 0; i < 3; i++) {
+			pool->asyncGet(options, callback);
+		}
+		ensure_equals(number, 0);
+		{
+			LockGuard l(pool->syncher);
+			ensure_equals(group->getWaitlist.size(),
+				3u);
+		}
+
+		try {
+			pool->get(options, &ticket);
+			fail("Expected RequestQueueFullException");
+		} catch (const RequestQueueFullException &e) {
+			// OK
+		}
+
+		debug->messages->send("Proceed with spawn loop iteration 1");
+		debug->messages->send("Spawn loop done");
+		EVENTUALLY(5,
+			result = number == 3;
+		);
+	}
+
 	// TODO: Persistent connections.
 	// TODO: If one closes the session before it has reached EOF, and process's maximum concurrency
 	//       has already been reached, then the pool should ping the process so that it can detect
@@ -1595,7 +1712,7 @@ namespace tut {
 	
 	/*********** Test previously discovered bugs ***********/
 	
-	TEST_METHOD(76) {
+	TEST_METHOD(79) {
 		// Test detaching, then restarting. This should not violate any invariants.
 		TempDirCopy dir("stub/wsgi", "tmp.wsgi");
 		Options options = createOptions();