passenger 2.2.2 → 2.2.3

data/test/ruby/spawn_server_spec.rb

@@ -3,7 +3,7 @@ require 'support/config'
 require 'ruby/abstract_server_spec'
 
 shared_examples_for "a spawn server" do
-	it_should_behave_like "AbstractServer"
+	it_should_behave_like "an AbstractServer"
 	
 	it "raises an AbstractServer::ServerError if the server was killed" do
 		Process.kill('SIGABRT', @spawner.server_pid)

data/test/ruby/utils_spec.rb

@@ -2,6 +2,8 @@ require 'support/config'
 
 require 'tmpdir'
 require 'fileutils'
+require 'stringio'
+require 'phusion_passenger/message_channel'
 require 'phusion_passenger/utils'
 
 include PhusionPassenger
@@ -11,36 +13,204 @@ describe Utils do
 	
 	specify "#close_all_io_objects_for_fds closes all IO objects that are associated with the given file descriptors" do
 		filename = "#{Dir.tmpdir}/passenger_test.#{Process.pid}.txt"
-		puts "#{$$}: 1"
 		begin
-			pid = fork do
-				begin
-					puts "#{$$}: 2"
-					a, b = IO.pipe
-					puts "#{$$}: 3"
-					close_all_io_objects_for_fds([0, 1, 2])
-					puts "#{$$}: 4"
-					File.open(filename, "w") do |f|
-						f.write("#{a.closed?}, #{b.closed?}")
-					end
-					puts "#{$$}: 5"
-				rescue Exception => e
-					print_exception("utils_spec", e)
-				ensure
-					puts "#{$$}: 6"
-					exit!
+			pid = safe_fork('utils_spec') do
+				a, b = IO.pipe
+				close_all_io_objects_for_fds([0, 1, 2])
+				File.open(filename, "w") do |f|
+					f.write("#{a.closed?}, #{b.closed?}")
 				end
 			end
-			puts "#{$$}: 6"
 			Process.waitpid(pid) rescue nil
-			puts "#{$$}: 7"
 			File.read(filename).should == "true, true"
 		ensure
-			puts "#{$$}: 8"
 			File.unlink(filename) rescue nil
 		end
 	end
 	
+	describe "#report_app_init_status" do
+		it "reports normal errors, which #unmarshal_and_raise_errors raises" do
+			a, b = IO.pipe
+			begin
+				pid = safe_fork('utils_spec') do
+					a.close
+					report_app_init_status(MessageChannel.new(b)) do
+						raise RuntimeError, "hello world"
+					end
+				end
+				b.close
+				lambda { unmarshal_and_raise_errors(MessageChannel.new(a)) }.should raise_error(/hello world/)
+			ensure
+				a.close rescue nil
+				b.close rescue nil
+			end
+		end
+		
+		it "reports SystemExit errors, which #unmarshal_and_raise_errors raises" do
+			a, b = IO.pipe
+			begin
+				pid = safe_fork('utils_spec') do
+					a.close
+					report_app_init_status(MessageChannel.new(b)) do
+						exit
+					end
+				end
+				b.close
+				lambda { unmarshal_and_raise_errors(MessageChannel.new(a)) }.should raise_error(/exited during startup/)
+			ensure
+				a.close rescue nil
+				b.close rescue nil
+			end
+		end
+		
+		it "returns whether the block succeeded" do
+			channel = MessageChannel.new(StringIO.new)
+			success = report_app_init_status(channel) do
+				false
+			end
+			success.should be_true
+			
+			success = report_app_init_status(channel) do
+				raise StandardError, "hi"
+			end
+			success.should be_false
+		end
+		
+		it "reports all data written to stderr" do
+			a, b = IO.pipe
+			begin
+				pid = safe_fork('utils_spec') do
+					a.close
+					report_app_init_status(MessageChannel.new(b)) do
+						STDERR.puts "Something went wrong!"
+						exit
+					end
+				end
+				b.close
+				
+				begin
+					unmarshal_and_raise_errors(MessageChannel.new(a))
+					violated "No exception raised"
+				rescue AppInitError => e
+					e.stderr.should =~ /Something went wrong!/
+				end
+			ensure
+				a.close rescue nil
+				b.close rescue nil
+			end
+		end
+		
+		it "writes all buffered stderr data to the 'write_stderr_contents_to' argument if the block failed" do
+			stderr_buffer = StringIO.new
+			report_app_init_status(MessageChannel.new(StringIO.new), stderr_buffer) do
+				STDERR.puts "Something went wrong!"
+				raise StandardError, ":-("
+			end
+			
+			stderr_buffer.string.should =~ /Something went wrong!/
+		end
+		
+		it "writes all buffered stderr data to the 'write_stderr_contents_to' argument if the block succeeded" do
+			stderr_buffer = StringIO.new
+			report_app_init_status(MessageChannel.new(StringIO.new), stderr_buffer) do
+				STDERR.puts "Something went wrong!"
+			end
+			
+			stderr_buffer.string.should =~ /Something went wrong!/
+		end
+	end
+	
+	specify "#safe_fork with double_fork == false reseeds the pseudo-random number generator" do
+		a, b = IO.pipe
+		begin
+			pid = safe_fork do
+				b.puts(rand)
+			end
+			Process.waitpid(pid) rescue nil
+			pid = safe_fork do
+				b.puts(rand)
+			end
+			Process.waitpid(pid) rescue nil
+			
+			first_num = a.readline
+			second_num = a.readline
+			first_num.should_not == second_num
+		ensure
+			a.close rescue nil
+			b.close rescue nil
+		end
+	end
+	
+	specify "#safe_fork with double_fork == true reseeds the pseudo-random number generator" do
+		a, b = IO.pipe
+		begin
+			# Seed the pseudo-random number generator here
+			# so that it doesn't happen in the child processes.
+			srand
+			
+			safe_fork(self.class, true) do
+				b.puts(rand)
+			end
+			safe_fork(self.class, true) do
+				b.puts(rand)
+			end
+			
+			first_num = a.readline
+			second_num = a.readline
+			first_num.should_not == second_num
+		ensure
+			a.close rescue nil
+			b.close rescue nil
+		end
+	end
+	
+	describe "#unmarshal_and_raise_errors" do
+		before :each do
+			@a, @b = IO.pipe
+			@report_channel = MessageChannel.new(@a)
+			report_app_init_status(MessageChannel.new(@b)) do
+				raise StandardError, "Something went wrong!"
+			end
+		end
+		
+		after :each do
+			@a.close rescue nil
+			@b.close rescue nil
+		end
+		
+		it "prints the exception information to the 'print_exception' argument using #puts, if 'print_exception' responds to that" do
+			buffer = StringIO.new
+			lambda { unmarshal_and_raise_errors(@report_channel, buffer) }.should raise_error(AppInitError)
+			buffer.string.should =~ /Something went wrong!/
+			buffer.string.should =~ /utils\.rb/
+			buffer.string.should =~ /utils_spec\.rb/
+		end
+		
+		it "appends the exception information to the file pointed to by 'print_exception', if 'print_exception' responds to #to_str" do
+			begin
+				lambda { unmarshal_and_raise_errors(@report_channel, "exception.txt") }.should raise_error(AppInitError)
+				data = File.read('exception.txt')
+				data.should =~ /Something went wrong!/
+				data.should =~ /utils\.rb/
+				data.should =~ /utils_spec\.rb/
+			ensure
+				File.unlink('exception.txt') rescue nil
+			end
+		end
+	end
+	
+	specify "#to_boolean works" do
+		to_boolean(nil).should be_false
+		to_boolean(false).should be_false
+		to_boolean(true).should be_true
+		to_boolean(1).should be_true
+		to_boolean(0).should be_true
+		to_boolean("").should be_true
+		to_boolean("true").should be_true
+		to_boolean("false").should be_false
+		to_boolean("bla bla").should be_true
+	end
+	
 	describe "#passenger_tmpdir" do
 		before :each do
 			@old_passenger_tmpdir = Utils.passenger_tmpdir
@@ -71,8 +241,11 @@ describe Utils do
 			begin
 				File.directory?('utils_spec.tmp').should be_true
 			ensure
+				FileUtils.chmod_R(0777, 'utils_spec.tmp')
 				FileUtils.rm_rf('utils_spec.tmp')
 			end
 		end
 	end
+	
+	######################
 end

data/test/ruby/wsgi/application_spawner_spec.rb

@@ -5,6 +5,8 @@ require 'phusion_passenger/utils'
 require 'fileutils'
 require 'tempfile'
 
+include PhusionPassenger
+
 describe PhusionPassenger::WSGI::ApplicationSpawner do
 	include TestHelper
 	include PhusionPassenger::Utils
@@ -39,7 +41,7 @@ describe PhusionPassenger::WSGI::ApplicationSpawner do
 	
 	specify "the backend process deletes its socket upon termination" do
 		spawn(@stub.app_root).close
-		sleep 0.2 # Give it some time to terminate.
+		sleep 0.25 # Give it some time to terminate.
 		File.chmod(0700, "#{passenger_tmpdir}/backends")
 		Dir["#{passenger_tmpdir}/backends/wsgi_backend.*"].should be_empty
 	end

data/test/stub/apache2/httpd.conf.erb

@@ -23,6 +23,9 @@ Listen 127.0.0.1:<%= @port %>
 <% if !has_builtin_module?('mod_rewrite.c') && has_module?('mod_rewrite.so') %>
 	LoadModule rewrite_module "<%= modules_dir %>/mod_rewrite.so"
 <% end %>
+<% if !has_builtin_module?('mod_env.c') %>
+	LoadModule env_module "<%= modules_dir %>/mod_env.so"
+<% end %>
 LoadModule passenger_module "<%= @mod_passenger %>"
 
 PassengerRoot "<%= @passenger_root %>"

data/test/stub/rack/config.ru

@@ -1,4 +1,4 @@
 app = lambda do |env|
-    return [200, { "Content-Type" => "text/html" }, "hello <b>world</b>"]
+    [200, { "Content-Type" => "text/html" }, ["hello <b>world</b>"]]
 end
 run app

data/test/stub/rails_apps/mycook/app/controllers/welcome_controller.rb

@@ -40,6 +40,14 @@ class WelcomeController < ApplicationController
 	def show_id
 		render :text => params[:id]
 	end
+	
+	def environment
+		text = ""
+		ENV.each_pair do |key, value|
+			text << "#{key} = #{value}\n"
+		end
+		render :text => text
+	end
 
 	def request_uri
 		render :text => request.request_uri

data/test/support/Support.cpp

@@ -0,0 +1,84 @@
+#include <unistd.h>
+#include "Support.h"
+
+namespace Test {
+
+string
+readAll(int fd) {
+	string result;
+	char buf[1024 * 32];
+	ssize_t ret;
+	while (true) {
+		do {
+			ret = read(fd, buf, sizeof(buf));
+		} while (ret == -1 && errno == EINTR);
+		if (ret == 0) {
+			break;
+		} else if (ret == -1) {
+			throw SystemException("Cannot read from socket", errno);
+		} else {
+			result.append(buf, ret);
+		}
+	}
+	return result;
+}
+
+string
+replaceString(const string &str, const string &toFind, const string &replaceWith) {
+	string::size_type pos = str.find(toFind);
+	if (pos == string::npos) {
+		return str;
+	} else {
+		string result(str);
+		return result.replace(pos, toFind.size(), replaceWith);
+	}
+}
+
+void
+replaceStringInFile(const char *filename, const string &toFind, const string &replaceWith) {
+	FILE *f = fopen(filename, "r");
+	if (f == NULL) {
+		int e = errno;
+		string message = "Cannot open file '";
+		message.append(filename);
+		message.append("' for reading");
+		throw FileSystemException(message, e, filename);
+	}
+	string content(readAll(fileno(f)));
+	fclose(f);
+	
+	f = fopen(filename, "w");
+	if (f == NULL) {
+		int e = errno;
+		string message = "Cannot open file '";
+		message.append(filename);
+		message.append("' for writing");
+		throw FileSystemException(message, e, filename);
+	}
+	content = replaceString(content, toFind, replaceWith);
+	fwrite(content.data(), 1, content.size(), f);
+	fclose(f);
+}
+
+void
+touchFile(const char *filename, time_t timestamp) {
+	FILE *f = fopen(filename, "a");
+	if (f != NULL) {
+		fclose(f);
+	} else if (errno != EISDIR) {
+		int e = errno;
+		string message = "Cannot touch file '";
+		message.append(filename);
+		message.append("'");
+		throw FileSystemException(message, e, filename);
+	}
+	
+	if (timestamp != (time_t) -1) {
+		struct utimbuf times;
+		times.actime = timestamp;
+		times.modtime = timestamp;
+		utime(filename, &times);
+	}
+}
+
+} // namespace Test

data/test/support/Support.h

@@ -6,12 +6,49 @@
 #include <iostream>
 #include <string>
 #include <exception>
+#include <cstdio>
 #include <cerrno>
 #include <cstring>
+#include <utime.h>
+
+#include "Exceptions.h"
+#include "Utils.h"
 
 namespace Test {
 
 using namespace std;
+using namespace Passenger;
+
+/**
+ * Read all data from the given file descriptor until EOF.
+ *
+ * @throws SystemException
+ */
+string readAll(int fd);
+
+/**
+ * Look for 'toFind' inside 'str', replace it with 'replaceWith' and return the result.
+ * Only the first occurence of 'toFind' is replaced.
+ */
+string replaceString(const string &str, const string &toFind, const string &replaceWith);
+
+/**
+ * Look for 'toFind' inside the given file, replace it with 'replaceWith' and write
+ * the result back to the file. Only the first occurence of 'toFind' is replaced.
+ *
+ * @throws FileSystemException
+ */
+void replaceStringInFile(const char *filename, const string &toFind, const string &replaceWith);
+
+/**
+ * Touch the given file: create the file if it doesn't exist, update its
+ * timestamp if it does. If the <tt>timestamp</tt> argument is -1, then
+ * the current system time will be used, otherwise the given timestamp
+ * will be used.
+ *
+ * @throws FileSystemException
+ */
+void touchFile(const char *filename, time_t timestamp = (time_t) - 1);
 
 /**
  * Class which creates a temporary directory of the given name, and deletes
@@ -25,17 +62,38 @@ public:
 		this->name = name;
 		if (mkdir(name.c_str(), S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) != 0) {
 			int e = errno;
-			cerr << "Cannot create directory '" << name << "': " <<
-				strerror(e) <<" (" << e << ")" << endl;
-			throw exception();
+			string message = "Cannot create directory '";
+			message.append(name);
+			message.append("'");
+			throw FileSystemException(message, e, name);
 		}
 	}
 	
 	~TempDir() {
-		string command("rm -rf \"");
-		command.append(name);
-		command.append("\"");
-		system(command.c_str());
+		removeDirTree(name);
+	}
+};
+
+/**
+ * Creates a temporary copy of the given directory. This copy is deleted
+ * upon object destruction.
+ */
+class TempDirCopy {
+private:
+	string dir;
+public:
+	TempDirCopy(const string &source, const string &dest) {
+		dir = dest;
+		removeDirTree(dest);
+		
+		char command[1024];
+		snprintf(command, sizeof(command), "cp -pR \"%s\" \"%s\"",
+			source.c_str(), dest.c_str());
+		system(command);
+	}
+	
+	~TempDirCopy() {
+		removeDirTree(dir);
 	}
 };
 
@@ -50,7 +108,7 @@ public:
 		this->filename = filename;
 	}
 	
-	DeleteFileEventually() {
+	~DeleteFileEventually() {
 		unlink(filename.c_str());
 	}
 };