fix www. prefixes and related bricked application caches
This commit is contained in:
parent
7d899a7f04
commit
2166090e33
|
@ -207,6 +207,13 @@ module.exports.create = function (securePort, certsPath, vhostsdir) {
|
|||
});
|
||||
}
|
||||
|
||||
function suckItDubDubDub(req, res) {
|
||||
var newLoc = 'https://' + (req.headers.host||'').replace(/^www\./) + req.url;
|
||||
res.statusCode = 301;
|
||||
res.setHeader('Location', newLoc);
|
||||
res.end("<html><head><title></title></head><body><!-- redirecting nowww --></body><html>");
|
||||
}
|
||||
|
||||
function nextify() {
|
||||
if (!appContext) {
|
||||
appContext = loadThatApp();
|
||||
|
@ -231,6 +238,16 @@ module.exports.create = function (securePort, certsPath, vhostsdir) {
|
|||
connectContext.static = serveStatic(path.join(vhostsdir, domaininfo.dirname, 'public'));
|
||||
}
|
||||
|
||||
if (/^www\./.test(req.headers.host)) {
|
||||
if (/\.appcache\b/.test(req.url)) {
|
||||
res.setHeader('Content-Type', 'text/cache-manifest');
|
||||
res.end('CACHE MANIFEST\n\n# v0__DELETE__CACHE__MANIFEST__\n\nNETWORK:\n*');
|
||||
return;
|
||||
}
|
||||
suckItDubDubDub(req, res);
|
||||
return;
|
||||
}
|
||||
|
||||
if (/^\/api\//.test(req.url)) {
|
||||
nextify();
|
||||
return;
|
||||
|
@ -325,7 +342,38 @@ module.exports.create = function (securePort, certsPath, vhostsdir) {
|
|||
console.log('[log] [once] Loading all mounts for ' + domainApp.hostname);
|
||||
domainApp._loaded = true;
|
||||
app.use(vhost(domainApp.hostname, domainApp.apps));
|
||||
app.use(vhost('www.' + domainApp.hostname, domainApp.apps));
|
||||
app.use(vhost('www.' + domainApp.hostname, function (req, res, next) {
|
||||
if (/\.appcache\b/.test(req.url)) {
|
||||
res.setHeader('Content-Type', 'text/cache-manifest');
|
||||
res.end('CACHE MANIFEST\n\n# v0__DELETE__CACHE__MANIFEST__\n\nNETWORK:\n*');
|
||||
//domainApp.apps(req, res, next);
|
||||
return;
|
||||
}
|
||||
// TODO XXX this is in the api section, so it should hard break
|
||||
//res.statusCode = 301;
|
||||
//res.setHeader('Location', newLoc);
|
||||
|
||||
// TODO port number for non-443
|
||||
var escapeHtml = require('escape-html');
|
||||
var newLocation = 'https://' + domainApp.hostname + req.url;
|
||||
var safeLocation = escapeHtml(newLocation);
|
||||
|
||||
var metaRedirect = ''
|
||||
+ '<html>\n'
|
||||
+ '<head>\n'
|
||||
+ ' <style>* { background-color: white; color: white; text-decoration: none; }</style>\n'
|
||||
+ ' <META http-equiv="refresh" content="0;URL=' + safeLocation + '">\n'
|
||||
+ '</head>\n'
|
||||
+ '<body style="display: none;">\n'
|
||||
+ ' <p>You requested an old resource. Please use this instead: \n'
|
||||
+ ' <a href="' + safeLocation + '">' + safeLocation + '</a></p>\n'
|
||||
+ '</body>\n'
|
||||
+ '</html>\n'
|
||||
;
|
||||
|
||||
// 301 redirects will not work for appcache
|
||||
res.end(metaRedirect);
|
||||
}));
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -472,6 +520,8 @@ module.exports.create = function (securePort, certsPath, vhostsdir) {
|
|||
function addSniWorkaroundCallback() {
|
||||
//SNICallback is passed the domain name, see NodeJS docs on TLS
|
||||
secureOpts.SNICallback = function (domainname, cb) {
|
||||
domainname = domainname.replace(/^www\./, '')
|
||||
|
||||
if (/(^|\.)proxyable\./.test(domainname)) {
|
||||
// device-id-12345678.proxyable.myapp.mydomain.com => myapp.mydomain.com
|
||||
// proxyable.myapp.mydomain.com => myapp.mydomain.com
|
||||
|
|
Loading…
Reference in New Issue