passenger 5.0.7 → 5.0.8

data/doc/users_guide_snippets/tips.txt

@@ -104,6 +104,44 @@ The most likely reason why your application is started as 'nobody' is probably b
 
 Whatever user your application runs as, it must have read access to the <<application_root,application root>>, and read/write access to the application's 'logs' directory.
 
+[[user_switching_rpm_caveats]]
+==== Red Hat and CentOS caveats
+
+NOTE: This information only applies if you installed Passenger through the RPM packages provided by Phusion. If you did not installed Passenger through the RPM packages provided by Phusion, then you can ignore this section.
+
+If you installed Passenger through Phusion's RPM packages, and you want to disable user switching, then you must also change <<PassengerInstanceRegistryDir,the location of the instance registry directory>>.
+
+This is because our RPMs configure the default instance registry directory to `/var/run/passenger-instreg`, which is only writable by root. If you disable user switching, then the Passenger processes will run as
+ifdef::apache[]
+  <<PassengerDefaultUser,PassengerDefaultUser>>,
+endif::[]
+ifdef::nginx[]
+  <<PassengerDefaultUser,passenger_default_user>>,
+endif::[]
+which (as long as it's not root) won't be able to write to that directory.
+
+Note that any alternative instance registry directory must have the proper SELinux context, allowing the web server to read and write to it. We recommend that you create a directory `/var/lib/passenger-instreg` and give it the label `var_run_t`:
+
+------------------------------------------
+sudo mkdir /var/lib/passenger-instreg
+sudo chcon -t var_run_t /var/lib/passenger-instreg
+------------------------------------------
+
+ifdef::apache[]
+Then, in your Apache config file:
+
+------------------------------------------
+PassengerInstanceRegistryDir /var/lib/passenger-instreg
+------------------------------------------
+endif::[]
+ifdef::nginx[]
+Then, in your Nginx config file:
+
+------------------------------------------
+passenger_instance_registry_dir /var/lib/passenger-instreg;
+------------------------------------------
+endif::[]
+
 [[finding_out_app_user]]
 ==== Finding out what user an application is running as
 

data/ext/apache2/Hooks.cpp

@@ -117,6 +117,20 @@ private:
 	private:
 		FileSystemException e;
 
+		#ifdef __linux__
+			bool selinuxIsEnforcing() const {
+				FILE *f = fopen("/sys/fs/selinux/enforce", "r");
+				if (f != NULL) {
+					char buf;
+					size_t ret = fread(&buf, 1, 1, f);
+					fclose(f);
+					return ret == 1 && buf == '1';
+				} else {
+					return false;
+				}
+			}
+		#endif
+
 	public:
 		ReportFileSystemError(const FileSystemException &ex): e(ex) { }
 
@@ -124,16 +138,28 @@ private:
 			r->status = 500;
 			ap_set_content_type(r, "text/html; charset=UTF-8");
 			ap_rputs("<h1>Passenger error #2</h1>\n", r);
-			ap_rputs("An error occurred while trying to access '", r);
+			ap_rputs("<p>An error occurred while trying to access '", r);
 			ap_rputs(ap_escape_html(r->pool, e.filename().c_str()), r);
 			ap_rputs("': ", r);
 			ap_rputs(ap_escape_html(r->pool, e.what()), r);
+			ap_rputs("</p>\n", r);
+
 			if (e.code() == EACCES || e.code() == EPERM) {
 				ap_rputs("<p>", r);
 				ap_rputs("Apache doesn't have read permissions to that file. ", r);
 				ap_rputs("Please fix the relevant file permissions.", r);
-				ap_rputs("</p>", r);
+				ap_rputs("</p>\n", r);
+				#ifdef __linux__
+					if (selinuxIsEnforcing()) {
+						ap_rputs("<p>", r);
+						ap_rputs("The permission problems may also be caused by SELinux restrictions. ", r);
+						ap_rputs("Please read " APACHE2_DOC_URL "#apache_selinux_permissions to learn ", r);
+						ap_rputs("how to fix SELinux permission issues. ", r);
+						ap_rputs("</p>", r);
+					}
+				#endif
 			}
+
 			P_ERROR("A filesystem exception occured.\n" <<
 				"  Message: " << e.what() << "\n" <<
 				"  Backtrace:\n" << e.backtrace());

data/ext/common/AgentsStarter.h

@@ -348,6 +348,12 @@ public:
 			.setInt ("log_level",       getLogLevel());
 		extraParams.addTo(params);
 
+		if (!params.getBool("user_switching", false, true)
+		 && !params.has("user"))
+		{
+			params.set("user", params.get("default_user", false, PASSENGER_DEFAULT_USER));
+		}
+
 		fds = createUnixSocketPair(__FILE__, __LINE__);
 		pid = syscalls::fork();
 		if (pid == 0) {

data/ext/common/ApplicationPool2/AppTypes.h

@@ -115,7 +115,7 @@ private:
 			TRACE_POINT();
 			throw RuntimeException("Not enough buffer space");
 		}
-		return getFileType(StaticString(buf, pos - buf), cstat, cstatMutex, throttleRate) != FT_NONEXISTANT;
+		return getFileType(StaticString(buf, pos - buf - 1), cstat, cstatMutex, throttleRate) != FT_NONEXISTANT;
 	}
 
 public:

data/ext/common/ApplicationPool2/Group.h

@@ -389,7 +389,7 @@ public:
 	RouteResult route(const Options &options) const {
 		if (OXT_LIKELY(enabledCount > 0)) {
 			if (options.stickySessionId == 0) {
-				Process *process = findProcessWithLowestBusyness(enabledProcesses);
+				Process *process = findEnabledProcessWithLowestBusyness();
 				if (process->canBeRoutedTo()) {
 					return RouteResult(process);
 				} else {
@@ -496,6 +496,29 @@ public:
 			return NULL;
 		}
 
+		int lowestBusyness = -1;
+		Process *leastBusyProcess = NULL;
+		ProcessList::const_iterator it;
+		ProcessList::const_iterator end = processes.end();
+		for (it = processes.begin(); it != end; it++) {
+			Process *process = (*it).get();
+			int busyness = process->busyness();
+			if (lowestBusyness == -1 || lowestBusyness > busyness) {
+				lowestBusyness = busyness;
+				leastBusyProcess = process;
+			}
+		}
+		return leastBusyProcess;
+	}
+
+	/**
+	 * Cache-optimized version of findProcessWithLowestBusyness() for the common case.
+	 */
+	Process *findEnabledProcessWithLowestBusyness() const {
+		if (enabledProcesses.empty()) {
+			return NULL;
+		}
+
 		int leastBusyProcessIndex = -1;
 		int lowestBusyness = 0;
 		unsigned int i, size = enabledProcessBusynessLevels.size();
@@ -1006,8 +1029,7 @@ public:
 			assert(m_spawning || restarting() || poolAtFullCapacity());
 
 			if (disablingCount > 0 && !restarting()) {
-				Process *process = findProcessWithLowestBusyness(
-					disablingProcesses);
+				Process *process = findProcessWithLowestBusyness(disablingProcesses);
 				assert(process != NULL);
 				if (!process->isTotallyBusy()) {
 					return newSession(process, newOptions.currentTime);

data/ext/common/ApplicationPool2/Options.h

@@ -459,7 +459,7 @@ public:
 		  environment(DEFAULT_APP_ENV, sizeof(DEFAULT_APP_ENV) - 1),
 		  baseURI("/", 1),
 		  spawnMethod(DEFAULT_SPAWN_METHOD, sizeof(DEFAULT_SPAWN_METHOD) - 1),
-		  defaultUser("nobody", sizeof("nobody") - 1),
+		  defaultUser(PASSENGER_DEFAULT_USER, sizeof(PASSENGER_DEFAULT_USER) - 1),
 		  ruby(DEFAULT_RUBY, sizeof(DEFAULT_RUBY) - 1),
 		  python(DEFAULT_PYTHON, sizeof(DEFAULT_PYTHON) - 1),
 		  nodejs(DEFAULT_NODEJS, sizeof(DEFAULT_NODEJS) - 1),

data/ext/common/ApplicationPool2/Pool/GarbageCollection.h

@@ -71,8 +71,7 @@ void checkWhetherProcessCanBeGarbageCollected(GarbageCollectorState &state,
 	assert(maxIdleTime > 0);
 	unsigned long long processGcTime = process->lastUsed + maxIdleTime;
 	if (process->sessions == 0
-	 && state.now >= processGcTime
-	 && (unsigned long) group->getProcessCount() > group->options.minProcesses)
+	 && state.now >= processGcTime)
 	{
 		if (output.capacity() == 0) {
 			output.reserve(group->enabledCount);
@@ -96,12 +95,16 @@ void garbageCollectProcessesInGroup(GarbageCollectorState &state,
 			processesToGc);
 	}
 
+	p_it  = processesToGc.begin();
 	p_end = processesToGc.end();
-	for (p_it = processesToGc.begin(); p_it != p_end; p_it++) {
+	while (p_it != p_end
+	 && (unsigned long) group->getProcessCount() > group->options.minProcesses)
+	{
 		ProcessPtr process = *p_it;
 		P_DEBUG("Garbage collect idle process: " << process->inspect() <<
 			", group=" << group->name);
 		group->detach(process, state.actions);
+		p_it++;
 	}
 }
 

data/ext/common/Constants.h

@@ -114,7 +114,9 @@
 
 	#define NGINX_DOC_URL "https://www.phusionpassenger.com/documentation/Users%20guide%20Nginx.html"
 
-	#define PASSENGER_VERSION "5.0.7"
+	#define PASSENGER_DEFAULT_USER "nobody"
+
+	#define PASSENGER_VERSION "5.0.8"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/ext/common/ServerKit/http_parser.cpp

@@ -2062,6 +2062,7 @@ http_parse_host_char(enum http_host_state s, const char ch) {
 
 static int
 http_parse_host(const char * buf, struct http_parser_url *u, int found_at) {
+  assert(u->field_set & (1 << UF_HOST));
   enum http_host_state s;
 
   const char *p;
@@ -2206,7 +2207,12 @@ http_parser_parse_url(const char *buf, size_t buflen, int is_connect,
 
   /* host must be present if there is a schema */
   /* parsing http:///toto will fail */
-  if ((u->field_set & ((1 << UF_SCHEMA) | (1 << UF_HOST))) != 0) {
+  if ((u->field_set & (1 << UF_SCHEMA)) &&
+      (u->field_set & (1 << UF_HOST)) == 0) {
+    return 1;
+  }
+
+  if (u->field_set & (1 << UF_HOST)) {
     if (http_parse_host(buf, u, found_at) != 0) {
       return 1;
     }

data/ext/common/agents/HelperAgent/Main.cpp

@@ -31,6 +31,9 @@
 	#include <sched.h>
 	#include <pthread.h>
 #endif
+#ifdef USE_SELINUX
+	#include <selinux/selinux.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -268,6 +271,47 @@ makeFileWorldReadableAndWritable(const string &path) {
 	} while (ret == -1 && errno == EINTR);
 }
 
+#ifdef USE_SELINUX
+	// Set next socket context to *:system_r:passenger_instance_httpd_socket_t
+	static void
+	setSelinuxSocketContext() {
+		security_context_t currentCon;
+		string newCon;
+		int e;
+
+		if (getcon(&currentCon) == -1) {
+			e = errno;
+			P_DEBUG("Unable to obtain SELinux context: " <<
+				strerror(e) << " (errno=" << e << ")");
+			return;
+		}
+
+		P_DEBUG("Current SELinux process context: " << currentCon);
+
+		if (strstr(currentCon, ":unconfined_r:unconfined_t:") == NULL) {
+			goto cleanup;
+		}
+
+		newCon = replaceString(currentCon,
+			":unconfined_r:unconfined_t:",
+			":object_r:passenger_instance_httpd_socket_t:");
+		if (setsockcreatecon((security_context_t) newCon.c_str()) == -1) {
+			e = errno;
+			P_WARN("Cannot set SELinux socket context to " << newCon <<
+				": " << strerror(e) << " (errno=" << e << ")");
+			goto cleanup;
+		}
+
+		cleanup:
+		freecon(currentCon);
+	}
+
+	static void
+	resetSelinuxSocketContext() {
+		setsockcreatecon(NULL);
+	}
+#endif
+
 static void
 startListening() {
 	TRACE_POINT();
@@ -275,9 +319,18 @@ startListening() {
 	vector<string> addresses = agentsOptions->getStrSet("server_addresses");
 	vector<string> adminAddresses = agentsOptions->getStrSet("server_admin_addresses", false);
 
+	#ifdef USE_SELINUX
+		// Set SELinux context on the first socket that we create
+		// so that the web server can access it.
+		setSelinuxSocketContext();
+	#endif
+
 	for (unsigned int i = 0; i < addresses.size(); i++) {
 		wo->serverFds[i] = createServer(addresses[i], 0, true,
 			__FILE__, __LINE__);
+		#ifdef USE_SELINUX
+			resetSelinuxSocketContext();
+		#endif
 		P_LOG_FILE_DESCRIPTOR_PURPOSE(wo->serverFds[i],
 			"Server address: " << addresses[i]);
 		if (getSocketAddressType(addresses[i]) == SAT_UNIX) {

data/ext/common/agents/HelperAgent/RequestHandler.h

@@ -150,6 +150,8 @@ private:
 	HashedStaticString HTTP_CONNECTION;
 	HashedStaticString HTTP_STATUS;
 	HashedStaticString HTTP_TRANSFER_ENCODING;
+	HashedStaticString HTTP_X_SENDFILE;
+	HashedStaticString HTTP_X_ACCEL_REDIRECT;
 
 	unsigned int threadNumber;
 	StaticString serverLogName;
@@ -215,6 +217,8 @@ public:
 		  HTTP_CONNECTION("connection"),
 		  HTTP_STATUS("status"),
 		  HTTP_TRANSFER_ENCODING("transfer-encoding"),
+		  HTTP_X_SENDFILE("x-sendfile"),
+		  HTTP_X_ACCEL_REDIRECT("x-accel-redirect"),
 
 		  threadNumber(_threadNumber),
 		  turboCaching(getTurboCachingInitialState(_agentsOptions))

data/ext/common/agents/HelperAgent/RequestHandler/ForwardResponse.cpp

@@ -335,6 +335,12 @@ onAppResponseBegin(Client *client, Request *req) {
 			req->wantKeepAlive = false;
 		}
 	}
+	if (resp->headers.lookup(HTTP_X_SENDFILE) != NULL
+	 || resp->headers.lookup(HTTP_X_ACCEL_REDIRECT) != NULL)
+	{
+		// https://github.com/phusion/passenger/issues/1498
+		resp->wantKeepAlive = false;
+	}
 
 	prepareAppResponseCaching(client, req);
 

data/ext/nginx/ngx_http_passenger_module.c

@@ -433,7 +433,7 @@ pre_config_init(ngx_conf_t *cf)
  */
 static ngx_int_t
 init_module(ngx_cycle_t *cycle) {
-    if (passenger_main_conf.root_dir.len != 0) {
+    if (passenger_main_conf.root_dir.len != 0 && !ngx_test_config) {
         if (first_start) {
             /* Ignore SIGPIPE now so that, if the helper server fails to start,
              * Nginx doesn't get killed by the default SIGPIPE handler upon
@@ -463,7 +463,7 @@ static ngx_int_t
 init_worker_process(ngx_cycle_t *cycle) {
     ngx_core_conf_t *core_conf;
 
-    if (passenger_main_conf.root_dir.len != 0) {
+    if (passenger_main_conf.root_dir.len != 0 && !ngx_test_config) {
         save_master_process_pid(cycle);
 
         core_conf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);

data/lib/phusion_passenger.rb

@@ -30,7 +30,7 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake ext/common/Constants.h' after changing this number.
-  VERSION_STRING = '5.0.7'
+  VERSION_STRING = '5.0.8'
 
   PREFERRED_NGINX_VERSION = '1.6.3'
   NGINX_SHA256_CHECKSUM = '0a98e95b366e4d6042f331e1fa4d70e18fd1e49d8993e589008e70e742b7e757'
@@ -149,7 +149,20 @@ module PhusionPassenger
   # method was used. Can be 'deb', 'rpm', 'homebrew', 'test'
   # or 'unknown'.
   def self.packaging_method
-    return @custom_packaging_method
+    return @packaging_method
+  end
+
+  def self.packaging_method_description
+    case packaging_method
+    when "deb"
+      "Debian packages"
+    when "rpm"
+      "RPM packages"
+    when "homebrew"
+      "Homebrew"
+    else
+      "gem or tarball"
+    end
   end
 
   # Whether the current Phusion Passenger installation is installed

data/lib/phusion_passenger/admin_tools/instance_registry.rb

@@ -29,38 +29,42 @@ module PhusionPassenger
   module AdminTools
 
     class InstanceRegistry
-      def initialize(path = nil)
-        @path = path || default_path
+      def initialize(paths = nil)
+        @paths = [paths || default_paths].flatten
       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)
+        @paths.each do |path|
+          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
         end
-        return instances
+
+        instances
       end
 
       def find_by_name(name, options = {})
@@ -78,13 +82,22 @@ module PhusionPassenger
       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
+      def default_paths
+        if result = string_env("PASSENGER_INSTANCE_REGISTRY_DIR")
+          return result
+        end
+
+        # The RPM packages configure Apache and Nginx to use /var/run/passenger-instreg
+        # as the instance registry dir. See https://github.com/phusion/passenger/issues/1475
+        [string_env("TMPDIR") || "/tmp", "/var/run/passenger-instreg"]
+      end
+
+      def string_env(name)
+        if (result = ENV[name]) && !result.empty?
+          result
+        else
+          nil
         end
-        return "/tmp"
       end
 
       def cleanup(path)