coolaj86
/
walnut.js
1
1
Fork 1
Code Issues Pull Requests Releases Activity

disallow fallthru from one app to another

This commit is contained in:
AJ ONeal 2015-02-21 18:00:39 +00:00
parent c704eda6b6
commit 669c69e5eb
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/vhost-sni-server.js
View File

@ -79,13 +79,14 @@ module.exports.create = function (securePort, certsPath, vhostsdir) {
return; return;
} }
console.log('[log] [once] Preparing mount for', domaininfo.hostname + '/' + domaininfo.dirpathname);
domainMergeMap[domaininfo.hostname].mountsMap['/' + domaininfo.dirpathname] = function (req, res, next) { domainMergeMap[domaininfo.hostname].mountsMap['/' + domaininfo.dirpathname] = function (req, res, next) {
if (appContext) { if (appContext) {
appContext(req, res, next); appContext(req, res, next);
return; return;
} }
console.log('[log] LOADING "' + domaininfo.hostname + '/' + domaininfo.pathname + '"'); console.log('[log] LOADING "' + domaininfo.hostname + '/' + domaininfo.pathname + '"', req.url);
getAppContext(domaininfo).then(function (localApp) { getAppContext(domaininfo).then(function (localApp) {
//if (localApp.arity >= 2) { /* connect uses .apply(null, arguments)*/ } //if (localApp.arity >= 2) { /* connect uses .apply(null, arguments)*/ }
if ('function' !== typeof localApp) { if ('function' !== typeof localApp) {
@ -94,10 +95,18 @@ module.exports.create = function (securePort, certsPath, vhostsdir) {
// Note: pathname should NEVER have a leading '/' on its own // Note: pathname should NEVER have a leading '/' on its own
// we always add it explicitly // we always add it explicitly
function localAppWrapped(req, res) {
console.log('[debug]', domaininfo.hostname + '/' + domaininfo.pathname, req.url);
localApp(req, res, function (err) {
res.end('{ "error": { "messages": "Route matched '
+ domaininfo.hostname + '/' + domaininfo.pathname
+ ', but was not handled. Forcing hard stop to prevent fallthru." } }');
});
}
try { try {
domainMergeMap[domaininfo.hostname].apps.use('/' + domaininfo.pathname, localApp); domainMergeMap[domaininfo.hostname].apps.use('/' + domaininfo.pathname, localAppWrapped);
console.info('Loaded ' + domaininfo.hostname + ':' + securePort + '/' + domaininfo.pathname); console.info('Loaded ' + domaininfo.hostname + ':' + securePort + '/' + domaininfo.pathname);
appContext = localApp; appContext = localAppWrapped;
appContext(req, res, next); appContext(req, res, next);
} catch(e) { } catch(e) {
console.error('[ERROR] ' + domaininfo.hostname + ':' + securePort + '/' + domaininfo.pathname); console.error('[ERROR] ' + domaininfo.hostname + ':' + securePort + '/' + domaininfo.pathname);
@ -188,7 +197,7 @@ module.exports.create = function (securePort, certsPath, vhostsdir) {
return; return;
} }
console.log('[log] [once] Loading mounts for ' + domainApp.hostname); console.log('[log] [once] Loading all mounts for ' + domainApp.hostname);
domainApp._loaded = true; domainApp._loaded = true;
app.use(vhost(domainApp.hostname, domainApp.apps)); app.use(vhost(domainApp.hostname, domainApp.apps));
app.use(vhost('www.' + domainApp.hostname, domainApp.apps)); app.use(vhost('www.' + domainApp.hostname, domainApp.apps));