passenger 3.0.4 → 3.0.5

data/ext/common/LoggingAgent/RemoteSender.h

@@ -79,6 +79,9 @@ private:
 		string hostHeader;
 		string responseBody;
 		
+		string pingURL;
+		string sinkURL;
+		
 		void resetConnection() {
 			if (curl != NULL) {
 				#ifdef HAS_CURL_EASY_RESET
@@ -112,8 +115,7 @@ private:
 			responseBody.clear();
 		}
 		
-		void prepareRequest(const string &uri) {
-			string url = string("https://") + ip + ":" + toString(port) + uri;
+		void prepareRequest(const string &url) {
 			curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
 			responseBody.clear();
 		}
@@ -137,6 +139,13 @@ private:
 				throw IOException("Unable to create a CURL linked list");
 			}
 			
+			// Older libcurl versions didn't strdup() any option 
+			// strings so we need to keep these in memory.
+			pingURL = string("https://") + ip + ":" + toString(port) +
+				"/ping";
+			sinkURL = string("https://") + ip + ":" + toString(port) +
+				"/sink";
+			
 			curl = NULL;
 			resetConnection();
 		}
@@ -151,7 +160,7 @@ private:
 		bool ping() {
 			P_DEBUG("Pinging Union Station gateway " << ip << ":" << port);
 			ScopeGuard guard(boost::bind(&Server::resetConnection, this));
-			prepareRequest("/ping");
+			prepareRequest(pingURL);
 			
 			curl_easy_setopt(curl, CURLOPT_HTTPGET, 1);
 			if (curl_easy_perform(curl) != 0) {
@@ -172,7 +181,7 @@ private:
 		
 		bool send(const Item &item) {
 			ScopeGuard guard(boost::bind(&Server::resetConnection, this));
-			prepareRequest("/sink");
+			prepareRequest(sinkURL);
 			
 			struct curl_httppost *post = NULL;
 			struct curl_httppost *last = NULL;

data/ext/common/Utils/CachedFileStat.cpp

@@ -27,29 +27,23 @@
 
 extern "C" {
 
-struct CachedFileStat {
-	Passenger::CachedFileStat cfs;
-	
-	CachedFileStat(unsigned int maxSize): cfs(maxSize) { }
-};
-
-CachedFileStat *
+PassengerCachedFileStat *
 cached_file_stat_new(unsigned int max_size) {
-	return new CachedFileStat(max_size);
+	return (PassengerCachedFileStat *) new Passenger::CachedFileStat(max_size);
 }
 
 void
-cached_file_stat_free(CachedFileStat *cstat) {
-	delete cstat;
+cached_file_stat_free(PassengerCachedFileStat *cstat) {
+	delete (Passenger::CachedFileStat *) cstat;
 }
 
 int
-cached_file_stat_perform(CachedFileStat *cstat,
+cached_file_stat_perform(PassengerCachedFileStat *cstat,
                          const char *filename,
                          struct stat *buf,
                          unsigned int throttle_rate) {
 	try {
-		return cstat->cfs.stat(filename, buf, throttle_rate);
+		return ((Passenger::CachedFileStat *) cstat)->stat(filename, buf, throttle_rate);
 	} catch (const Passenger::TimeRetrievalException &e) {
 		errno = e.code();
 		return -1;

data/ext/common/Utils/CachedFileStat.h

@@ -34,11 +34,11 @@ extern "C" {
 
 /** C bindings for Passenger::CachedFileStat. */
 
-typedef struct CachedFileStat CachedFileStat;
+typedef void PassengerCachedFileStat;
 
-CachedFileStat *cached_file_stat_new(unsigned int max_size);
-void cached_file_stat_free(CachedFileStat *cstat);
-int  cached_file_stat_perform(CachedFileStat *cstat,
+PassengerCachedFileStat *cached_file_stat_new(unsigned int max_size);
+void cached_file_stat_free(PassengerCachedFileStat *cstat);
+int  cached_file_stat_perform(PassengerCachedFileStat *cstat,
                               const char *filename,
                               struct stat *buf,
                               unsigned int throttle_rate);

data/ext/common/libboost_oxt/aggregate.cpp

@@ -0,0 +1,10 @@
+
+				#ifndef _GNU_SOURCE
+					#define _GNU_SOURCE
+				#endif
+			#include "boost/src/pthread/once.cpp"
+#include "boost/src/pthread/thread.cpp"
+#include "oxt/backtrace.cpp"
+#include "oxt/system_calls.cpp"
+#include "oxt/thread.cpp"
+#include "oxt/tracable_exception.cpp"

data/ext/common/libpassenger_common/aggregate.cpp

@@ -0,0 +1,16 @@
+
+				#ifndef _GNU_SOURCE
+					#define _GNU_SOURCE
+				#endif
+			#include "common/AccountsDatabase.cpp"
+#include "common/AgentBase.cpp"
+#include "common/AgentsStarter.cpp"
+#include "common/Logging.cpp"
+#include "common/LoggingAgent/FilterSupport.cpp"
+#include "common/Utils.cpp"
+#include "common/Utils/Base64.cpp"
+#include "common/Utils/CachedFileStat.cpp"
+#include "common/Utils/IOUtils.cpp"
+#include "common/Utils/MD5.cpp"
+#include "common/Utils/StrIntUtils.cpp"
+#include "common/Utils/SystemTime.cpp"

data/ext/nginx/Configuration.c

@@ -36,6 +36,7 @@
 #include "Configuration.h"
 #include "ContentHandler.h"
 #include "../common/Constants.h"
+#include "../common/LoggingAgent/FilterSupport.h"
 
 
 static ngx_str_t headers_to_hide[] = {
@@ -268,7 +269,7 @@ passenger_create_loc_conf(ngx_conf_t *cf)
     conf->enabled = NGX_CONF_UNSET;
     conf->use_global_queue = NGX_CONF_UNSET;
     conf->friendly_error_pages = NGX_CONF_UNSET;
-    conf->analytics = NGX_CONF_UNSET;
+    conf->union_station_support = NGX_CONF_UNSET;
     conf->debugger = NGX_CONF_UNSET;
     conf->show_version_in_header = NGX_CONF_UNSET;
     conf->environment.data = NULL;
@@ -286,6 +287,7 @@ passenger_create_loc_conf(ngx_conf_t *cf)
     conf->app_rights.data = NULL;
     conf->app_rights.len = 0;
     conf->base_uris = NGX_CONF_UNSET_PTR;
+    conf->union_station_filters = NGX_CONF_UNSET_PTR;
     conf->min_instances = NGX_CONF_UNSET;
     conf->framework_spawner_idle_time = NGX_CONF_UNSET;
     conf->app_spawner_idle_time = NGX_CONF_UNSET;
@@ -357,6 +359,7 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_uint_t                    i, j;
     ngx_array_t                   hide_headers;
     ngx_str_t                    *prev_base_uris, *base_uri;
+    ngx_str_t                    *prev_union_station_filters, *union_station_filter;
     ngx_keyval_t                 *src;
     ngx_hash_key_t               *hk;
     ngx_hash_init_t               hash;
@@ -366,7 +369,7 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_value(conf->enabled, prev->enabled, 0);
     ngx_conf_merge_value(conf->use_global_queue, prev->use_global_queue, 1);
     ngx_conf_merge_value(conf->friendly_error_pages, prev->friendly_error_pages, 1);
-    ngx_conf_merge_value(conf->analytics, prev->analytics, 0);
+    ngx_conf_merge_value(conf->union_station_support, prev->union_station_support, 0);
     ngx_conf_merge_value(conf->debugger, prev->debugger, 0);
     ngx_conf_merge_value(conf->show_version_in_header, prev->show_version_in_header, 1);
     ngx_conf_merge_str_value(conf->environment, prev->environment, "production");
@@ -397,6 +400,24 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
             *base_uri = prev_base_uris[i];
         }
     }
+    
+    if (prev->union_station_filters != NGX_CONF_UNSET_PTR) {
+        if (conf->union_station_filters == NGX_CONF_UNSET_PTR) {
+            conf->union_station_filters = ngx_array_create(cf->pool, 4, sizeof(ngx_str_t));
+            if (conf->union_station_filters == NULL) {
+                return NGX_CONF_ERROR;
+            }
+        }
+        
+        prev_union_station_filters = (ngx_str_t *) prev->union_station_filters->elts;
+        for (i = 0; i < prev->union_station_filters->nelts; i++) {
+            union_station_filter = (ngx_str_t *) ngx_array_push(conf->union_station_filters);
+            if (union_station_filter == NULL) {
+                return NGX_CONF_ERROR;
+            }
+            *union_station_filter = prev_union_station_filters[i];
+        }
+    }
 
     /******************************/
     /******************************/
@@ -840,6 +861,51 @@ passenger_enabled(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     return NGX_CONF_OK;
 }
 
+char *
+union_station_filter(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char  *p = conf;
+
+    ngx_str_t         *value, *s;
+    ngx_array_t      **a;
+    ngx_conf_post_t   *post;
+    char              *message;
+
+    a = (ngx_array_t **) (p + cmd->offset);
+
+    if (*a == NGX_CONF_UNSET_PTR) {
+        *a = ngx_array_create(cf->pool, 4, sizeof(ngx_str_t));
+        if (*a == NULL) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    s = ngx_array_push(*a);
+    if (s == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    value = cf->args->elts;
+
+    *s = value[1];
+
+    if (cmd->post) {
+        post = cmd->post;
+        return post->post_handler(cf, post, s);
+    }
+
+    message = passenger_filter_validate((const char *) value[1].data, value[1].len);
+    if (message != NULL) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+            "Union Station filter syntax error: %s; ",
+            message);
+        free(message);
+        return NGX_CONF_ERROR;
+    }
+
+    return NGX_CONF_OK;
+}
+
 static char *
 set_null_terminated_keyval_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
@@ -1153,11 +1219,11 @@ const ngx_command_t passenger_commands[] = {
       offsetof(passenger_loc_conf_t, app_rights),
       NULL },
 
-    { ngx_string("passenger_analytics"),
+    { ngx_string("union_station_support"),
       NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
       ngx_conf_set_flag_slot,
       NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(passenger_loc_conf_t, analytics),
+      offsetof(passenger_loc_conf_t, union_station_support),
       NULL },
 
     { ngx_string("passenger_analytics_log_dir"),
@@ -1209,6 +1275,13 @@ const ngx_command_t passenger_commands[] = {
       offsetof(passenger_main_conf_t, union_station_gateway_cert),
       NULL },
 
+    { ngx_string("union_station_filter"),
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+      union_station_filter,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(passenger_loc_conf_t, union_station_filters),
+      NULL },
+
     { ngx_string("passenger_debugger"),
       NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
       ngx_conf_set_flag_slot,

data/ext/nginx/Configuration.h

@@ -42,7 +42,7 @@ typedef struct {
     ngx_flag_t   enabled;
     ngx_flag_t   use_global_queue;
     ngx_flag_t   friendly_error_pages;
-    ngx_flag_t   analytics;
+    ngx_flag_t   union_station_support;
     ngx_flag_t   debugger;
     ngx_flag_t   show_version_in_header;
     ngx_str_t    environment;
@@ -56,6 +56,7 @@ typedef struct {
     ngx_int_t    app_spawner_idle_time;
     ngx_str_t    union_station_key;
     ngx_array_t *base_uris;
+    ngx_array_t *union_station_filters;
 
     /************************************/
 } passenger_loc_conf_t;

data/ext/nginx/ContentHandler.c

@@ -322,6 +322,7 @@ create_request(ngx_http_request_t *r)
     const u_char                  *app_type_string;
     size_t                         app_type_string_len;
     ngx_str_t                      escaped_uri;
+    ngx_str_t                     *union_station_filters = NULL;
     u_char                         min_instances_string[12];
     u_char                         framework_spawner_idle_time_string[12];
     u_char                         app_spawner_idle_time_string[12];
@@ -429,8 +430,8 @@ create_request(ngx_http_request_t *r)
                                   slcf, use_global_queue);
     ANALYZE_BOOLEAN_CONFIG_LENGTH("PASSENGER_FRIENDLY_ERROR_PAGES",
                                   slcf, friendly_error_pages);
-    ANALYZE_BOOLEAN_CONFIG_LENGTH("PASSENGER_ANALYTICS",
-                                  slcf, analytics);
+    ANALYZE_BOOLEAN_CONFIG_LENGTH("UNION_STATION_SUPPORT",
+                                  slcf, union_station_support);
     ANALYZE_BOOLEAN_CONFIG_LENGTH("PASSENGER_DEBUGGER",
                                   slcf, debugger);
     ANALYZE_BOOLEAN_CONFIG_LENGTH("PASSENGER_SHOW_VERSION_IN_HEADER",
@@ -469,6 +470,19 @@ create_request(ngx_http_request_t *r)
     *end = '\0';
     len += sizeof("PASSENGER_APP_SPAWNER_IDLE_TIME") +
            ngx_strlen(app_spawner_idle_time_string) + 1;
+    
+    if (slcf->union_station_filters != NGX_CONF_UNSET_PTR && slcf->union_station_filters->nelts > 0) {
+        len += sizeof("UNION_STATION_FILTERS");
+        
+        union_station_filters = (ngx_str_t *) slcf->union_station_filters->elts;
+        for (i = 0; i < slcf->union_station_filters->nelts; i++) {
+            if (i != 0) {
+                len++;
+            }
+            len += union_station_filters[i].len;
+        }
+        len++;
+    }
 
 
     /***********************/
@@ -646,8 +660,8 @@ create_request(ngx_http_request_t *r)
                                   slcf, use_global_queue);
     SERIALIZE_BOOLEAN_CONFIG_DATA("PASSENGER_FRIENDLY_ERROR_PAGES",
                                   slcf, friendly_error_pages);
-    SERIALIZE_BOOLEAN_CONFIG_DATA("PASSENGER_ANALYTICS",
-                                  slcf, analytics);
+    SERIALIZE_BOOLEAN_CONFIG_DATA("UNION_STATION_SUPPORT",
+                                  slcf, union_station_support);
     SERIALIZE_BOOLEAN_CONFIG_DATA("PASSENGER_DEBUGGER",
                                   slcf, debugger);
     SERIALIZE_BOOLEAN_CONFIG_DATA("PASSENGER_SHOW_VERSION_IN_HEADER",
@@ -693,6 +707,20 @@ create_request(ngx_http_request_t *r)
     b->last = ngx_copy(b->last, app_spawner_idle_time_string,
                        ngx_strlen(app_spawner_idle_time_string) + 1);
 
+    if (slcf->union_station_filters != NGX_CONF_UNSET_PTR && slcf->union_station_filters->nelts > 0) {
+        b->last = ngx_copy(b->last, "UNION_STATION_FILTERS",
+                           sizeof("UNION_STATION_FILTERS"));
+        
+        for (i = 0; i < slcf->union_station_filters->nelts; i++) {
+            if (i != 0) {
+                b->last = ngx_copy(b->last, "\1", 1);
+            }
+            b->last = ngx_copy(b->last, union_station_filters[i].data,
+                               union_station_filters[i].len);
+        }
+        b->last = ngx_copy(b->last, "\0", 1);
+    }
+
     /***********************/
     /***********************/
 

data/ext/nginx/HelperAgent.cpp

@@ -437,7 +437,7 @@ private:
 		}
 		
 		try {
-			bool enableAnalytics = parser.getHeader("PASSENGER_ANALYTICS") == "true";
+			bool useUnionStation = parser.getHeader("UNION_STATION_SUPPORT") == "true";
 			StaticString appGroupName = parser.getHeader("PASSENGER_APP_GROUP_NAME");
 			PoolOptions options;
 			
@@ -471,11 +471,12 @@ private:
 			
 			UPDATE_TRACE_POINT();
 			AnalyticsLogPtr log;
-			if (enableAnalytics) {
+			if (useUnionStation) {
 				log = analyticsLogger->newTransaction(
 					options.getAppGroupName(),
 					"requests",
-					parser.getHeader("PASSENGER_UNION_STATION_KEY"));
+					parser.getHeader("PASSENGER_UNION_STATION_KEY"),
+					parser.getHeader("UNION_STATION_FILTERS"));
 				options.analytics = true;
 				options.log = log;
 			} else {
@@ -521,7 +522,7 @@ private:
 					session->getConnectPassword().size() + 1);
 				end += session->getConnectPassword().size() + 1;
 				
-				if (enableAnalytics) {
+				if (useUnionStation) {
 					memcpy(end, "PASSENGER_GROUP_NAME", sizeof("PASSENGER_GROUP_NAME"));
 					end += sizeof("PASSENGER_GROUP_NAME");
 					

data/ext/nginx/ngx_http_passenger_module.c

@@ -49,12 +49,12 @@
 #define HELPER_SERVER_PASSWORD_SIZE     64
 
 
-static int      first_start = 1;
-ngx_str_t       passenger_schema_string;
-ngx_str_t       passenger_placeholder_upstream_address;
-CachedFileStat *passenger_stat_cache;
-AgentsStarter  *passenger_agents_starter = NULL;
-ngx_cycle_t    *passenger_current_cycle;
+static int               first_start = 1;
+ngx_str_t                passenger_schema_string;
+ngx_str_t                passenger_placeholder_upstream_address;
+PassengerCachedFileStat *passenger_stat_cache;
+AgentsStarter           *passenger_agents_starter = NULL;
+ngx_cycle_t             *passenger_current_cycle;
 
 
 /*

data/ext/nginx/ngx_http_passenger_module.h

@@ -46,18 +46,18 @@ extern ngx_module_t ngx_http_passenger_module;
 /**
  * A static schema string to be assigned to Nginx 'upstream' strctures.
  */
-extern ngx_str_t    passenger_schema_string;
+extern ngx_str_t                passenger_schema_string;
 
-extern ngx_str_t    passenger_placeholder_upstream_address;
+extern ngx_str_t                passenger_placeholder_upstream_address;
 
 /**
  * A CachedFileStat object used for caching stat() calls.
  */
-extern CachedFileStat *passenger_stat_cache;
+extern PassengerCachedFileStat *passenger_stat_cache;
 
-extern AgentsStarter  *passenger_agents_starter;
+extern AgentsStarter           *passenger_agents_starter;
 
-extern ngx_cycle_t    *passenger_current_cycle;
+extern ngx_cycle_t             *passenger_current_cycle;
 
 #endif /* _PASSENGER_NGINX_MODULE_H_ */
 

data/lib/phusion_passenger.rb

@@ -25,7 +25,7 @@ module PhusionPassenger
 	###### Version numbers ######
 	
 	# Phusion Passenger version number. Don't forget to edit ext/common/Constants.h too.
-	VERSION_STRING = '3.0.4'
+	VERSION_STRING = '3.0.5'
 	
 	PREFERRED_NGINX_VERSION = '0.8.54'
 	PREFERRED_PCRE_VERSION  = '8.10'