diff --git a/lib/web/middleware/checkURIValid.js b/lib/web/middleware/checkURIValid.js deleted file mode 100644 index cd6dabd2f..000000000 --- a/lib/web/middleware/checkURIValid.js +++ /dev/null @@ -1,14 +0,0 @@ -'use strict' - -const logger = require('../../logger') -const errors = require('../../errors') - -module.exports = function (req, res, next) { - try { - decodeURIComponent(req.path) - } catch (err) { - logger.error(err) - return errors.errorBadRequest(res) - } - next() -} diff --git a/lib/web/middleware/checkURIValid.ts b/lib/web/middleware/checkURIValid.ts new file mode 100644 index 000000000..3a08e8ad7 --- /dev/null +++ b/lib/web/middleware/checkURIValid.ts @@ -0,0 +1,13 @@ +import { logger } from '../../logger' +import { errors } from '../../errors' +import { NextFunction, Request, Response } from 'express' + +export default function checkURI (req: Request, res: Response, next: NextFunction) { + try { + decodeURIComponent(req.path) + next() + } catch (err) { + logger.error(err) + errors.errorBadRequest(res) + } +} diff --git a/lib/web/middleware/codiMDVersion.js b/lib/web/middleware/codiMDVersion.js deleted file mode 100644 index e7775876f..000000000 --- a/lib/web/middleware/codiMDVersion.js +++ /dev/null @@ -1,10 +0,0 @@ -'use strict' - -const config = require('../../config') - -module.exports = function (req, res, next) { - res.set({ - 'CodiMD-Version': config.version - }) - return next() -} diff --git a/lib/web/middleware/codiMDVersion.ts b/lib/web/middleware/codiMDVersion.ts new file mode 100644 index 000000000..3aea95bb9 --- /dev/null +++ b/lib/web/middleware/codiMDVersion.ts @@ -0,0 +1,9 @@ +import { config } from '../../config' +import { NextFunction, Request, Response } from 'express' + +export default function version (req: Request, res: Response, next: NextFunction) { + res.set({ + 'CodiMD-Version': config.version + }) + return next() +} diff --git a/lib/web/middleware/redirectWithoutTrailingSlashes.js b/lib/web/middleware/redirectWithoutTrailingSlashes.js deleted file mode 100644 index 60ca04afc..000000000 --- a/lib/web/middleware/redirectWithoutTrailingSlashes.js +++ /dev/null @@ -1,17 +0,0 @@ -'use strict' - -const config = require('../../config') - -module.exports = function (req, res, next) { - if (req.method === 'GET' && req.path.substr(-1) === '/' && req.path.length > 1) { - const queryString = req.url.slice(req.path.length) - const urlPath = req.path.slice(0, -1) - let serverURL = config.serverURL - if (config.urlPath) { - serverURL = serverURL.slice(0, -(config.urlPath.length + 1)) - } - res.redirect(301, serverURL + urlPath + queryString) - } else { - next() - } -} diff --git a/lib/web/middleware/redirectWithoutTrailingSlashes.ts b/lib/web/middleware/redirectWithoutTrailingSlashes.ts new file mode 100644 index 000000000..6b71f0c23 --- /dev/null +++ b/lib/web/middleware/redirectWithoutTrailingSlashes.ts @@ -0,0 +1,16 @@ +import { NextFunction, Request, Response } from 'express' +import { config } from '../../config' + +export default function (req: Request, res: Response, next: NextFunction): void { + if (req.method === 'GET' && req.path.substr(-1) === '/' && req.path.length > 1) { + const queryString: string = req.url.slice(req.path.length) + const urlPath: string = req.path.slice(0, -1) + let serverURL: string = config.serverURL + if (config.urlPath) { + serverURL = serverURL.slice(0, -(config.urlPath.length + 1)) + } + res.redirect(301, serverURL + urlPath + queryString) + } else { + next() + } +} diff --git a/lib/web/middleware/tooBusy.js b/lib/web/middleware/tooBusy.js deleted file mode 100644 index a2101975a..000000000 --- a/lib/web/middleware/tooBusy.js +++ /dev/null @@ -1,16 +0,0 @@ -'use strict' - -const toobusy = require('toobusy-js') - -const errors = require('../../errors') -const config = require('../../config') - -toobusy.maxLag(config.tooBusyLag) - -module.exports = function (req, res, next) { - if (toobusy()) { - errors.errorServiceUnavailable(res) - } else { - next() - } -} diff --git a/lib/web/middleware/tooBusy.ts b/lib/web/middleware/tooBusy.ts new file mode 100644 index 000000000..06768cf3c --- /dev/null +++ b/lib/web/middleware/tooBusy.ts @@ -0,0 +1,14 @@ +import toobusy from 'toobusy-js' +import { errors } from '../../errors' +import { config } from '../../config' +import { NextFunction, Request, Response } from 'express' + +toobusy.maxLag(config.tooBusyLag) + +export default function tooBusy (req: Request, res: Response, next: NextFunction): void { + if (toobusy()) { + errors.errorServiceUnavailable(res) + } else { + next() + } +}