From ee28cdf1c488ac6ad6f3d06804b9c5e63eea1965 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 6 Apr 2018 11:54:24 +0200 Subject: Upgrade server dependencies --- .../middlewares/validators/activitypub/activity.ts | 29 +++++++++++----------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'server/middlewares/validators/activitypub') diff --git a/server/middlewares/validators/activitypub/activity.ts b/server/middlewares/validators/activitypub/activity.ts index 8c2920328..4aace4c8e 100644 --- a/server/middlewares/validators/activitypub/activity.ts +++ b/server/middlewares/validators/activitypub/activity.ts @@ -6,24 +6,23 @@ import { getServerActor } from '../../../helpers/utils' import { ActorModel } from '../../../models/activitypub/actor' import { areValidationErrors } from '../utils' -const activityPubValidator = [ - body('').custom((value, { req }) => isRootActivityValid(req.body)), +async function activityPubValidator (req: express.Request, res: express.Response, next: express.NextFunction) { + logger.debug('Checking activity pub parameters') - async (req: express.Request, res: express.Response, next: express.NextFunction) => { - logger.debug('Checking activity pub parameters') - - if (areValidationErrors(req, res)) return - - const serverActor = await getServerActor() - const remoteActor = res.locals.signature.actor as ActorModel - if (serverActor.id === remoteActor.id) { - logger.error('Receiving request in INBOX by ourselves!', req.body) - return res.status(409).end() - } + if (!isRootActivityValid(req.body)) { + logger.warn('Incorrect activity parameters.', { activity: req.body }) + return res.status(400).json({ error: 'Incorrect activity.' }) + } - return next() + const serverActor = await getServerActor() + const remoteActor = res.locals.signature.actor as ActorModel + if (serverActor.id === remoteActor.id) { + logger.error('Receiving request in INBOX by ourselves!', req.body) + return res.status(409).end() } -] + + return next() +} // --------------------------------------------------------------------------- -- cgit v1.2.3