passenger 4.0.25 → 4.0.26

data/lib/phusion_passenger/standalone/runtime_locator.rb

@@ -84,9 +84,9 @@ class RuntimeLocator
 		if result = config["nginx_binary"]
 			@nginx_binary = result
 		elsif PhusionPassenger.natively_packaged? && @nginx_version == PhusionPassenger::PREFERRED_NGINX_VERSION
-			@nginx_binary = "#{PhusionPassenger.lib_dir}/nginx"
+			@nginx_binary = "#{PhusionPassenger.lib_dir}/PassengerWebHelper"
 		else
-			filename = "#{@runtime_dir}/#{version}/nginx-#{@nginx_version}-#{cxx_compat_id}/nginx"
+			filename = "#{@runtime_dir}/#{version}/webhelper-#{@nginx_version}-#{cxx_compat_id}/PassengerWebHelper"
 			if File.exist?(filename)
 				@nginx_binary = filename
 			else
@@ -133,7 +133,7 @@ class RuntimeLocator
 	# Returns the directory to which the Nginx binary may be installed,
 	# in case the RuntimeInstaller is to be invoked.
 	def nginx_binary_install_destination
-		return "#{@runtime_dir}/#{version}/nginx-#{@nginx_version}-#{cxx_compat_id}"
+		return "#{@runtime_dir}/#{version}/webhelper-#{@nginx_version}-#{cxx_compat_id}"
 	end
 
 private

data/lib/phusion_passenger/standalone/start_command.rb

@@ -202,6 +202,10 @@ private
 				wrap_desc("Specify the SSL key path")) do |val|
 				@options[:ssl_certificate_key] = File.expand_path(val)
 			end
+			opts.on("--ssl-port PORT", Integer,
+				wrap_desc("Listen for SSL on this port, while listening for HTTP on the normal port")) do |val|
+				@options[:ssl_port] = val
+			end
 			opts.on("--static-files-dir PATH", String,
 				wrap_desc("Specify the static files dir")) do |val|
 				@options[:static_files_dir] = File.expand_path(val)
@@ -431,7 +435,7 @@ private
 		if @options[:socket_file]
 			return @options[:socket_file]
 		else
-			if @options[:ssl]
+			if @options[:ssl] && !@options[:ssl_port]
 				scheme = "https"
 			else
 				scheme = "http"
@@ -700,6 +704,14 @@ private
 		end
 	end
 
+	def nginx_listen_address_with_ssl_port(options = @options)
+		if options[:socket_file]
+			return "unix:" + File.expand_path(options[:socket_file])
+		else
+			return "#{options[:address]}:#{options[:ssl_port]}"
+		end
+	end
+
 	def default_group_for(username)
 		user = Etc.getpwnam(username)
 		group = Etc.getgrgid(user.gid)

data/lib/phusion_passenger/utils/download.rb

@@ -0,0 +1,193 @@
+# encoding: utf-8
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2013 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 'phusion_passenger'
+require 'phusion_passenger/platform_info'
+require 'fileutils'
+require 'shellwords'
+
+module PhusionPassenger
+module Utils
+
+module Download
+	extend self    # Make methods available as class methods.
+
+	def self.included(klass)
+		# When included into another class, make sure that Utils
+		# methods are made private.
+		public_instance_methods(false).each do |method_name|
+			klass.send(:private, method_name)
+		end
+	end
+
+	# Downloads a file from the given URL and saves it to the given filename.
+	# Returns whether the download succeeded.
+	# 
+	# Options:
+	#
+	#   show_progress: whether to show download progress. Default: false.
+	#   logger: the logger to use. If not given, this function will log to STDERR.
+	#   cacert: a CA certificate file to use for verifying SSL websites.
+	#           The default is to use the download tool's down CA database.
+	#   use_cache: Whether to copy the file from the download cache, if available.
+	#              Default: false.
+	def download(url, output, options = {})
+		logger = options[:logger] || Logger.new(STDERR)
+
+		if options[:use_cache] && cache_dir = PhusionPassenger.download_cache_dir
+			basename = basename_from_url(url)
+			if File.exist?("#{cache_dir}/#{basename}")
+				logger.info "Copying #{basename} from #{cache_dir}..."
+				FileUtils.cp("#{cache_dir}/#{basename}", output)
+				return true
+			end
+		end
+
+		if PlatformInfo.find_command("curl")
+			return download_with_curl(logger, url, output, options)
+		elsif PlatformInfo.find_command("wget")
+			return download_with_wget(logger, url, output, options)
+		else
+			logger.error "Could not download #{url}: no download tool found (curl or wget required)"
+			return false
+		end
+	end
+
+private
+	def basename_from_url(url)
+		return url.sub(/.*\//, '')
+	end
+
+	def download_with_curl(logger, url, output, options)
+		command = ["curl", "-f", "-L", "-o", output]
+		if options[:show_progress]
+			command << "-#"
+		else
+			command << "-s"
+			command << "-S"
+		end
+		if options[:cacert]
+			command << "--cacert"
+			command << options[:cacert]
+		end
+		command << url
+		command_str = Shellwords.join(command)
+		logger.info("Invoking: #{command_str}")
+
+		if options[:show_progress]
+			# If curl errors out we don't want it to display 'curl: ' prefixes,
+			# so we parse its output.
+			begin
+				io = IO.popen("#{command_str} 2>&1", "r")
+			rescue SystemCallError => e
+				logger.error("Could not invoke curl: #{e}")
+				return false
+			end
+			begin
+				non_empty_line_encountered = false
+				while !io.eof?
+					# We split on "\r" because progress bar lines do not contain "\n".
+					data = io.gets("\r")
+					data = remove_curl_output_prefix(data)
+
+					# If an error occurs then the first few lines may be empty.
+					# Skip those.
+					if !non_empty_line_encountered && data =~ /\A\n+/
+						data.gsub!(/\A\n+/, '')
+					end
+
+					non_empty_line_encountered = true
+					STDERR.write(data)
+					STDERR.flush
+				end
+			ensure
+				io.close
+			end
+			result = $?.exitstatus == 0
+		else
+			begin
+				output = `#{command_str} 2>&1`
+			rescue SystemCallError => e
+				logger.error("Could not invoke curl: #{e}")
+				return false
+			end
+			result = $?.exitstatus == 0
+			if !result
+				output = remove_curl_output_prefix(output)
+				output.chomp!
+				logger.error("Could not download #{url}: #{output}")
+			end
+		end
+
+		return result
+	end
+
+	def remove_curl_output_prefix(line)
+		return line.gsub(/^curl: (\([0-9]+\) )?/, '')
+	end
+
+	def download_with_wget(logger, url, output, options)
+		command = ["wget", "--tries=3", "-O", output]
+		if !options[:show_progress]
+			command << "-nv"
+		end
+		if options[:cacert]
+			command << "--ca-certificate=#{options[:cacert]}"
+		end
+		command << url
+		command_str = Shellwords.join(command)
+		logger.info("Invoking: #{command_str}")
+
+		if options[:show_progress]
+			begin
+				result = system(*command)
+			rescue SystemCallError => e
+				logger.error("Could not invoke wget: #{e}")
+				return false
+			end
+			if !result
+				logger.error("Could not download #{url}: #{output}")
+			end
+		else
+			begin
+				output = `#{command_str} 2>&1`
+			rescue SystemCallError => e
+				logger.error("Could not invoke wget: #{e}")
+				return false
+			end
+			result = $?.exitstatus == 0
+			if !result
+				# Error output may begin with "<URL>:\n" which is redundant.
+				output.gsub!(/\A#{Regexp.escape url}:\n/, '')
+				output.chomp!
+				logger.error("Could not download #{url}: #{output}")
+			end
+		end
+
+		return result
+	end
+end
+
+end # module Utils
+end # module PhusionPassenger

data/resources/templates/standalone/config.erb

@@ -73,7 +73,16 @@ http {
     <% if @apps.size > 1 %>
     # Default server entry.
     server {
-        listen <%= nginx_listen_address %>;
+        <% if @options[:ssl] %>
+            <% if @options[:ssl_port] %>
+                listen <%= nginx_listen_address %>;
+                listen <%= nginx_listen_address_with_ssl_port %> ssl;
+            <% else %>
+                listen <%= nginx_listen_address %> ssl;
+            <% end %>
+        <% else %>
+            listen <%= nginx_listen_address %>;
+        <% end %>
         root '<%= PhusionPassenger.resources_dir %>/standalone_default_root';
     }
     <% end %>
@@ -87,7 +96,16 @@ http {
     
     <% for app in @apps %>
     server {
-        listen <%= nginx_listen_address(app) %> <%= "ssl" if app[:ssl] %>;
+        <% if app[:ssl] %>
+            <% if app[:ssl_port] %>
+                listen <%= nginx_listen_address(app) %>;
+                listen <%= nginx_listen_address_with_ssl_port(app) %> ssl;
+            <% else %>
+                listen <%= nginx_listen_address(app) %> ssl;
+            <% end %>
+        <% else %>
+            listen <%= nginx_listen_address(app) %>;
+        <% end %>
         server_name <%= app[:server_names].join(' ') %>;
         <% if app[:static_files_dir] %>
             root '<%= app[:static_files_dir] %>';
@@ -109,7 +127,6 @@ http {
             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 %>

data/test/ruby/standalone/runtime_installer_spec.rb

@@ -25,7 +25,7 @@ describe RuntimeInstaller do
 	let(:nginx_version) { PhusionPassenger::PREFERRED_NGINX_VERSION }
 	let(:cxx_compat_id) { PlatformInfo.cxx_binary_compatibility_id }
 	let(:support_binaries_url) { "#{binaries_url_root}/#{version}/support-#{cxx_compat_id}.tar.gz" }
-	let(:nginx_binary_url) { "#{binaries_url_root}/#{version}/nginx-#{nginx_version}-#{cxx_compat_id}.tar.gz" }
+	let(:nginx_binary_url) { "#{binaries_url_root}/#{version}/webhelper-#{nginx_version}-#{cxx_compat_id}.tar.gz" }
 	let(:nginx_source_url) { "http://nginx.org/download/nginx-#{nginx_version}.tar.gz" }
 
 	def create_installer(options = {})
@@ -64,11 +64,11 @@ describe RuntimeInstaller do
 	end
 
 	def create_dummy_nginx_binary
-		File.open("nginx", "w") do |f|
+		File.open("PassengerWebHelper", "w") do |f|
 			f.puts "#!/bin/bash"
 			f.puts "echo nginx version: 1.0.0"
 		end
-		File.chmod(0755, "nginx")
+		File.chmod(0755, "PassengerWebHelper")
 	end
 
 	def create_dummy_nginx_source
@@ -99,24 +99,24 @@ describe RuntimeInstaller do
 				:nginx_dir => "#{@temp_dir}/nginx",
 				:lib_dir => PhusionPassenger.lib_dir)
 
-			@installer.should_receive(:download).
-				and_return do |url, output, options|
-					url.should == nginx_binary_url
-					options[:use_cache].should be_true
-					create_tarball(output) do
-						create_dummy_nginx_binary
-					end
-					true
+		@installer.should_receive(:download).
+			and_return do |url, output, options|
+				url.should == nginx_binary_url
+				options[:use_cache].should be_true
+				create_tarball(output) do
+					create_dummy_nginx_binary
 				end
+				true
+			end
 
-			@installer.should_receive(:check_for_download_tool)
-			@installer.should_not_receive(:check_depdendencies)
-			@installer.should_not_receive(:compile_support_binaries)
-			@installer.should_not_receive(:download_and_extract_nginx_sources)
-			@installer.should_not_receive(:compile_nginx)
-			@installer.run
+		@installer.should_receive(:check_for_download_tool)
+		@installer.should_not_receive(:check_depdendencies)
+		@installer.should_not_receive(:compile_support_binaries)
+		@installer.should_not_receive(:download_and_extract_nginx_sources)
+		@installer.should_not_receive(:compile_nginx)
+		@installer.run
 
-			File.exist?("#{@temp_dir}/nginx/nginx").should be_true
+		File.exist?("#{@temp_dir}/nginx/PassengerWebHelper").should be_true
 	end
 
 	def test_building_nginx_binary
@@ -124,30 +124,30 @@ describe RuntimeInstaller do
 				:nginx_dir => "#{@temp_dir}/nginx",
 				:lib_dir   => PhusionPassenger.lib_dir)
 
-			@installer.should_receive(:download).twice.and_return do |url, output|
-				if url == nginx_binary_url
-					false
-				elsif url == nginx_source_url
-					create_tarball(output) do
-						create_dummy_nginx_source
-					end
-					true
-				else
-					raise "Unexpected download URL: #{url}"
+		@installer.should_receive(:download).twice.and_return do |url, output|
+			if url == nginx_binary_url
+				false
+			elsif url == nginx_source_url
+				create_tarball(output) do
+					create_dummy_nginx_source
 				end
+				true
+			else
+				raise "Unexpected download URL: #{url}"
 			end
+		end
 
-			@installer.should_receive(:check_for_download_tool)
-			@installer.should_receive(:check_dependencies).and_return(true)
-			@installer.should_not_receive(:compile_support_binaries)
-			@installer.should_receive(:strip_binary).
-				with(an_instance_of(String)).
-				and_return(true)
-			@installer.run
-
-			File.read("#{@temp_dir}/nginx/nginx").should == "ok\n"
-			File.read("#{@temp_dir}/configure.txt").should include(
-				"--add-module=#{PhusionPassenger.nginx_module_source_dir}")
+		@installer.should_receive(:check_for_download_tool)
+		@installer.should_receive(:check_dependencies).and_return(true)
+		@installer.should_not_receive(:compile_support_binaries)
+		@installer.should_receive(:strip_binary).
+			with(an_instance_of(String)).
+			and_return(true)
+		@installer.run
+
+		File.read("#{@temp_dir}/nginx/PassengerWebHelper").should == "ok\n"
+		File.read("#{@temp_dir}/configure.txt").should include(
+			"--add-module=#{PhusionPassenger.nginx_module_source_dir}")
 	end
 
 	context "when originally packaged" do
@@ -216,7 +216,7 @@ describe RuntimeInstaller do
 			@installer.run
 
 			File.exist?("#{@temp_dir}/support/agents/PassengerWatchdog").should be_true
-			File.exist?("#{@temp_dir}/nginx/nginx").should be_true
+			File.exist?("#{@temp_dir}/nginx/PassengerWebHelper").should be_true
 		end
 
 		it "builds the support binaries if it cannot be downloaded" do
@@ -304,39 +304,39 @@ describe RuntimeInstaller do
 				:nginx_dir => "#{@temp_dir}/nginx",
 				:lib_dir => PhusionPassenger.lib_dir)
 
-			@installer.should_receive(:download).
-				exactly(3).times.
-				and_return do |url, output, options|
-					if url == support_binaries_url
-						options[:use_cache].should be_true
-						create_tarball(output) do
-							create_dummy_support_binaries
-						end
-					elsif url == nginx_binary_url
-						options[:use_cache].should be_true
-						create_tarball(output) do
-							create_dummy_nginx_binary
-						end
-					elsif url == nginx_source_url
-						create_tarball(output) do
-							create_dummy_nginx_source
-						end
-					else
-						raise "Unexpected download URL: #{url}"
+		@installer.should_receive(:download).
+			exactly(3).times.
+			and_return do |url, output, options|
+				if url == support_binaries_url
+					options[:use_cache].should be_true
+					create_tarball(output) do
+						create_dummy_support_binaries
 					end
-					true
+				elsif url == nginx_binary_url
+					options[:use_cache].should be_true
+					create_tarball(output) do
+						create_dummy_nginx_binary
+					end
+				elsif url == nginx_source_url
+					create_tarball(output) do
+						create_dummy_nginx_source
+					end
+				else
+					raise "Unexpected download URL: #{url}"
 				end
+				true
+			end
 
-			@installer.should_receive(:check_for_download_tool)
-			@installer.should_receive(:check_support_binaries).and_return(false)
-			@installer.should_receive(:check_nginx_binary).and_return(false)
-			@installer.should_receive(:check_dependencies).and_return(true)
-			@installer.should_receive(:compile_support_binaries)
-			@installer.should_receive(:compile_nginx)
-			@installer.run
+		@installer.should_receive(:check_for_download_tool)
+		@installer.should_receive(:check_support_binaries).and_return(false)
+		@installer.should_receive(:check_nginx_binary).and_return(false)
+		@installer.should_receive(:check_dependencies).and_return(true)
+		@installer.should_receive(:compile_support_binaries)
+		@installer.should_receive(:compile_nginx)
+		@installer.run
 
-			Dir["#{@temp_dir}/nginx/*"].should be_empty
-			Dir["#{@temp_dir}/support/*"].should be_empty
+		Dir["#{@temp_dir}/nginx/*"].should be_empty
+		Dir["#{@temp_dir}/support/*"].should be_empty
 	end
 
 	it "aborts if the Nginx source tarball cannot be extracted" do