X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fwebfinger.ts;h=8893a0c7e89d7ec1b68a464c1ba3cacfe8d0001d;hb=5037e0e474044d7fc04092158784395a001e5c25;hp=2c8351799a46a75a7a278609dc2043cb73bbb770;hpb=50d6de9c286abcb34ff4234d56d9cbb803db7665;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/validators/webfinger.ts b/server/middlewares/validators/webfinger.ts index 2c8351799..8893a0c7e 100644 --- a/server/middlewares/validators/webfinger.ts +++ b/server/middlewares/validators/webfinger.ts @@ -1,12 +1,14 @@ -import * as express from 'express' -import { query } from 'express-validator/check' -import { logger } from '../../helpers' -import { isWebfingerResourceValid } from '../../helpers/custom-validators/webfinger' -import { ActorModel } from '../../models/activitypub/actor' -import { areValidationErrors } from './utils' +import express from 'express' +import { query } from 'express-validator' +import { HttpStatusCode } from '../../../shared/models/http/http-error-codes' +import { isWebfingerLocalResourceValid } from '../../helpers/custom-validators/webfinger' +import { getHostWithPort } from '../../helpers/express-utils' +import { logger } from '../../helpers/logger' +import { ActorModel } from '../../models/actor/actor' +import { areValidationErrors } from './shared' const webfingerValidator = [ - query('resource').custom(isWebfingerResourceValid).withMessage('Should have a valid webfinger resource'), + query('resource').custom(isWebfingerLocalResourceValid).withMessage('Should have a valid webfinger resource'), async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking webfinger parameters', { parameters: req.query }) @@ -14,17 +16,18 @@ const webfingerValidator = [ if (areValidationErrors(req, res)) return // Remove 'acct:' from the beginning of the string - const nameWithHost = req.query.resource.substr(5) + const nameWithHost = getHostWithPort(req.query.resource.substr(5)) const [ name ] = nameWithHost.split('@') - const actor = await ActorModel.loadLocalByName(name) + const actor = await ActorModel.loadLocalUrlByName(name) if (!actor) { - return res.status(404) - .send({ error: 'Actor not found' }) - .end() + return res.fail({ + status: HttpStatusCode.NOT_FOUND_404, + message: 'Actor not found' + }) } - res.locals.actor = actor + res.locals.actorUrl = actor return next() } ]