X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fthemes.ts;h=080b3e096303fc12c8d2c73e0039b8465063eac2;hb=ff91b644fb1b063d0a8eff7492beb1a9bf7e4ce1;hp=2953b9505bbc3930b902ca461ca555bcbfe4a362;hpb=c4fa01f7c45b66b112ebd08abce744b7c4041feb;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/validators/themes.ts b/server/middlewares/validators/themes.ts index 2953b9505..080b3e096 100644 --- a/server/middlewares/validators/themes.ts +++ b/server/middlewares/validators/themes.ts @@ -1,20 +1,20 @@ -import * as express from 'express' +import express from 'express' import { param } from 'express-validator' import { HttpStatusCode } from '../../../shared/models/http/http-error-codes' import { isSafePath } from '../../helpers/custom-validators/misc' -import { isPluginNameValid, isPluginVersionValid } from '../../helpers/custom-validators/plugins' -import { logger } from '../../helpers/logger' +import { isPluginNameValid, isPluginStableOrUnstableVersionValid } from '../../helpers/custom-validators/plugins' import { PluginManager } from '../../lib/plugins/plugin-manager' import { areValidationErrors } from './shared' const serveThemeCSSValidator = [ - param('themeName').custom(isPluginNameValid).withMessage('Should have a valid theme name'), - param('themeVersion').custom(isPluginVersionValid).withMessage('Should have a valid theme version'), - param('staticEndpoint').custom(isSafePath).withMessage('Should have a valid static endpoint'), + param('themeName') + .custom(isPluginNameValid), + param('themeVersion') + .custom(isPluginStableOrUnstableVersionValid), + param('staticEndpoint') + .custom(isSafePath), (req: express.Request, res: express.Response, next: express.NextFunction) => { - logger.debug('Checking serveThemeCSS parameters', { parameters: req.params }) - if (areValidationErrors(req, res)) return const theme = PluginManager.Instance.getRegisteredThemeByShortName(req.params.themeName)