passenger 4.0.30 → 4.0.31

data/test/integration_tests/native_packaging_spec.rb

@@ -32,9 +32,13 @@ ENV['PATH'] = "/usr/bin:#{ENV['PATH']}"
 LOCATIONS_INI = ENV['LOCATIONS_INI']
 abort "Please set the LOCATIONS_INI environment variable to the right locations.ini" if !LOCATIONS_INI
 
+NATIVE_PACKAGING_METHOD = ENV['NATIVE_PACKAGING_METHOD']
+abort "Please set NATIVE_PACKAGING_METHOD to either 'deb' or 'rpm'" if !["deb", "rpm"].include?(NATIVE_PACKAGING_METHOD)
+
 source_root = File.expand_path("../..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
 require 'phusion_passenger'
+PhusionPassenger.locate_directories
 require 'tmpdir'
 require 'fileutils'
 require 'open-uri'
@@ -80,6 +84,10 @@ describe "A natively packaged Phusion Passenger" do
 		end
 	end
 
+	specify "locations.ini sets native_packaging_method to #{NATIVE_PACKAGING_METHOD}" do
+		File.read(LOCATIONS_INI).should =~ /^native_packaging_method=#{NATIVE_PACKAGING_METHOD}$/
+	end
+
 	specify "passenger-status is in #{SBINDIR}" do
 		which("passenger-status").should == "#{SBINDIR}/passenger-status"
 	end
@@ -191,17 +199,9 @@ describe "A natively packaged Phusion Passenger" do
 			which("passenger-install-apache2-module").should == "#{BINDIR}/passenger-install-apache2-module"
 		end
 
-		it "prints the configuration snippet and exits" do
-			output = capture_output("passenger-install-apache2-module --auto")
-			output.should =~ /Please edit your Apache configuration file/
-			output.should_not include("Compiling and installing Apache 2 module")
-			output.should_not include("rake apache2")
-		end
-
-		it "produces a correct configuration snippet" do
+		it "checks whether the Apache module is installed" do
 			output = capture_output("passenger-install-apache2-module --auto")
-			output.should include("LoadModule passenger_module #{APACHE2_MODULE_PATH}")
-			output.should include("PassengerRoot #{LOCATIONS_INI}")
+			output.should =~ /Apache module is correctly installed/
 		end
 	end
 

data/test/integration_tests/nginx_tests.rb

@@ -1,9 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
 require 'support/nginx_controller'
-require 'integration_tests/mycook_spec'
-require 'integration_tests/cgi_environment_spec'
-require 'integration_tests/hello_world_rack_spec'
-require 'integration_tests/hello_world_wsgi_spec'
+require 'integration_tests/shared/example_webapp_tests'
 
 describe "Phusion Passenger for Nginx" do
 	before :all do
@@ -11,11 +8,11 @@ describe "Phusion Passenger for Nginx" do
 			STDERR.puts "*** ERROR: You must set the 'nginx' config option in test/config.json."
 			exit!(1)
 		end
-		
+
 		check_hosts_configuration
 		FileUtils.mkdir_p("tmp.nginx")
 	end
-	
+
 	after :all do
 		begin
 			@nginx.stop if @nginx
@@ -23,7 +20,7 @@ describe "Phusion Passenger for Nginx" do
 			FileUtils.rm_rf("tmp.nginx")
 		end
 	end
-	
+
 	before :each do
 		File.open("test.log", "a") do |f|
 			# Make sure that all Nginx log output is prepended by the test description
@@ -42,189 +39,172 @@ describe "Phusion Passenger for Nginx" do
 		end
 	end
 
-	describe "MyCook(tm) beta running a root URI" do
+	describe "a Ruby app running on the root URI" do
 		before :all do
 			create_nginx_controller
 			@server = "http://1.passenger.test:#{@nginx.port}"
-			@base_uri = ""
-			@stub = ClassicRailsStub.new('rails_apps/2.3/mycook')
+			@stub = RackStub.new('rack')
 			@nginx.add_server do |server|
 				server[:server_name] = "1.passenger.test"
 				server[:root]        = "#{@stub.full_app_root}/public"
 			end
 			@nginx.start
 		end
-		
+
 		after :all do
 			@stub.destroy
 			@nginx.stop if @nginx
 		end
-		
+
 		before :each do
 			@stub.reset
 		end
-		
-		it_should_behave_like "MyCook(tm) beta"
-		include_examples "CGI environment variables compliance"
+
+		it_should_behave_like "an example web app"
 	end
-	
-	describe "MyCook(tm) beta running in a sub-URI" do
+
+	describe "a Ruby app running in a sub-URI" do
 		before :all do
-			@base_uri = "/mycook"
-			@stub = ClassicRailsStub.new('rails_apps/2.3/mycook')
-			FileUtils.rm_rf('tmp.webdir')
-			FileUtils.mkdir_p('tmp.webdir')
-			FileUtils.cp_r('stub/zsfa/.', 'tmp.webdir')
-			FileUtils.ln_sf(@stub.full_app_root + "/public", 'tmp.webdir/mycook')
-			
 			create_nginx_controller
+			@server = "http://1.passenger.test:#{@nginx.port}/subapp"
+			@stub = RackStub.new('rack')
 			@nginx.add_server do |server|
 				server[:server_name] = "1.passenger.test"
-				server[:root]        = File.expand_path("tmp.webdir")
-				server[:passenger_base_uri] = "/mycook"
+				server[:root]        = "#{PhusionPassenger.source_root}/test/stub"
+				server << %Q{
+					location ~ ^/subapp(/.*|$) {
+						alias #{@stub.full_app_root}/public$1;
+						passenger_base_uri /subapp;
+						passenger_document_root #{@stub.full_app_root}/public;
+						passenger_app_root #{@stub.full_app_root};
+						passenger_enabled on;
+					}
+				}
 			end
 			@nginx.start
 		end
-		
+
 		after :all do
-			FileUtils.rm_rf('tmp.webdir')
 			@stub.destroy
 			@nginx.stop if @nginx
 		end
-		
+
 		before :each do
-			@server = "http://1.passenger.test:#{@nginx.port}/mycook"
 			@stub.reset
 		end
 
-		it_should_behave_like "MyCook(tm) beta"
-		include_examples "CGI environment variables compliance"
-		
+		it_should_behave_like "an example web app"
+
 		it "does not interfere with the root website" do
 			@server = "http://1.passenger.test:#{@nginx.port}"
-			get('/').should =~ /Zed, you rock\!/
+			get('/').should == "This is the stub directory."
 		end
 	end
-	
-	describe "Rack application running in root URI" do
+
+	describe "a Python app running on the root URI" do
 		before :all do
 			create_nginx_controller
-			@server = "http://passenger.test:#{@nginx.port}"
-			@stub = RackStub.new('rack')
+			@server = "http://1.passenger.test:#{@nginx.port}"
+			@stub = PythonStub.new('wsgi')
 			@nginx.add_server do |server|
-				server[:server_name] = "passenger.test"
+				server[:server_name] = "1.passenger.test"
 				server[:root]        = "#{@stub.full_app_root}/public"
-				server[:passenger_max_requests] = 3
 			end
 			@nginx.start
 		end
-		
+
 		after :all do
 			@stub.destroy
 			@nginx.stop if @nginx
 		end
-		
+
 		before :each do
 			@stub.reset
 		end
-		
-		it_should_behave_like "HelloWorld Rack application"
+
+		it_should_behave_like "an example web app"
 	end
-	
-	describe "Rack application running in sub-URI" do
+
+	describe "a Python app running in a sub-URI" do
 		before :all do
-			FileUtils.rm_rf('tmp.webdir')
-			FileUtils.mkdir_p('tmp.webdir')
-			@stub = RackStub.new('rack')
 			create_nginx_controller
+			@server = "http://1.passenger.test:#{@nginx.port}/subapp"
+			@stub = PythonStub.new('wsgi')
 			@nginx.add_server do |server|
-				FileUtils.ln_s(@stub.full_app_root + "/public", 'tmp.webdir/rack')
-				server[:server_name] = "passenger.test"
-				server[:root]        = File.expand_path('tmp.webdir')
-				server[:passenger_base_uri] = "/rack"
+				server[:server_name] = "1.passenger.test"
+				server[:root]        = "#{PhusionPassenger.source_root}/test/stub"
+				server << %Q{
+					location ~ ^/subapp(/.*|$) {
+						alias #{@stub.full_app_root}/public$1;
+						passenger_base_uri /subapp;
+						passenger_app_root #{@stub.full_app_root};
+						passenger_document_root #{@stub.full_app_root}/public;
+						passenger_enabled on;
+					}
+				}
 			end
 			@nginx.start
-			@server = "http://passenger.test:#{@nginx.port}/rack"
 		end
-		
+
 		after :all do
 			@stub.destroy
-			FileUtils.rm_rf('tmp.webdir')
 			@nginx.stop if @nginx
 		end
-		
+
 		before :each do
 			@stub.reset
 		end
-		
-		it_should_behave_like "HelloWorld Rack application"
-	end
-	
-	describe "Rack application running within Rails directory structure" do
-		before :all do
-			create_nginx_controller
-			@server = "http://passenger.test:#{@nginx.port}"
-			@stub = ClassicRailsStub.new('rails_apps/2.3/mycook')
-			FileUtils.cp_r("stub/rack/.", @stub.app_root)
-			@nginx.add_server do |server|
-			server[:server_name] = "passenger.test"
-			server[:root]        = "#{@stub.full_app_root}/public"
-			end
-			@nginx.start
-		end
-		
-		after :all do
-			@stub.destroy
-			@nginx.stop if @nginx
-		end
-		
-		before :each do
-			@stub.reset
-			FileUtils.cp_r("stub/rack/.", @stub.app_root)
+
+		it_should_behave_like "an example web app"
+
+		it "does not interfere with the root website" do
+			@server = "http://1.passenger.test:#{@nginx.port}"
+			get('/').should == "This is the stub directory."
 		end
-		
-		it_should_behave_like "HelloWorld Rack application"
 	end
-	
+
 	describe "various features" do
 		before :all do
 			create_nginx_controller
-			@server = "http://passenger.test:#{@nginx.port}"
+			@server = "http://1.passenger.test:#{@nginx.port}"
 			@stub = RackStub.new('rack')
+			@nginx.set(:passenger_load_shell_envvars => 'off')
 			@nginx.add_server do |server|
-				server[:server_name] = "passenger.test"
+				server[:server_name] = "1.passenger.test"
 				server[:root]        = "#{@stub.full_app_root}/public"
 				server << %q{
 					location /crash_without_friendly_error_page {
+						passenger_enabled on;
 						passenger_friendly_error_pages off;
 					}
 				}
 			end
 			@nginx.add_server do |server|
-				server[:server_name] = "1.passenger.test"
+				server[:server_name] = "2.passenger.test"
 				server[:root]        = "#{@stub.full_app_root}/public"
 				server[:passenger_app_group_name] = "secondary"
 				server[:passenger_show_version_in_header] = "off"
 			end
 			@nginx.add_server do |server|
-				server[:server_name] = "2.passenger.test"
+				server[:server_name] = "3.passenger.test"
+				server[:passenger_app_group_name] = "tertiary"
 				server[:root]        = "#{@stub.full_app_root}/public"
 				server[:passenger_max_requests] = 3
 			end
 			@nginx.start
 		end
-		
+
 		after :all do
 			@stub.destroy
 			@nginx.stop if @nginx
 		end
-		
+
 		before :each do
 			@stub.reset
 			@error_page_signature = /<meta name="generator" content="Phusion Passenger">/
 			File.touch("#{@stub.app_root}/tmp/restart.txt", 1 + rand(100000))
 		end
-		
+
 		it "sets ENV['SERVER_SOFTWARE']" do
 			File.write("#{@stub.app_root}/config.ru", %q{
 				server_software = ENV['SERVER_SOFTWARE']
@@ -235,7 +215,7 @@ describe "Phusion Passenger for Nginx" do
 			})
 			get('/').should =~ /nginx/i
 		end
-		
+
 		it "displays a friendly error page if the application fails to spawn" do
 			File.write("#{@stub.app_root}/config.ru", %q{
 				raise "my error"
@@ -244,7 +224,7 @@ describe "Phusion Passenger for Nginx" do
 			data.should =~ /#{@error_page_signature}/
 			data.should =~ /my error/
 		end
-		
+
 		it "doesn't display a friendly error page if the application fails to spawn but passenger_friendly_error_pages is off" do
 			File.write("#{@stub.app_root}/config.ru", %q{
 				raise "my error"
@@ -253,29 +233,29 @@ describe "Phusion Passenger for Nginx" do
 			data.should_not =~ /#{@error_page_signature}/
 			data.should_not =~ /my error/
 		end
-		
+
 		it "appends an X-Powered-By header containing the Phusion Passenger version number" do
 			response = get_response('/')
 			response["X-Powered-By"].should include("Phusion Passenger")
 			response["X-Powered-By"].should include(PhusionPassenger::VERSION_STRING)
 		end
-		
+
 		it "omits the version number in X-Powered-By when passenger_show_version_in_header is off" do
-			@server = "http://1.passenger.test:#{@nginx.port}/"
+			@server = "http://2.passenger.test:#{@nginx.port}/"
 			response = get_response('/')
 			response["X-Powered-By"].should include("Phusion Passenger")
 			response["X-Powered-By"].should_not include(PhusionPassenger::VERSION_STRING)
 		end
-		
+
 		it "respawns the app after handling max_requests requests" do
-			@server = "http://2.passenger.test:#{@nginx.port}/"
+			@server = "http://3.passenger.test:#{@nginx.port}/"
 			pid = get("/pid")
 			get("/pid").should == pid
 			get("/pid").should == pid
 			get("/pid").should_not == pid
 		end
 	end
-	
+
 	describe "oob work" do
 		before :all do
 			create_nginx_controller
@@ -292,10 +272,10 @@ describe "Phusion Passenger for Nginx" do
 			@stub.destroy
 			@nginx.stop if @nginx
 		end
-		
+
 		before :each do
 			@stub.reset
-			
+
 			File.write("#{@stub.app_root}/config.ru", <<-RUBY)
 				PhusionPassenger.on_event(:oob_work) do
 					f = File.open("#{@stub.full_app_root}/oob_work.\#{$$}", 'w')
@@ -311,16 +291,16 @@ describe "Phusion Passenger for Nginx" do
 				end
 				run app
 			RUBY
-			
+
 			@nginx.start
 		end
-		
+
 		it "invokes oobw when requested by the app process" do
 			pid = get("/oobw")
 			sleep 0.5 # wait for oobw callback to be invoked
 			File.exists?("#{@stub.app_root}/oob_work.#{pid}").should == true
 		end
-		
+
 		it "does not block client while invoking oob work" do
 			get("/") # ensure there are spawned app processes
 			t0 = Time.now
@@ -329,9 +309,9 @@ describe "Phusion Passenger for Nginx" do
 			secs.should <= 0.1
 		end
 	end
-	
+
 	##### Helper methods #####
-	
+
 	def start_web_server_if_necessary
 		if !@nginx.running?
 			@nginx.start

data/test/integration_tests/shared/example_webapp_tests.rb

@@ -0,0 +1,246 @@
+require 'socket'
+require 'fileutils'
+
+shared_examples_for "an example web app" do
+	it "responds to GET requests for static asset" do
+		FileUtils.cp('stub/garbage1.dat', @stub.full_app_root + "/public/garbage1.dat")
+		get('/garbage1.dat').should == @stub.public_file('garbage1.dat')
+	end
+
+	it "supports page caching on file URIs" do
+		File.write(@stub.full_app_root + "/public/cached.html", "This is the cached version of /cached")
+		get('/cached').should == "This is the cached version of /cached"
+	end
+
+	it "supports page caching on directory URIs" do
+		File.write(@stub.full_app_root + "/public/cached.html", "This is the cached version of /cached")
+		Dir.mkdir(@stub.full_app_root + "/public/cached")
+		get('/cached').should == "This is the cached version of /cached"
+	end
+
+	it "supports page caching on root/base URIs" do
+		File.write(@stub.full_app_root + "/public/index.html", "This is index.html")
+		get('/').should == "This is index.html"
+	end
+
+	it "doesn't use page caching if the HTTP request is not GET" do
+		File.write(@stub.full_app_root + "/public/cached.html", "This is the cached version of /cached")
+		post('/cached').should == "This is the uncached version of /cached"
+	end
+
+	it "responds to GET requests on dynamic pages" do
+		get('/').should == "front page"
+	end
+
+	it "properly receives GET parameters" do
+		result = get('/parameters?first=one&second=two')
+		result.should == "Method: GET\n" +
+			"First: one\n" +
+			"Second: two\n"
+	end
+
+	it "responds to POST requests on dynamic pages" do
+		result = post('/parameters',
+			"first" => "one",
+			"second" => "two"
+		)
+		result.should == "Method: POST\n" +
+			"First: one\n" +
+			"Second: two\n"
+	end
+
+	it "properly handles file uploads" do
+		static_file = File.open('stub/garbage1.dat', 'rb')
+		params = {
+			'name1' => 'Kotonoha',
+			'name2' => 'Sekai',
+			'data'  => static_file
+		}
+		begin
+			# For some reason the WSGI stub app does not accept the multipart data generated by
+			# post(), so we use curl instead.
+			command = "curl --silent -F name1=Kotonoha -F name2=Sekai -F data=@stub/garbage1.dat #{@server}/upload_with_params"
+			response = IO.popen(command, "rb") do |io|
+				io.read
+			end
+			response.should ==
+				binary_string("name 1 = Kotonoha\n") <<
+				binary_string("name 2 = Sekai\n") <<
+				binary_string("data = ") << static_file.read
+		ensure
+			static_file.close
+		end
+	end
+
+	it "properly handles POST requests with 'chunked' transfer encoding" do
+		uri = URI.parse(@server)
+		socket = TCPSocket.new(uri.host, uri.port)
+		begin
+			socket.write("POST #{base_uri}/raw_upload_to_file HTTP/1.1\r\n")
+			socket.write("Host: #{uri.host}:#{uri.port}\r\n")
+			socket.write("Transfer-Encoding: chunked\r\n")
+			socket.write("Content-Type: text/plain\r\n")
+			socket.write("Connection: close\r\n")
+			socket.write("X-Output: output.txt\r\n")
+			socket.write("\r\n")
+
+			chunk = "foo=bar!"
+			socket.write("%X\r\n%s\r\n" % [chunk.size, chunk])
+			socket.write("0\r\n\r\n")
+			socket.flush
+
+			socket.read.should =~ /\r\nok\Z/
+		ensure
+			socket.close
+		end
+
+		File.read(@stub.full_app_root + "/output.txt").should == "foo=bar!"
+	end
+
+	it "supports responses with the 'chunked' transfer encoding" do
+		get('/chunked').should ==
+			"chunk1\n" +
+			"chunk2\n" +
+			"chunk3\n"
+	end
+
+	it "supports custom headers in responses" do
+		response = get_response('/extra_header')
+		response["X-Foo"].should == "Bar"
+	end
+
+	it "sets the 'Status' header in responses" do
+		response = get_response('/nonexistant')
+		response["Status"].should == "404 Not Found"
+	end
+
+	specify "REQUEST_URI contains the request URI including query string" do
+		cgi_envs = get('/env?foo=escaped%20string')
+		cgi_envs.should include("REQUEST_URI = #{base_uri}/env?foo=escaped%20string\n")
+	end
+
+	specify "REQUEST_URI contains the original escaped URI" do
+		cgi_envs = get('/env/%C3%BC?foo=escaped%20string')
+		cgi_envs.downcase.should include("request_uri = #{base_uri}/env/%c3%bc?foo=escaped%20string\n")
+	end
+
+	specify "PATH_INFO contains the request URI without the base URI and without the query string" do
+		cgi_envs = get('/env?foo=escaped%20string')
+		cgi_envs.should include("PATH_INFO = /env\n")
+	end
+
+	specify "PATH_INFO contains the original escaped URI" do
+		cgi_envs = get('/env/%C3%BC')
+		cgi_envs.downcase.should include("path_info = /env/%c3%bc\n")
+	end
+
+	specify "QUERY_STRING contains the query string" do
+		cgi_envs = get('/env?foo=escaped%20string')
+		cgi_envs.should include("QUERY_STRING = foo=escaped%20string\n")
+	end
+
+	specify "QUERY_STRING must be present even when there's no query string" do
+		cgi_envs = get('/env')
+		cgi_envs.should include("QUERY_STRING = \n")
+	end
+
+	specify "SCRIPT_NAME contains the base URI, or the empty string if the app is deployed on the root URI" do
+		cgi_envs = get('/env')
+		cgi_envs.should include("SCRIPT_NAME = #{base_uri}\n")
+	end
+
+	it "appends an X-Powered-By header containing the Phusion Passenger version number" do
+		response = get_response('/')
+		response["X-Powered-By"].should include("Phusion Passenger")
+		response["X-Powered-By"].should include(PhusionPassenger::VERSION_STRING)
+	end
+
+	it "buffers uploads" do
+		get('/') # Force spawning so that the timeout below is enough.
+
+		uri = URI.parse(@server)
+		socket = TCPSocket.new(uri.host, uri.port)
+		begin
+			upload_data = File.read("stub/upload_data.txt")
+			size_of_first_half = upload_data.size / 2
+
+			socket.write("POST #{base_uri}/ HTTP/1.1\r\n")
+			socket.write("Host: #{uri.host}:#{uri.port}\r\n")
+			socket.write("Content-Type: multipart/form-data\r\n")
+			socket.write("Content-Length: #{upload_data.size}\r\n")
+			socket.write("Connection: close\r\n")
+			socket.write("\r\n")
+
+			socket.write(upload_data[0 .. size_of_first_half - 1])
+			socket.flush
+
+			Timeout.timeout(10) do
+				get('/').should == "front page"
+			end
+
+			socket.write(upload_data[0 .. size_of_first_half])
+			socket.flush
+			socket.read.should =~ /front page/
+		ensure
+			socket.close rescue nil
+		end
+	end
+
+	it "buffers any number of concurrent uploads" do
+		get('/') # Force spawning so that the timeout below is enough.
+		sockets = []
+
+		uri = URI.parse(@server)
+		upload_data = File.read("stub/upload_data.txt")
+		size_of_first_half = upload_data.size / 2
+
+		begin
+			5.times do |i|
+				socket = TCPSocket.new(uri.host, uri.port)
+				sockets << socket
+				socket.write("POST #{base_uri}/ HTTP/1.1\r\n")
+				socket.write("Host: #{uri.host}:#{uri.port}\r\n")
+				socket.write("Content-Type: multipart/form-data\r\n")
+				socket.write("Content-Length: #{upload_data.size}\r\n")
+				socket.write("Connection: close\r\n")
+				socket.write("\r\n")
+				socket.write(upload_data[0 .. size_of_first_half - 1])
+				socket.flush
+			end
+			Timeout.timeout(10) do
+				get('/').should == "front page"
+			end
+			sockets.each do |socket|
+				socket.write(upload_data[size_of_first_half .. -1])
+				socket.flush
+				socket.read.should =~ /front page/
+			end
+		ensure
+			sockets.each do |socket|
+				socket.close rescue nil
+			end
+		end
+	end
+
+	it "supports restarting via restart.txt" do
+		get('/').should == "front page"
+		File.write(@stub.full_app_root + "/front_page.txt", "new front page")
+		File.touch(@stub.full_app_root + "/tmp/restart.txt", 2)
+		get('/').should == "new front page"
+	end
+
+	it "runs as an unprivileged user" do
+		get('/touch_file?file=file.txt').should == "ok"
+		stat = File.stat(@stub.full_app_root + "/file.txt")
+		stat.uid.should_not == 0
+		stat.gid.should_not == 0
+	end
+
+	############
+
+private
+	def base_uri
+		uri = URI.parse(@server)
+		return uri.path.sub(%r(/$), '')
+	end
+end