passenger 3.0.8 → 3.0.9

data/ext/common/LoggingAgent/LoggingServer.h

@@ -185,7 +185,8 @@ private:
 		virtual void dump(ostream &stream) const {
 			stream << "   Log file: file=" << filename << ", "
 				"opened=" << opened << ", "
-				"age=" << long(ev_now(server->getLoop()) - lastUsed) << "\n";
+				"lastUsed=" << long(ev_now(server->getLoop()) - lastUsed) << "s ago, "
+				"lastFlushed=" << long(ev_now(server->getLoop()) - lastFlushed) << "s ago\n";
 		}
 	};
 	
@@ -268,7 +269,8 @@ private:
 				"node=" << nodeName << ", "
 				"category=" << category << ", "
 				"opened=" << opened << ", "
-				"age=" << long(ev_now(server->getLoop()) - lastUsed) << ", "
+				"lastUsed=" << long(ev_now(server->getLoop()) - lastUsed) << "s ago, "
+				"lastFlushed=" << long(ev_now(server->getLoop()) - lastFlushed) << "s ago, "
 				"bufferSize=" << bufferSize <<
 				"\n";
 		}
@@ -1206,11 +1208,15 @@ public:
 		gid_t gid = GROUP_NOT_GIVEN,
 		const string &unionStationGatewayAddress = DEFAULT_UNION_STATION_GATEWAY_ADDRESS,
 		unsigned short unionStationGatewayPort = DEFAULT_UNION_STATION_GATEWAY_PORT,
-		const string &unionStationGatewayCert = "")
+		const string &unionStationGatewayCert = "",
+		const string &unionStationProxyAddress = "",
+		const string &unionStationProxyPort = "")
 		: EventedMessageServer(loop, fd, accountsDatabase),
 		  remoteSender(unionStationGatewayAddress,
 		               unionStationGatewayPort,
-		               unionStationGatewayCert),
+		               unionStationGatewayCert,
+		               unionStationProxyAddress,
+		               unionStationProxyPort),
 		  garbageCollectionTimer(loop),
 		  sinkFlushingTimer(loop),
 		  exitTimer(loop)

data/ext/common/LoggingAgent/Main.cpp

@@ -162,7 +162,9 @@ main(int argc, char *argv[]) {
 		false, DEFAULT_UNION_STATION_GATEWAY_ADDRESS);
 	int    unionStationGatewayPort = options.getInt("union_station_gateway_port",
 		false, DEFAULT_UNION_STATION_GATEWAY_PORT);
-	string unionStationGatewayCert = options.get("union_station_gateway_cert", false);
+	string unionStationGatewayCert  = options.get("union_station_gateway_cert", false);
+	string unionStationProxyAddress = options.get("union_station_proxy_address", false);
+	string unionStationProxyType    = options.get("union_station_proxy_type", false);
 	
 	curl_global_init(CURL_GLOBAL_ALL);
 	
@@ -251,7 +253,9 @@ main(int argc, char *argv[]) {
 			"u=rwx,g=rx,o=rx", GROUP_NOT_GIVEN,
 			unionStationGatewayAddress,
 			unionStationGatewayPort,
-			unionStationGatewayCert);
+			unionStationGatewayCert,
+			unionStationProxyAddress,
+			unionStationProxyType);
 		loggingServer = &server;
 		
 		
@@ -276,6 +280,7 @@ main(int argc, char *argv[]) {
 		
 		/********** Initialized! Enter main loop... **********/
 		
+		P_DEBUG("Logging agent online, listening at " << socketAddress);
 		ev_loop(eventLoop, 0);
 		return exitCode;
 	} catch (const tracable_exception &e) {

data/ext/common/LoggingAgent/RemoteSender.h

@@ -72,6 +72,8 @@ private:
 		string ip;
 		unsigned short port;
 		string certificate;
+		string proxyAddress;
+		string proxyType;
 		
 		CURL *curl;
 		struct curl_slist *headers;
@@ -103,6 +105,16 @@ private:
 			curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
 			curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curlDataReceived);
 			curl_easy_setopt(curl, CURLOPT_WRITEDATA, this);
+			if (!proxyAddress.empty()) {
+				curl_easy_setopt(curl, CURLOPT_PROXY, proxyAddress.c_str());
+				if (proxyType.empty() || proxyType == "http") {
+					curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);
+				} else if (proxyType == "socks5") {
+					curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);
+				} else {
+					throw RuntimeException("Only 'http' and 'socks5' proxies are supported.");
+				}
+			}
 			if (certificate.empty()) {
 				curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
 			} else {
@@ -129,10 +141,14 @@ private:
 		}
 		
 	public:
-		Server(const string &ip, const string &hostName, unsigned short port, const string &cert) {
+		Server(const string &ip, const string &hostName, unsigned short port, const string &cert,
+			const string &proxyAddress, const string &proxyType)
+		{
 			this->ip = ip;
 			this->port = port;
 			certificate = cert;
+			this->proxyAddress = proxyAddress;
+			this->proxyType = proxyType;
 			
 			hostHeader = "Host: " + hostName;
 			headers = NULL;
@@ -245,6 +261,8 @@ private:
 	string gatewayAddress;
 	unsigned short gatewayPort;
 	string certificate;
+	string proxyAddress;
+	string proxyType;
 	BlockingQueue<Item> queue;
 	oxt::thread *thr;
 	
@@ -298,7 +316,8 @@ private:
 		
 		servers.clear();
 		for (it = ips.begin(); it != ips.end(); it++) {
-			ServerPtr server(new Server(*it, gatewayAddress, gatewayPort, certificate));
+			ServerPtr server = make_shared<Server>(*it, gatewayAddress, gatewayPort,
+				certificate, proxyAddress, proxyType);
 			if (server->ping()) {
 				servers.push_back(server);
 			} else {
@@ -418,12 +437,15 @@ private:
 	}
 	
 public:
-	RemoteSender(const string &gatewayAddress, unsigned short gatewayPort, const string &certificate)
+	RemoteSender(const string &gatewayAddress, unsigned short gatewayPort, const string &certificate,
+		const string &proxyAddress, const string &proxyType)
 		: queue(1024)
 	{
 		this->gatewayAddress = gatewayAddress;
 		this->gatewayPort = gatewayPort;
 		this->certificate = certificate;
+		this->proxyAddress = proxyAddress;
+		this->proxyType = proxyType;
 		thr = new oxt::thread(
 			boost::bind(&RemoteSender::threadMain, this),
 			"RemoteSender thread",

data/ext/common/MessageChannel.h

@@ -53,6 +53,7 @@
 #include "Utils/Timer.h"
 #include "Utils/MemZeroGuard.h"
 #include "Utils/IOUtils.h"
+#include "Utils/MessageIO.h"
 
 namespace Passenger {
 
@@ -194,52 +195,9 @@ public:
 	 * @pre None of the message elements may contain a NUL character (<tt>'\\0'</tt>).
 	 * @see read(), write(const char *, ...)
 	 */
-	template<typename StringArrayType, typename StringArrayConstIteratorType>
+	template<typename StringArrayType>
 	void write(const StringArrayType &args) {
-		StringArrayConstIteratorType it;
-		string data;
-		uint16_t dataSize = 0;
-
-		for (it = args.begin(); it != args.end(); it++) {
-			dataSize += it->size() + 1;
-		}
-		data.reserve(dataSize + sizeof(dataSize));
-		dataSize = htons(dataSize);
-		data.append((const char *) &dataSize, sizeof(dataSize));
-		for (it = args.begin(); it != args.end(); it++) {
-			data.append(*it);
-			data.append(1, DELIMITER);
-		}
-		
-		writeExact(fd, data);
-	}
-	
-	/**
-	 * Send an array message, which consists of the given elements, over the underlying
-	 * file descriptor.
-	 *
-	 * @param args The message elements.
-	 * @throws SystemException An error occured while writing the data to the file descriptor.
-	 * @throws boost::thread_interrupted
-	 * @pre None of the message elements may contain a NUL character (<tt>'\\0'</tt>).
-	 * @see read(), write(const char *, ...)
-	 */
-	void write(const list<string> &args) {
-		write<list<string>, list<string>::const_iterator>(args);
-	}
-	
-	/**
-	 * Send an array message, which consists of the given elements, over the underlying
-	 * file descriptor.
-	 *
-	 * @param args The message elements.
-	 * @throws SystemException An error occured while writing the data to the file descriptor.
-	 * @throws boost::thread_interrupted
-	 * @pre None of the message elements may contain a NUL character (<tt>'\\0'</tt>).
-	 * @see read(), write(const char *, ...)
-	 */
-	void write(const vector<string> &args) {
-		write<vector<string>, vector<string>::const_iterator>(args);
+		writeArrayMessage(fd, args);
 	}
 	
 	/**
@@ -252,18 +210,7 @@ public:
 	 * @pre None of the message elements may contain a NUL character (<tt>'\\0'</tt>).
 	 */
 	void write(const char *name, va_list &ap) {
-		list<string> args;
-		args.push_back(name);
-		
-		while (true) {
-			const char *arg = va_arg(ap, const char *);
-			if (arg == NULL) {
-				break;
-			} else {
-				args.push_back(arg);
-			}
-		}
-		write(args);
+		writeArrayMessage(fd, name, ap);
 	}
 	
 	/**
@@ -297,8 +244,7 @@ public:
 	 * @throws boost::thread_interrupted
 	 */
 	void writeUint32(unsigned int value) {
-		uint32_t l = htonl(value);
-		writeExact(fd, &l, sizeof(uint32_t));
+		Passenger::writeUint32(fd, value);
 	}
 	
 	/**
@@ -314,7 +260,7 @@ public:
 	 * @see readScalar(), writeScalar(const char *, unsigned int)
 	 */
 	void writeScalar(const string &str) {
-		writeScalar(str.c_str(), str.size());
+		writeScalarMessage(fd, str);
 	}
 	
 	/**
@@ -332,8 +278,7 @@ public:
 	 * @see readScalar(), writeScalar(const string &)
 	 */
 	void writeScalar(const char *data, unsigned int size) {
-		writeUint32(size);
-		writeExact(fd, data, size);
+		writeScalarMessage(fd, data, size);
 	}
 	
 	/**
@@ -348,69 +293,10 @@ public:
 	 * @see readFileDescriptor()
 	 */
 	void writeFileDescriptor(int fileDescriptor, bool negotiate = true) {
-		// See message_channel.rb for more info about negotiation.
-		if (negotiate) {
-			vector<string> args;
-			
-			if (!read(args)) {
-				throw IOException("Unexpected end of stream encountered while pre-negotiating a file descriptor");
-			} else if (args.size() != 1 || args[0] != "pass IO") {
-				throw IOException("FD passing pre-negotiation message expected.");
-			}
-		}
-		
-		struct msghdr msg;
-		struct iovec vec;
-		char dummy[1];
-		#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
-			struct {
-				struct cmsghdr header;
-				int fd;
-			} control_data;
-		#else
-			char control_data[CMSG_SPACE(sizeof(int))];
-		#endif
-		struct cmsghdr *control_header;
-		int ret;
-	
-		msg.msg_name = NULL;
-		msg.msg_namelen = 0;
-	
-		/* Linux and Solaris require msg_iov to be non-NULL. */
-		dummy[0]       = '\0';
-		vec.iov_base   = dummy;
-		vec.iov_len    = sizeof(dummy);
-		msg.msg_iov    = &vec;
-		msg.msg_iovlen = 1;
-	
-		msg.msg_control    = (caddr_t) &control_data;
-		msg.msg_controllen = sizeof(control_data);
-		msg.msg_flags      = 0;
-		
-		control_header = CMSG_FIRSTHDR(&msg);
-		control_header->cmsg_level = SOL_SOCKET;
-		control_header->cmsg_type  = SCM_RIGHTS;
-		#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
-			control_header->cmsg_len = sizeof(control_data);
-			control_data.fd = fileDescriptor;
-		#else
-			control_header->cmsg_len = CMSG_LEN(sizeof(int));
-			memcpy(CMSG_DATA(control_header), &fileDescriptor, sizeof(int));
-		#endif
-		
-		ret = syscalls::sendmsg(fd, &msg, 0);
-		if (ret == -1) {
-			throw SystemException("Cannot send file descriptor with sendmsg()", errno);
-		}
-		
 		if (negotiate) {
-			vector<string> args;
-			
-			if (!read(args)) {
-				throw IOException("Unexpected end of stream encountered while post-negotiating a file descriptor");
-			} else if (args.size() != 1 || args[0] != "got IO") {
-				throw IOException("FD passing post-negotiation message expected.");
-			}
+			Passenger::writeFileDescriptorWithNegotiation(fd, fileDescriptor);
+		} else {
+			Passenger::writeFileDescriptor(fd, fileDescriptor);
 		}
 	}
 	
@@ -425,44 +311,12 @@ public:
 	 * @see write()
 	 */
 	bool read(vector<string> &args) {
-		uint16_t size;
-		int ret;
-		unsigned int alreadyRead = 0;
-		
-		do {
-			ret = syscalls::read(fd, (char *) &size + alreadyRead, sizeof(size) - alreadyRead);
-			if (ret == -1) {
-				throw SystemException("read() failed", errno);
-			} else if (ret == 0) {
-				return false;
-			}
-			alreadyRead += ret;
-		} while (alreadyRead < sizeof(size));
-		size = ntohs(size);
-		
-		string buffer;
-		args.clear();
-		buffer.reserve(size);
-		while (buffer.size() < size) {
-			char tmp[1024 * 8];
-			ret = syscalls::read(fd, tmp, min(size - buffer.size(), sizeof(tmp)));
-			if (ret == -1) {
-				throw SystemException("read() failed", errno);
-			} else if (ret == 0) {
-				return false;
-			}
-			buffer.append(tmp, ret);
-		}
-		
-		if (!buffer.empty()) {
-			string::size_type start = 0, pos;
-			const string &const_buffer(buffer);
-			while ((pos = const_buffer.find('\0', start)) != string::npos) {
-				args.push_back(const_buffer.substr(start, pos - start));
-				start = pos + 1;
-			}
+		try {
+			args = readArrayMessage(fd);
+			return true;
+		} catch (const EOFException &) {
+			return false;
 		}
-		return true;
 	}
 	
 	/**
@@ -610,74 +464,11 @@ public:
 	 * @throws boost::thread_interrupted
 	 */
 	int readFileDescriptor(bool negotiate = true) {
-		// See message_channel.rb for more info about negotiation.
-		if (negotiate) {
-			write("pass IO", NULL);
-		}
-		
-		struct msghdr msg;
-		struct iovec vec;
-		char dummy[1];
-		#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
-			// File descriptor passing macros (CMSG_*) seem to be broken
-			// on 64-bit MacOS X. This structure works around the problem.
-			struct {
-				struct cmsghdr header;
-				int fd;
-			} control_data;
-			#define EXPECTED_CMSG_LEN sizeof(control_data)
-		#else
-			char control_data[CMSG_SPACE(sizeof(int))];
-			#define EXPECTED_CMSG_LEN CMSG_LEN(sizeof(int))
-		#endif
-		struct cmsghdr *control_header;
-		int ret;
-
-		msg.msg_name    = NULL;
-		msg.msg_namelen = 0;
-		
-		dummy[0]       = '\0';
-		vec.iov_base   = dummy;
-		vec.iov_len    = sizeof(dummy);
-		msg.msg_iov    = &vec;
-		msg.msg_iovlen = 1;
-
-		msg.msg_control    = (caddr_t) &control_data;
-		msg.msg_controllen = sizeof(control_data);
-		msg.msg_flags      = 0;
-		
-		ret = syscalls::recvmsg(fd, &msg, 0);
-		if (ret == -1) {
-			throw SystemException("Cannot read file descriptor with recvmsg()", errno);
-		}
-		
-		control_header = CMSG_FIRSTHDR(&msg);
-		if (control_header == NULL) {
-			throw IOException("No valid file descriptor received.");
-		}
-		if (control_header->cmsg_len   != EXPECTED_CMSG_LEN
-		 || control_header->cmsg_level != SOL_SOCKET
-		 || control_header->cmsg_type  != SCM_RIGHTS) {
-			throw IOException("No valid file descriptor received.");
-		}
-		
-		#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
-			int fd = control_data.fd;
-		#else
-			int fd = *((int *) CMSG_DATA(control_header));
-		#endif
-		
 		if (negotiate) {
-			try {
-				write("got IO", NULL);
-			} catch (...) {
-				this_thread::disable_syscall_interruption dsi;
-				syscalls::close(fd);
-				throw;
-			}
+			Passenger::readFileDescriptorWithNegotiation(fd);
+		} else {
+			Passenger::readFileDescriptor(fd);
 		}
-		
-		return fd;
 	}
 	
 	/**