1 files changed, 29 insertions, 30 deletions

diff --git a/server/middlewares/secure.ts b/server/middlewares/secure.ts
index f7424c9c3..5dd809f15 100644
--- a/server/middlewares/secure.ts
+++ b/server/middlewares/secure.ts
@@ -8,45 +8,44 @@ import {
 } from '../helpers'
 import { PodSignature } from '../../shared'
 
-function checkSignature (req: express.Request, res: express.Response, next: express.NextFunction) {
+async function checkSignature (req: express.Request, res: express.Response, next: express.NextFunction) {
   const signatureObject: PodSignature = req.body.signature
   const host = signatureObject.host
 
-  db.Pod.loadByHost(host)
-    .then(pod => {
-      if (pod === null) {
-        logger.error('Unknown pod %s.', host)
-        return res.sendStatus(403)
-      }
-
-      logger.debug('Checking signature from %s.', host)
+  try {
+    const pod = await db.Pod.loadByHost(host)
+    if (pod === null) {
+      logger.error('Unknown pod %s.', host)
+      return res.sendStatus(403)
+    }
 
-      let signatureShouldBe
-      // If there is data in the body the sender used it for its signature
-      // If there is no data we just use its host as signature
-      if (req.body.data) {
-        signatureShouldBe = req.body.data
-      } else {
-        signatureShouldBe = host
-      }
+    logger.debug('Checking signature from %s.', host)
 
-      const signatureOk = peertubeCryptoCheckSignature(pod.publicKey, signatureShouldBe, signatureObject.signature)
+    let signatureShouldBe
+    // If there is data in the body the sender used it for its signature
+    // If there is no data we just use its host as signature
+    if (req.body.data) {
+      signatureShouldBe = req.body.data
+    } else {
+      signatureShouldBe = host
+    }
 
-      if (signatureOk === true) {
-        res.locals.secure = {
-          pod
-        }
+    const signatureOk = peertubeCryptoCheckSignature(pod.publicKey, signatureShouldBe, signatureObject.signature)
 
-        return next()
+    if (signatureOk === true) {
+      res.locals.secure = {
+        pod
       }
 
-      logger.error('Signature is not okay in body for %s.', signatureObject.host)
-      return res.sendStatus(403)
-    })
-    .catch(err => {
-      logger.error('Cannot get signed host in body.', { error: err.stack, signature: signatureObject.signature })
-      return res.sendStatus(500)
-    })
+      return next()
+    }
+
+    logger.error('Signature is not okay in body for %s.', signatureObject.host)
+    return res.sendStatus(403)
+  } catch (err) {
+    logger.error('Cannot get signed host in body.', { error: err.stack, signature: signatureObject.signature })
+    return res.sendStatus(500)
+  }
 }
 
 // ---------------------------------------------------------------------------