X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fthemes.ts;h=a726a567bdadbd75bd261796d47a793c63a8c289;hb=1f256e7d3cf056c2d999260155cdba58ae1b878b;hp=642f2df78fbc8589695ed225bdaa98869a13419f;hpb=345da516fae80f24c90c2196e96393b489af2243;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/validators/themes.ts b/server/middlewares/validators/themes.ts index 642f2df78..a726a567b 100644 --- a/server/middlewares/validators/themes.ts +++ b/server/middlewares/validators/themes.ts @@ -1,10 +1,11 @@ import * as express from 'express' -import { param } from 'express-validator/check' +import { param } from 'express-validator' import { logger } from '../../helpers/logger' import { areValidationErrors } from './utils' import { isPluginNameValid, isPluginVersionValid } from '../../helpers/custom-validators/plugins' import { PluginManager } from '../../lib/plugins/plugin-manager' import { isSafePath } from '../../helpers/custom-validators/misc' +import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes' const serveThemeCSSValidator = [ param('themeName').custom(isPluginNameValid).withMessage('Should have a valid theme name'), @@ -16,14 +17,14 @@ const serveThemeCSSValidator = [ if (areValidationErrors(req, res)) return - const theme = PluginManager.Instance.getRegisteredTheme(req.params.themeName) + const theme = PluginManager.Instance.getRegisteredThemeByShortName(req.params.themeName) if (!theme || theme.version !== req.params.themeVersion) { - return res.sendStatus(404) + return res.sendStatus(HttpStatusCode.NOT_FOUND_404) } if (theme.css.includes(req.params.staticEndpoint) === false) { - return res.sendStatus(404) + return res.sendStatus(HttpStatusCode.NOT_FOUND_404) } res.locals.registeredPlugin = theme