From 8964f71f76efd5c907c49e7731ad407f97d71400 Mon Sep 17 00:00:00 2001 From: Marina Pecherina Date: Wed, 11 May 2022 16:16:56 +0300 Subject: [PATCH 1/4] Changed default forgerc name --- deleter.js | 1 + src/middlewares/common.js | 2 +- src/server.js | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/deleter.js b/deleter.js index 2b61425..9f97d50 100644 --- a/deleter.js +++ b/deleter.js @@ -8,6 +8,7 @@ const touch = require('touch') const mkdirp = require('mkdirp') const config = require('/home/ec2-user/deploy/forge-server/config').config() +process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; // temp folder is used to cache site meta between deploys // example.com/.forge-meta.json diff --git a/src/middlewares/common.js b/src/middlewares/common.js index 65c5835..3b0c8ae 100644 --- a/src/middlewares/common.js +++ b/src/middlewares/common.js @@ -46,7 +46,7 @@ const fetchMetaByApi = (address, done) => { */ // the name of the file with site config -const forgercName = '.forgerc' +const forgercName = 'forgerc.txt' const fetchMetaOldWay = (address, done) => { getFileContent(`${address}/index.html`, (err, indexPage) => { diff --git a/src/server.js b/src/server.js index f0e22f3..feecc23 100644 --- a/src/server.js +++ b/src/server.js @@ -4,6 +4,7 @@ const { config } = require('./env') const logger = require('./logger') let app = express() +process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; app.use(require('./middlewares/common')) app.use(require('./middlewares/expired')) From db2ccbd3ee62fb440ea5efadf4335590d7c68954 Mon Sep 17 00:00:00 2001 From: Marina Pecherina Date: Fri, 8 Jul 2022 09:09:06 +0300 Subject: [PATCH 2/4] Fixed issue with wrong headers --- deleter.js | 2 +- src/middlewares/notFound.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deleter.js b/deleter.js index 9f97d50..d30a973 100644 --- a/deleter.js +++ b/deleter.js @@ -37,7 +37,7 @@ let lastCheckAt = null try { lastCheckAt = new Date( fs.readFileSync(lastCheckedAtFile, 'utf-8') ) } catch(err) { - lastCheckAt = moment().subtract(1, 'days').toDate() + lastCheckAt = moment().toDate() } logger(`😎 Last check was performed ${moment(lastCheckAt).format('MM.DD HH:mm')}`) diff --git a/src/middlewares/notFound.js b/src/middlewares/notFound.js index ba93775..df8c96a 100644 --- a/src/middlewares/notFound.js +++ b/src/middlewares/notFound.js @@ -37,8 +37,8 @@ module.exports = (req, res, next) => { performRewrite(req, res, () => { res - .status(404) .set({ 'Content-Type': 'text/html' }) + .status(404) .send(errorPageContent) }, '/404.html', 404) From f7f3d53efbc8fefd284a3a223eb89842b07108e0 Mon Sep 17 00:00:00 2001 From: Marina Pecherina Date: Fri, 8 Jul 2022 09:21:50 +0300 Subject: [PATCH 3/4] Fixed issue with header in static --- src/middlewares/static.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/middlewares/static.js b/src/middlewares/static.js index 94db9fc..23e902a 100644 --- a/src/middlewares/static.js +++ b/src/middlewares/static.js @@ -95,10 +95,6 @@ const middleware = (req, res, next) => { statusCode = req.context.overwriteStatus || response.statusCode - res.writeHead(statusCode, { - 'content-type': response.headers['content-type'] - }) - response.on('data', chunk => { if (response.headers['content-encoding'] == 'gzip') { @@ -114,6 +110,10 @@ const middleware = (req, res, next) => { } }); + res.writeHead(statusCode, { + 'content-type': response.headers['content-type'] + }) + response.on('end', () => res.end()) }).end() } From 06b7f6a4ac9d1b7c16d289bba12b592be032fb16 Mon Sep 17 00:00:00 2001 From: Marina Pecherina Date: Fri, 15 Jul 2022 10:21:20 +0300 Subject: [PATCH 4/4] Added check on empty rules --- src/middlewares/common.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/middlewares/common.js b/src/middlewares/common.js index 3b0c8ae..b4e3990 100644 --- a/src/middlewares/common.js +++ b/src/middlewares/common.js @@ -90,7 +90,7 @@ const loadSiteMeta = (address, done) => { let meta = {} try { meta = JSON.parse(metaContent) } catch(err) { success = false } - if(success) { + if(success && meta.configRaw.trim().length > 0) { logger(`✅ Meta for site loaded from ${metaFileLocation}`) return done(null, meta) }