X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fwebfinger.ts;h=63a1678ec9aa720e4790a3d822815b4011fe697c;hb=6702a1b2ccd666285dee9c72b5bace641d2fce8b;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..63a1678ec 100644
--- a/server/middlewares/validators/webfinger.ts
+++ b/server/middlewares/validators/webfinger.ts
@@ -1,12 +1,13 @@
 import * as express from 'express'
 import { query } from 'express-validator/check'
-import { logger } from '../../helpers'
-import { isWebfingerResourceValid } from '../../helpers/custom-validators/webfinger'
+import { isWebfingerLocalResourceValid } from '../../helpers/custom-validators/webfinger'
+import { logger } from '../../helpers/logger'
 import { ActorModel } from '../../models/activitypub/actor'
 import { areValidationErrors } from './utils'
+import { getHostWithPort } from '../../helpers/express-utils'
 
 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,7 +15,7 @@ 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)