X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fwebfinger.ts;h=dcfba99fa84551bddaf5c256c7be6c154de3b7ea;hb=2c015b54192f2080f756c424173bac2bd53e7ca9;hp=068e03ad73deee21e4145e81ed996040cc44ca67;hpb=350e31d6b64e4973dfa5e9f7b46841cb09aeb1ad;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/validators/webfinger.ts b/server/middlewares/validators/webfinger.ts
index 068e03ad7..dcfba99fa 100644
--- a/server/middlewares/validators/webfinger.ts
+++ b/server/middlewares/validators/webfinger.ts
@@ -1,37 +1,32 @@
-import { query } from 'express-validator/check'
-import * as express from 'express'
-
-import { checkErrors } from './utils'
-import { logger, isWebfingerResourceValid } from '../../helpers'
-import { database as db } from '../../initializers'
+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 { ActorModel } from '../../models/actor/actor'
+import { areValidationErrors } from './shared'
 
 const webfingerValidator = [
-  query('resource').custom(isWebfingerResourceValid).withMessage('Should have a valid webfinger resource'),
-
-  (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking webfinger parameters', { parameters: req.query })
-
-    checkErrors(req, res, () => {
-      // Remove 'acct:' from the beginning of the string
-      const nameWithHost = req.query.resource.substr(5)
-      const [ name, ] = nameWithHost.split('@')
-
-      db.Account.loadLocalByName(name)
-        .then(account => {
-          if (!account) {
-            return res.status(404)
-              .send({ error: 'Account not found' })
-              .end()
-          }
-
-          res.locals.account = account
-          return next()
-        })
-        .catch(err => {
-          logger.error('Error in webfinger validator.', err)
-          return res.sendStatus(500)
-        })
-    })
+  query('resource')
+    .custom(isWebfingerLocalResourceValid),
+
+  async (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    if (areValidationErrors(req, res)) return
+
+    // Remove 'acct:' from the beginning of the string
+    const nameWithHost = getHostWithPort(req.query.resource.substr(5))
+    const [ name ] = nameWithHost.split('@')
+
+    const actor = await ActorModel.loadLocalUrlByName(name)
+    if (!actor) {
+      return res.fail({
+        status: HttpStatusCode.NOT_FOUND_404,
+        message: 'Actor not found'
+      })
+    }
+
+    res.locals.actorUrl = actor
+    return next()
   }
 ]