From 94f67f518e711bb300bc33f347bab3b42d47c722 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 20 Feb 2014 15:13:15 -0500 Subject: [PATCH] fixed issue where a URL as the logo caused apple-touch-icon to explode --- src/webserver.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/webserver.js b/src/webserver.js index f8cd31fe83..d6fe44bbbd 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -206,9 +206,13 @@ module.exports.server = server; // favicon & apple-touch-icon middleware app.use(express.favicon(path.join(__dirname, '../', 'public', meta.config['brand:favicon'] ? meta.config['brand:favicon'] : 'favicon.ico'))); app.use('/apple-touch-icon', function(req, res) { - return res.sendfile(path.join(__dirname, '../public', meta.config['brand:logo'] || nconf.get('relative_path') + '/logo.png'), { - maxAge: app.enabled('cache') ? 5184000000 : 0 - }); + if (meta.config['brand:logo'] && validator.isURL(meta.config['brand:logo'])) { + return res.redirect(meta.config['brand:logo']); + } else { + return res.sendfile(path.join(__dirname, '../public', meta.config['brand:logo'] || nconf.get('relative_path') + '/logo.png'), { + maxAge: app.enabled('cache') ? 5184000000 : 0 + }); + } }); app.use(require('less-middleware')({