RubyGems - passenger - Versions diffs - 5.2.3 → 5.3.0 - Mend

passenger 5.2.3 → 5.3.0

Potentially problematic release.

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

Files changed (241) hide show

data/resources/templates/error_renderer/with_details/src/index.html.template ADDED

@@ -0,0 +1,22 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>{{TITLE}}</title>
+    <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,400i,700" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Lato:300,400,700" rel="stylesheet">
+    <style type="text/css">{{CSS|raw}}</style>
+  </head>
+  <body>
+    <script>
+      window.spec = {{SPEC|raw}};
+    </script>
+    <div id="root"></div>
+    <script>{{JS|raw}}</script>
+    <script>{{EXTENSION_JS|raw}}</script>
+    <script>
+      window.renderErrorPage();
+    </script>
+  </body>
+</html>

data/resources/templates/error_renderer/with_details/src/index.jsx ADDED

@@ -0,0 +1,23 @@
+/** @jsx h */
+import { render, h } from 'preact';
+import 'jquery';
+import './bootstrap/bootstrap.css';
+import './bootstrap/bootstrap.js';
+import PageMain from './PageMain.jsx';
+import './PageMain.css';
+window.errorPageExtensions = [];
+function initialize(pageMain) {
+  window.ErrorPage = pageMain;
+  for (var i = 0; i < window.errorPageExtensions.length; i++) {
+    window.errorPageExtensions[i]();
+  }
+}
+window.renderErrorPage = function() {
+  render(
+    <PageMain spec={window.spec} ref={ initialize } />,
+    document.getElementById('root')
+  );
+}

data/resources/templates/error_renderer/with_details/webpack.config.js ADDED

@@ -0,0 +1,47 @@
+const webpack = require('webpack');
+const path = require('path');
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
+const extractCSS = new ExtractTextPlugin('styles.css');
+module.exports = {
+  entry: ['./src/index.jsx'],
+  output: {
+    path: path.resolve(__dirname, 'dist'),
+    filename: 'bundle.js'
+  },
+  module: {
+    rules: [
+      {
+        test: /\.(js|jsx)$/,
+        use: {
+          loader: 'babel-loader',
+          options: {
+            presets: ['env', 'react']
+          }
+        }
+      },
+      {
+        test: /\.css$/,
+        use: extractCSS.extract({
+          use: {
+            loader: 'css-loader',
+            options: {
+              minimize: true
+            }
+          },
+          fallback: 'style-loader'
+        })
+      },
+    ]
+  },
+  plugins: [
+    extractCSS,
+    new UglifyJSPlugin(),
+    new webpack.ProvidePlugin({
+      $: 'jquery',
+      jQuery: 'jquery'
+    })
+  ]
+};

data/resources/templates/error_renderer/without_details/dist/bundle.js ADDED

@@ -0,0 +1 @@

+ !function(n){function t(e){if(r[e])return r[e].exports;var o=r[e]={i:e,l:!1,exports:{}};return n[e].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var r={};t.m=n,t.c=r,t.i=function(n){return n},t.d=function(n,r,e){t.o(n,r)||Object.defineProperty(n,r,{configurable:!1,enumerable:!0,get:e})},t.n=function(n){var r=n&&n.__esModule?function(){return n.default}:function(){return n};return t.d(r,"a",r),r},t.o=function(n,t){return Object.prototype.hasOwnProperty.call(n,t)},t.p="",t(t.s=2)}([function(n,t,r){"use strict";r(1)},function(n,t){},function(n,t,r){n.exports=r(0)}]);

data/resources/templates/error_renderer/without_details/dist/styles.css ADDED

@@ -0,0 +1 @@

+ body{font-family:Arial,Sans-Serif;font-size:13px;color:#222;margin:0}.column{max-width:1000px;margin-left:auto;margin-right:auto;text-align:center}header{border-bottom:1px solid #e3e3e3;margin-bottom:45px}footer,header{margin-top:50px}footer{font-size:14px;color:#7f7f7f;border-top:1px solid #e3e3e3;padding:40px 0}h1{font-size:30px;margin-top:30px;margin-bottom:10px}.subtitle{margin-top:0;margin-bottom:110px;font-size:20px}#operator_info{display:none}#show_operator_info{font-size:17px;font-weight:400}.left{text-align:left;padding:8px}h3{margin-top:30px;margin-bottom:10px;font-size:23px}ul{padding-left:16px}a,li{color:#1781bf;text-decoration:none}.error,a,li{font-weight:700}.error{background:#e6f3fc;border-radius:5px;padding:7px 12px}.error.block{display:block}.bold{font-weight:700!important}pre{margin:0;overflow-x:auto;white-space:pre-wrap;word-break:break-all}dt{margin-top:16px;font-weight:700}dd{margin-left:0}.plain{color:inherit;font-weight:inherit}#content{overflow-y:scroll;height:800px}

data/resources/templates/{undisclosed_error.html.template → error_renderer/without_details/src/index.html.template} RENAMED

@@ -1,12 +1,10 @@
-<!DOCTYPE html>
-<html>
+<!doctype html>
+<html lang="en">
   <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>We're sorry, but something went wrong: {{TITLE}}</title>
-    <style type="text/css">
-      {{CSS|raw}}
-    </style>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta name="generator" content="Phusion Passenger">
+    <style type="text/css">{{CSS|raw}}</style>
   </head>
   <body>
     <header>
@@ -20,13 +18,11 @@
       <a id="show_operator_info" href="#" onclick="showOperatorInfo()">Technical details for the administrator of this website</a>
       <div id="operator_info">
         <div class="left">
-          <h3>Error:</h3>
-          <span class="error">{{TITLE}}</span>
           <h3>Error ID:</h3>
           <span class="error">{{ERROR_ID}}</span>
           <h3>Details:</h3>
           <p>Web application could not be started by the {{PROGRAM_NAME}} application server.</p>
-          <p class="bold">Please read <a href="https://www.phusionpassenger.com/library/admin/log_file/" class="plain">the Passenger log file</a> (search for the Error ID) to find the details of the error.</p>
+          <p class="bold">Please read <a href="https://www.phusionpassenger.com/library/admin/log_file/" class="plain">the {{SHORT_PROGRAM_NAME}} log file</a> (search for the Error ID) to find the details of the error.</p>
           <p>You can also get a detailed report to appear directly on this page, but for security reasons it is only provided if {{PROGRAM_NAME}} is run with <i>environment</i> set to <i>development</i> and/or with the <i>friendly error pages</i> option set to <i>on</i>.</p>
           <p>For more information about configuring environment and friendly error pages, see:</p>
           <ul>
@@ -44,7 +40,7 @@
        text. Thank you.
        -->
       <div class="column">
-        This website is powered by <b>Passenger</b>&reg;, a rock-solid, feature-rich web application server that integrates with Apache and Nginx built by <b>Phusion</b>&reg;.
+        This website is powered by <a href="{{PROGRAM_WEBSITE}}"><b>{{PROGRAM_NAME}}</b></a>&reg;, the smart application server built by <b>{{PROGRAM_AUTHOR}}</b>&reg;.
       </div>
     </footer>
     <script>

data/resources/templates/error_renderer/without_details/src/index.js ADDED

	@@ -0,0 +1 @@
1	+ import './main.css';

data/resources/templates/{error_layout.css → error_renderer/without_details/src/main.css} RENAMED

@@ -5,7 +5,7 @@ body {
     margin: 0;
 }
 .column {
-    width: 1000px;
+    max-width: 1000px;
     margin-left: auto;
     margin-right: auto;
     text-align: center;
@@ -62,6 +62,9 @@ a, li {
     border-radius: 5px;
     padding: 7px 12px;
 }
+.error.block {
+    display: block;
+}
 .bold {
     font-weight: bold !important;
 }
@@ -82,7 +85,7 @@ dd {
     color: inherit;
     font-weight: inherit;
 }
 #content {
     overflow-y: scroll;
     height: 800px;

data/resources/templates/error_renderer/without_details/webpack.config.js ADDED

@@ -0,0 +1,42 @@
+const path = require('path');
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
+const extractCSS = new ExtractTextPlugin('styles.css');
+module.exports = {
+  entry: ['./src/index.js'],
+  output: {
+    path: path.resolve(__dirname, 'dist'),
+    filename: 'bundle.js'
+  },
+  module: {
+    rules: [
+      {
+        test: /\.(js|jsx)$/,
+        use: {
+          loader: 'babel-loader',
+          options: {
+            presets: ['env', 'react']
+          }
+        }
+      },
+      {
+        test: /\.css$/,
+        use: extractCSS.extract({
+          use: {
+            loader: 'css-loader',
+            options: {
+              minimize: true
+            }
+          },
+          fallback: 'style-loader'
+        })
+      },
+    ]
+  },
+  plugins: [
+    extractCSS,
+    new UglifyJSPlugin()
+  ]
+};

data/src/agent/AgentMain.cpp CHANGED

@@ -34,7 +34,7 @@ int watchdogMain(int argc, char *argv[]);
 int coreMain(int argc, char *argv[]);
 int systemMetricsMain(int argc, char *argv[]);
 int tempDirToucherMain(int argc, char *argv[]);
-int spawnPreparerMain(int argc, char *argv[]);
+int spawnEnvSetupperMain(int argc, char *argv[]);
 int execHelperMain(int argc, char *argv[]);
 static bool
@@ -86,8 +86,8 @@ dispatchSubcommand(int argc, char *argv[]) {
 		exit(systemMetricsMain(argc, argv));
 	} else if (strcmp(argv[1], "temp-dir-toucher") == 0) {
 		exit(tempDirToucherMain(argc, argv));
-	} else if (strcmp(argv[1], "spawn-preparer") == 0) {
-		exit(spawnPreparerMain(argc, argv));
+	} else if (strcmp(argv[1], "spawn-env-setupper") == 0) {
+		exit(spawnEnvSetupperMain(argc, argv));
 	} else if (strcmp(argv[1], "exec-helper") == 0) {
 		exit(execHelperMain(argc, argv));
 	} else if (strcmp(argv[1], "test-binary") == 0) {

data/src/agent/Core/ApplicationPool/BasicProcessInfo.h CHANGED

@@ -35,6 +35,7 @@
 #include <Exceptions.h>
 #include <Utils/JsonUtils.h>
 #include <Core/ApplicationPool/BasicGroupInfo.h>
+#include <Core/SpawningKit/Result.h>
 namespace Passenger {
 namespace ApplicationPool2 {
@@ -105,6 +106,18 @@ public:
 		memcpy(this->gupid, gupid.data(), gupid.size());
 		gupidSize = gupid.size();
 	}
+	BasicProcessInfo(Process *_process, const BasicGroupInfo *_groupInfo,
+		const SpawningKit::Result &skResult)
+		: process(_process),
+		  groupInfo(_groupInfo),
+		  pid(skResult.pid)
+		  // See above comment about the 'stickySessionId' field
+	{
+		assert(skResult.gupid.size() <= GUPID_MAX_SIZE);
+		memcpy(gupid, skResult.gupid.data(), skResult.gupid.size());
+		gupidSize = skResult.gupid.size();
+	}
 };

data/src/agent/Core/ApplicationPool/Common.h CHANGED

@@ -38,9 +38,8 @@
 #include <DataStructures/StringKeyTable.h>
 #include <Utils/VariantMap.h>
 #include <Core/ApplicationPool/Options.h>
+#include <Core/ApplicationPool/Context.h>
 #include <Core/SpawningKit/Config.h>
-#include <Core/UnionStation/Context.h>
-#include <Core/UnionStation/Transaction.h>
 namespace tut {
 	struct ApplicationPool2_PoolTest;
@@ -206,8 +205,8 @@ struct Ticket {
 ExceptionPtr copyException(const tracable_exception &e);
 void rethrowException(const ExceptionPtr &e);
-void processAndLogNewSpawnException(SpawnException &e, const Options &options,
-	const SpawningKit::ConfigPtr &config);
+void processAndLogNewSpawnException(SpawningKit::SpawnException &e, const Options &options,
+	const Context *context);
 void recreateString(psg_pool_t *pool, StaticString &str);
 } // namespace ApplicationPool2

data/src/agent/Core/ApplicationPool/Context.h CHANGED

@@ -26,10 +26,11 @@
 #ifndef _PASSENGER_APPLICATION_POOL2_CONTEXT_H_
 #define _PASSENGER_APPLICATION_POOL2_CONTEXT_H_
+#include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 #include <boost/pool/object_pool.hpp>
 #include <Exceptions.h>
-#include <Utils/ClassUtils.h>
+#include <Utils/VariantMap.h>
 #include <Core/SpawningKit/Factory.h>
 namespace Passenger {
@@ -52,30 +53,29 @@ class Process;
  * If it does, then all operations on any of the fields in that group requires
  * grabbing the mutex unless documented otherwise.
  */
-class Context {
-private:
-	/****** Memory management objects *****/
+struct Context {
+public:
+	/****** Working objects ******/
-	P_RO_PROPERTY_REF(private, boost::mutex, MmSyncher);
-	P_RO_PROPERTY_REF(private, object_pool<Session>, SessionObjectPool);
-	P_RO_PROPERTY_REF(private, object_pool<Process>, ProcessObjectPool);
+	boost::mutex memoryManagementSyncher;
+	boost::object_pool<Session> sessionObjectPool;
+	boost::object_pool<Process> processObjectPool;
+	mutable boost::mutex agentConfigSyncher;
-	/****** Configuration objects ******/
+	/****** Dependencies ******/
-	P_PROPERTY_CONST_REF(private, SpawningKit::FactoryPtr, SpawningKitFactory);
+	SpawningKit::FactoryPtr spawningKitFactory;
+	Json::Value agentConfig;
-public:
-	/****** Initialization ******/
 	Context()
-		: mSessionObjectPool(64, 1024),
-		  mProcessObjectPool(4, 64)
+		: sessionObjectPool(64, 1024),
+		  processObjectPool(4, 64)
 		{ }
 	void finalize() {
-		if (mSpawningKitFactory == NULL) {
+		if (spawningKitFactory == NULL) {
 			throw RuntimeException("spawningKitFactory must be set");
 		}
 	}
@@ -83,11 +83,21 @@ public:
 	/****** Configuration objects ******/
-	const SpawningKit::ConfigPtr &getSpawningKitConfig() const {
-		return mSpawningKitFactory->getConfig();
+	SpawningKit::Context *getSpawningKitContext() const {
+		return spawningKitFactory->getContext();
+	}
+	ResourceLocator *getResourceLocator() const {
+		return getSpawningKitContext()->resourceLocator;
+	}
+	const RandomGeneratorPtr &getRandomGenerator() const {
+		return getSpawningKitContext()->randomGenerator;
 	}
 };
+typedef boost::shared_ptr<Context> ContextPtr;
 } // namespace ApplicationPool2
 } // namespace Passenger

data/src/agent/Core/ApplicationPool/Group.h CHANGED

@@ -54,6 +54,7 @@
 #include <Core/ApplicationPool/Process.h>
 #include <Core/ApplicationPool/Options.h>
 #include <Core/SpawningKit/Factory.h>
+#include <Core/SpawningKit/Result.h>
 #include <Core/SpawningKit/UserSwitchingRules.h>
 #include <Shared/ApplicationPoolApiKey.h>
@@ -261,7 +262,8 @@ public:
 	void setupAttachOrDetachHook(const ProcessPtr process, HookScriptOptions &options) const;
 	unsigned int generateStickySessionId();
-	ProcessPtr createProcessObject(const Json::Value &json);
+	ProcessPtr createNullProcessObject();
+	ProcessPtr createProcessObject(const SpawningKit::Spawner &spawner, const SpawningKit::Result &spawnResult);
 	bool poolAtFullCapacity() const;
 	ProcessPtr poolForceFreeCapacity(const Group *exclude, boost::container::vector<Callback> &postLockActions);
 	void wakeUpGarbageCollector();

data/src/agent/Core/ApplicationPool/Group/InitializationAndShutdown.cpp CHANGED

@@ -109,7 +109,7 @@ Group::Group(Pool *_pool, const Options &_options)
 	disablingCount = 0;
 	disabledCount  = 0;
 	nEnabledProcessesTotallyBusy = 0;
-	spawner        = getContext()->getSpawningKitFactory()->create(options);
+	spawner        = getContext()->spawningKitFactory->create(options);
 	restartsInitiated = 0;
 	processesBeingSpawned = 0;
 	m_spawning     = false;
@@ -144,17 +144,7 @@ Group::~Group() {
 bool
 Group::initialize() {
-	Json::Value json;
-	json["type"] = "dummy";
-	json["pid"] = 0;
-	json["gupid"] = "0";
-	json["spawner_creation_time"] = 0;
-	json["spawn_start_time"] = 0;
-	json["sockets"] = Json::Value(Json::arrayValue);
-	nullProcess = createProcessObject(json);
-	nullProcess->shutdownNotRequired();
+	nullProcess = createNullProcessObject();
 	return true;
 }

data/src/agent/Core/ApplicationPool/Group/InternalUtils.cpp CHANGED

@@ -97,15 +97,15 @@ Group::mergeOptions(const Options &other) {
  */
 bool
 Group::prepareHookScriptOptions(HookScriptOptions &hsOptions, const char *name) {
-	SpawningKit::ConfigPtr config = getPool()->getSpawningKitConfig();
-	LockGuard l(config->agentConfigSyncher);
-	if (config->agentConfig.isNull()) {
+	Context *context = getPool()->getContext();
+	LockGuard l(context->agentConfigSyncher);
+	if (context->agentConfig.isNull()) {
 		return false;
 	}
 	hsOptions.name = name;
 	string hookName = string("hook_") + name;
-	hsOptions.spec = config->agentConfig.get(hookName, Json::Value()).asString();
+	hsOptions.spec = context->agentConfig.get(hookName, Json::Value()).asString();
 	return true;
 }
@@ -145,7 +145,7 @@ Group::generateStickySessionId() {
 }
 ProcessPtr
-Group::createProcessObject(const Json::Value &json) {
+Group::createNullProcessObject() {
 	struct Guard {
 		Context *context;
 		Process *process;
@@ -157,7 +157,7 @@ Group::createProcessObject(const Json::Value &json) {
 		~Guard() {
 			if (process != NULL) {
-				context->getProcessObjectPool().free(process);
+				context->processObjectPool.free(process);
 			}
 		}
@@ -166,11 +166,56 @@ Group::createProcessObject(const Json::Value &json) {
 		}
 	};
+	Json::Value args;
+	args["pid"] = 0;
+	args["gupid"] = "0";
+	args["spawner_creation_time"] = 0;
+	args["spawn_start_time"] = 0;
+	args["dummy"] = true;
+	args["sockets"] = Json::Value(Json::arrayValue);
+	Context *context = getContext();
+	LockGuard l(context->memoryManagementSyncher);
+	Process *process = context->processObjectPool.malloc();
+	Guard guard(context, process);
+	process = new (process) Process(&info, args);
+	process->shutdownNotRequired();
+	guard.clear();
+	return ProcessPtr(process, false);
+}
+ProcessPtr
+Group::createProcessObject(const SpawningKit::Spawner &spawner,
+	const SpawningKit::Result &spawnResult)
+{
+	struct Guard {
+		Context *context;
+		Process *process;
+		Guard(Context *c, Process *s)
+			: context(c),
+			  process(s)
+			{ }
+		~Guard() {
+			if (process != NULL) {
+				context->processObjectPool.free(process);
+			}
+		}
+		void clear() {
+			process = NULL;
+		}
+	};
+	Json::Value args;
+	args["spawner_creation_time"] = (Json::UInt64) spawner.creationTime;
 	Context *context = getContext();
-	LockGuard l(context->getMmSyncher());
-	Process *process = context->getProcessObjectPool().malloc();
+	LockGuard l(context->memoryManagementSyncher);
+	Process *process = context->processObjectPool.malloc();
 	Guard guard(context, process);
-	process = new (process) Process(&info, json);
+	process = new (process) Process(&info, spawnResult, args);
 	guard.clear();
 	return ProcessPtr(process, false);
 }
@@ -224,7 +269,7 @@ Group::pushGetWaiter(const Options &newOptions, const GetCallback &callback,
 		    || getWaitlist.size() < newOptions.maxRequestQueueSize)))
 	{
 		getWaitlist.push_back(GetWaiter(
-			newOptions.copyAndPersist().detachFromUnionStationTransaction(),
+			newOptions.copyAndPersist(),
 			callback));
 		return true;
 	} else {