X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Factivitypub%2Fsignature.ts;h=f2f7d58487882f84a287581c8ccf39342e1332c7;hb=10363c74c1d869f0e0c7bc4d0367b1f34d1bb6a4;hp=02b191480b022ba401663e9211b5c5a4f119da37;hpb=c8861d5dc0436ef4342ce517241e3591fa256a13;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/validators/activitypub/signature.ts b/server/middlewares/validators/activitypub/signature.ts index 02b191480..f2f7d5848 100644 --- a/server/middlewares/validators/activitypub/signature.ts +++ b/server/middlewares/validators/activitypub/signature.ts @@ -1,12 +1,13 @@ import * as express from 'express' import { body } from 'express-validator' import { - isSignatureCreatorValid, isSignatureTypeValid, + isSignatureCreatorValid, + isSignatureTypeValid, isSignatureValueValid } from '../../../helpers/custom-validators/activitypub/signature' import { isDateValid } from '../../../helpers/custom-validators/misc' import { logger } from '../../../helpers/logger' -import { areValidationErrors } from '../utils' +import { areValidationErrors } from '../shared' const signatureValidator = [ body('signature.type') @@ -14,7 +15,7 @@ const signatureValidator = [ .custom(isSignatureTypeValid).withMessage('Should have a valid signature type'), body('signature.created') .optional() - .custom(isDateValid).withMessage('Should have a valid signature created date'), + .custom(isDateValid).withMessage('Should have a signature created date that conforms to ISO 8601'), body('signature.creator') .optional() .custom(isSignatureCreatorValid).withMessage('Should have a valid signature creator'), @@ -23,7 +24,7 @@ const signatureValidator = [ .custom(isSignatureValueValid).withMessage('Should have a valid signature value'), (req: express.Request, res: express.Response, next: express.NextFunction) => { - logger.debug('Checking activitypub signature parameter', { parameters: { signature: req.body.signature } }) + logger.debug('Checking Linked Data Signature parameter', { parameters: { signature: req.body.signature } }) if (areValidationErrors(req, res)) return