Merge branch 'master' into patch-1

This commit is contained in:
jc21 2019-04-24 07:07:30 +10:00 committed by GitHub
commit 1a7d39fc0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 10 deletions

View file

@ -3,6 +3,7 @@
const express = require('express'); const express = require('express');
const fs = require('fs'); const fs = require('fs');
const PACKAGE = require('../../../package.json'); const PACKAGE = require('../../../package.json');
const path = require('path')
const router = express.Router({ const router = express.Router({
caseSensitive: true, caseSensitive: true,
@ -29,7 +30,9 @@ router.get(/(.*)/, function (req, res, next) {
version: PACKAGE.version version: PACKAGE.version
}); });
} else { } else {
fs.readFile('dist' + req.params.page, 'utf8', function (err, data) { var p = path.normalize('dist' + req.params.page)
if (p.startsWith('dist')) { // Allow access to ressources under 'dist' directory only.
fs.readFile(p, 'utf8', function (err, data) {
if (err) { if (err) {
res.render('index', { res.render('index', {
version: PACKAGE.version version: PACKAGE.version
@ -38,6 +41,11 @@ router.get(/(.*)/, function (req, res, next) {
res.contentType('text/html').end(data); res.contentType('text/html').end(data);
} }
}); });
} else {
res.render('index', {
version: PACKAGE.version
});
}
} }
}); });

View file

@ -57,7 +57,7 @@
}, },
"footer": { "footer": {
"fork-me": "Fork me on Github", "fork-me": "Fork me on Github",
"copy": "&copy; 2018 <a href=\"{url}\" target=\"_blank\">jc21.com</a>.", "copy": "&copy; 2019 <a href=\"{url}\" target=\"_blank\">jc21.com</a>.",
"theme": "Theme by <a href=\"{url}\" target=\"_blank\">Tabler</a>" "theme": "Theme by <a href=\"{url}\" target=\"_blank\">Tabler</a>"
}, },
"dashboard": { "dashboard": {