From 8d2be0ed7bb87283a1ec98609df6b82d83db706a Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 11 Jul 2019 17:23:24 +0200 Subject: WIP plugins: move plugin CLI in peertube script Install/uninstall/list plugins remotely --- server/middlewares/validators/plugins.ts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'server/middlewares/validators/plugins.ts') diff --git a/server/middlewares/validators/plugins.ts b/server/middlewares/validators/plugins.ts index a06add6b8..a1634ded4 100644 --- a/server/middlewares/validators/plugins.ts +++ b/server/middlewares/validators/plugins.ts @@ -6,6 +6,7 @@ import { isPluginNameValid, isPluginTypeValid, isPluginVersionValid, isNpmPlugin import { PluginManager } from '../../lib/plugins/plugin-manager' import { isBooleanValid, isSafePath } from '../../helpers/custom-validators/misc' import { PluginModel } from '../../models/server/plugin' +import { InstallPlugin } from '../../../shared/models/plugins/install-plugin.model' const servePluginStaticDirectoryValidator = [ param('pluginName').custom(isPluginNameValid).withMessage('Should have a valid plugin name'), @@ -48,13 +49,25 @@ const listPluginsValidator = [ ] const installPluginValidator = [ - body('npmName').custom(isNpmPluginNameValid).withMessage('Should have a valid npm name'), + body('npmName') + .optional() + .custom(isNpmPluginNameValid).withMessage('Should have a valid npm name'), + body('path') + .optional() + .custom(isSafePath).withMessage('Should have a valid safe path'), (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking installPluginValidator parameters', { parameters: req.body }) if (areValidationErrors(req, res)) return + const body: InstallPlugin = req.body + if (!body.path && !body.npmName) { + return res.status(400) + .json({ error: 'Should have either a npmName or a path' }) + .end() + } + return next() } ] -- cgit v1.2.3