RubyGems - passenger - Versions diffs - 3.0.2 → 3.0.3 - Mend

passenger 3.0.2 → 3.0.3

Potentially problematic release.

This version of passenger might be problematic. Click here for more details.

Files changed (220) hide show

@@ -0,0 +1,26 @@
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>Passenger Ruby API</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+</head>
+<frameset cols="20%,*">
+    <frameset rows="15%,55%,30%">
+        <frame src="fr_file_index.html"   title="Files" name="Files" />
+        <frame src="fr_class_index.html"  name="Classes" />
+        <frame src="fr_method_index.html" name="Methods" />
+    </frameset>
+    <frame  src="files/README.html" name="docwin" />
+    <noframes>
+          <body bgcolor="white">
+            Click <a href="html/index.html">here</a> for a non-frames
+            version of this page.
+          </body>
+    </noframes>
+</frameset>
+</html>

data/doc/rdoc/rdoc-style.css ADDED

@@ -0,0 +1,187 @@
+a {
+  color: #00F;
+  text-decoration: none;
+}
+a:hover {
+  color: #77F;
+  text-decoration: underline;
+}
+body, td, p {
+  font-family: "Bitstream Vera Sans", Verdana, Arial, Helvetica, sans-serif;
+  background: #FFF;
+  color: #000;
+  margin: 0px;
+  font-size: small;
+}
+p {
+  margin-top: 0.5em;
+  margin-bottom: 0.5em;
+}
+#content {
+  margin: 2em;
+  margin-left: 3.5em;
+  margin-right: 3.5em;
+}
+#description p {
+  margin-bottom: 0.5em;
+}
+.sectiontitle {
+  margin-top: 1em;
+  margin-bottom: 1em;
+  padding: 0.5em;
+  padding-left: 2em;
+  background: #005;
+  color: #FFF;
+  font-weight: bold;
+}
+.attr-rw {
+  padding-left: 1em;
+  padding-right: 1em;
+  text-align: center;
+  color: #055;
+}
+.attr-name {
+  font-weight: bold;
+}
+.attr-desc {
+}
+.attr-value {
+  font-family: monospace;
+}
+.file-title-prefix {
+  font-size: large;
+}
+.file-title {
+  font-size: large;
+  font-weight: bold;
+  background: #005;
+  color: #FFF;
+}
+.banner {
+  background: #005;
+  color: #FFF;
+  border: 1px solid black;
+  padding: 1em;
+}
+.banner td {
+  background: transparent;
+  color: #FFF;
+}
+h1 a, h2 a, .sectiontitle a, .banner a {
+  color: #FF0;
+}
+h1 a:hover, h2 a:hover, .sectiontitle a:hover, .banner a:hover {
+  color: #FF7;
+}
+.dyn-source {
+  display: none;
+  background: #fffde8;
+  color: #000;
+  border: #ffe0bb dotted 1px;
+  margin: 0.5em 2em 0.5em 2em;
+  padding: 0.5em;
+}
+.dyn-source .cmt {
+  color: #00F;
+  font-style: italic;
+}
+.dyn-source .kw {
+  color: #070;
+  font-weight: bold;
+}
+.method {
+  margin-left: 1em;
+  margin-right: 1em;
+  margin-bottom: 1em;
+}
+.description pre {
+  padding: 0.5em;
+  border: #ffe0bb dotted 1px;
+  background: #fffde8;
+}
+.method .title {
+  font-family: monospace;
+  font-size: large;
+  border-bottom: 1px dashed black;
+  margin-bottom: 0.3em;
+  padding-bottom: 0.1em;
+}
+.method .description, .method .sourcecode {
+  margin-left: 1em;
+}
+.description p, .sourcecode p {
+  margin-bottom: 0.5em;
+}
+.method .sourcecode p.source-link {
+  text-indent: 0em;
+  margin-top: 0.5em;
+}
+.method .aka {
+  margin-top: 0.3em;
+  margin-left: 1em;
+  font-style: italic;
+  text-indent: 2em;
+}
+h1 {
+  padding: 1em;
+  margin-left: -1.5em;
+  font-size: x-large;
+  font-weight: bold;
+  color: #FFF;
+  background: #007;
+}
+h2 {
+  padding: 0.5em 1em 0.5em 1em;
+  margin-left: -1.5em;
+  font-size: large;
+  font-weight: bold;
+  color: #FFF;
+  background: #009;
+}
+h3, h4, h5, h6 {
+  color: #220088;
+  border-bottom: #5522bb solid 1px;
+}
+.sourcecode > pre {
+  padding: 0.5em;
+  border: 1px dotted black;
+  background: #FFE;
+}
+dt {
+  font-weight: bold
+}
+dd {
+  margin-bottom: 0.7em;
+}

data/ext/apache2/Configuration.cpp CHANGED

@@ -36,6 +36,7 @@
 #include "Configuration.hpp"
 #include "Utils.h"
+#include <LoggingAgent/FilterSupport.h>
 /* The APR headers must come after the Passenger headers. See Hooks.cpp
  * to learn why.
@@ -159,6 +160,17 @@ destroy_config_struct(void *x) {
 	return APR_SUCCESS;
 }
+template<typename Collection, typename T> static bool
+contains(const Collection &coll, const T &item) {
+	typename Collection::const_iterator it;
+	for (it = coll.begin(); it != coll.end(); it++) {
+		if (*it == item) {
+			return true;
+		}
+	}
+	return false;
+}
 extern "C" {
@@ -237,6 +249,12 @@ passenger_config_merge_dir(apr_pool_t *p, void *basev, void *addv) {
 	MERGE_STR_CONFIG(restartDir);
 	MERGE_STR_CONFIG(uploadBufferDir);
 	MERGE_STRING_CONFIG(unionStationKey);
+	config->unionStationFilters = base->unionStationFilters;
+	for (vector<string>::const_iterator it = add->unionStationFilters.begin(); it != add->unionStationFilters.end(); it++) {
+		if (!contains(config->unionStationFilters, *it)) {
+			config->unionStationFilters.push_back(*it);
+		}
+	}
 	MERGE_THREEWAY_CONFIG(resolveSymlinksInDocRoot);
 	MERGE_THREEWAY_CONFIG(allowEncodedSlashes);
 	MERGE_THREEWAY_CONFIG(friendlyErrorPages);
@@ -309,6 +327,24 @@ cmd_passenger_spawn_method(cmd_parms *cmd, void *pcfg, const char *arg) {
 	return NULL;
 }
+static const char *
+cmd_union_station_filter(cmd_parms *cmd, void *pcfg, const char *arg) {
+	DirConfig *config = (DirConfig *) pcfg;
+	if (strlen(arg) == 0) {
+		return "UnionStationFilter may not be set to the empty string";
+	} else {
+		try {
+			FilterSupport::Filter f(arg);
+			config->unionStationFilters.push_back(arg);
+			return NULL;
+		} catch (const SyntaxError &e) {
+			string message = "Syntax error in Union Station filter: ";
+			message.append(e.what());
+			return strdup(message.c_str());
+		}
+	}
+}
 /*************************************************
  * Rails-specific settings
@@ -543,6 +579,11 @@ const command_rec passenger_commands[] = {
 		NULL,
 		OR_ALL,
 		"The Union Station key."),
+	AP_INIT_TAKE1("UnionStationFilter",
+		(Take1Func) cmd_union_station_filter,
+		NULL,
+		OR_ALL,
+		"A filter for Union Station data."),
 	AP_INIT_FLAG("PassengerResolveSymlinksInDocumentRoot",
 		(FlagFunc) cmd_passenger_resolve_symlinks_in_document_root,
 		NULL,

data/ext/apache2/Configuration.hpp CHANGED

@@ -185,6 +185,8 @@ struct DirConfig {
 	string unionStationKey;
+	vector<string> unionStationFilters;
 	/**
 	 * Whether Phusion Passenger should show friendly error pages.
 	 */
@@ -331,6 +333,23 @@ struct DirConfig {
 		return analytics == ENABLED;
 	}
+	string getUnionStationFilterString() const {
+		if (unionStationFilters.empty()) {
+			return string();
+		} else {
+			string result;
+			vector<string>::const_iterator it;
+			for (it = unionStationFilters.begin(); it != unionStationFilters.end(); it++) {
+				if (it != unionStationFilters.begin()) {
+					result.append(1, '\1');
+				}
+				result.append(*it);
+			}
+			return result;
+		}
+	}
 	/*************************************/
 };

data/ext/apache2/Hooks.cpp CHANGED

@@ -570,7 +570,8 @@ private:
 				log = analyticsLogger->newTransaction(
 					config->getAppGroupName(appRoot),
 					"requests",
-					config->unionStationKey);
+					config->unionStationKey,
+					config->getUnionStationFilterString());
 				log->message(string("URI: ") + r->uri);
 			} else {
 				log.reset(new AnalyticsLog());
@@ -874,6 +875,55 @@ private:
 		}
 	}
+	unsigned int
+	escapeUri(unsigned char *dst, const unsigned char *src, size_t size) {
+		static const char hex[] = "0123456789abcdef";
+			           /* " ", "#", "%", "?", %00-%1F, %7F-%FF */
+		static uint32_t escape[] = {
+		       0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+		                   /* ?>=< ;:98 7654 3210  /.-, +*)( '&%$ #"!  */
+		       0x80000029, /* 1000 0000 0000 0000  0000 0000 0010 1001 */
+		                   /* _^]\ [ZYX WVUT SRQP  ONML KJIH GFED CBA@ */
+		       0x00000000, /* 0000 0000 0000 0000  0000 0000 0000 0000 */
+		                   /*  ~}| {zyx wvut srqp  onml kjih gfed cba` */
+		       0x80000000, /* 1000 0000 0000 0000  0000 0000 0000 0000 */
+		       0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+		       0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+		       0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+		       0xffffffff  /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+		};
+		if (dst == NULL) {
+			/* find the number of the characters to be escaped */
+			unsigned int n = 0;
+			while (size > 0) {
+				if (escape[*src >> 5] & (1 << (*src & 0x1f))) {
+					n++;
+				}
+				src++;
+				size--;
+			}
+			return n;
+		}
+		while (size > 0) {
+			if (escape[*src >> 5] & (1 << (*src & 0x1f))) {
+				*dst++ = '%';
+				*dst++ = hex[*src >> 4];
+				*dst++ = hex[*src & 0xf];
+				src++;
+			} else {
+				*dst++ = *src++;
+			}
+			size--;
+		}
+		return 0;
+	}
 	/**
 	 * Convert an HTTP header name to a CGI environment name.
 	 */
@@ -928,6 +978,17 @@ private:
 			return APR_ENOMEM;
 		}
+		/*
+		 * Apache unescapes URI's before passing them to Phusion Passenger,
+		 * but backend processes expect the escaped version.
+		 * http://code.google.com/p/phusion-passenger/issues/detail?id=404
+		 */
+		size_t uriLen = strlen(r->uri);
+		unsigned int escaped = escapeUri(NULL, (const unsigned char *) r->uri, uriLen);
+		char escapedUri[uriLen + 2 * escaped + 1];
+		escapeUri((unsigned char *) escapedUri, (const unsigned char *) r->uri, uriLen);
+		escapedUri[uriLen + 2 * escaped] = '\0';
 		// Set standard CGI variables.
 		addHeader(headers, "SERVER_SOFTWARE", ap_get_server_version());
@@ -959,19 +1020,19 @@ private:
 		} else {
 			const char *request_uri;
 			if (r->args != NULL) {
-				request_uri = apr_pstrcat(r->pool, r->uri, "?", r->args, NULL);
+				request_uri = apr_pstrcat(r->pool, escapedUri, "?", r->args, NULL);
 			} else {
-				request_uri = r->uri;
+				request_uri = escapedUri;
 			}
 			addHeader(headers, "REQUEST_URI", request_uri);
 		}
 		if (strcmp(baseURI, "/") == 0) {
 			addHeader(headers, "SCRIPT_NAME", "");
-			addHeader(headers, "PATH_INFO", r->uri);
+			addHeader(headers, "PATH_INFO", escapedUri);
 		} else {
 			addHeader(headers, "SCRIPT_NAME", baseURI);
-			addHeader(headers, "PATH_INFO", r->uri + strlen(baseURI));
+			addHeader(headers, "PATH_INFO", escapedUri + strlen(baseURI));
 		}
 		// Set HTTP headers.
@@ -1001,6 +1062,7 @@ private:
 			addHeader(headers, "PASSENGER_GROUP_NAME",
 				config->getAppGroupName(appRoot).c_str());
 			addHeader(headers, "PASSENGER_TXN_ID", log->getTxnId().c_str());
+			addHeader(headers, "PASSENGER_UNION_STATION_KEY", config->unionStationKey.c_str());
 		}
 		// Now send the headers.

data/ext/common/Constants.h CHANGED

@@ -26,7 +26,7 @@
 #define _PASSENGER_CONSTANTS_H_
 /* Don't forget to update lib/phusion_passenger.rb too. */
-#define PASSENGER_VERSION "3.0.2"
+#define PASSENGER_VERSION "3.0.3"
 #define FEEDBACK_FD 3

data/ext/common/Exceptions.h CHANGED

@@ -343,6 +343,20 @@ public:
 	virtual const char *what() const throw() { return msg.c_str(); }
 };
+/**
+ * A parser detected a syntax error.
+ *
+ * @ingroup Exceptions
+ */
+class SyntaxError: public oxt::tracable_exception {
+private:
+	string msg;
+public:
+	SyntaxError(const string &message): msg(message) {}
+	virtual ~SyntaxError() throw() {}
+	virtual const char *what() const throw() { return msg.c_str(); }
+};
 } // namespace Passenger
 #endif /* _PASSENGER_EXCEPTIONS_H_ */