Merge branch 'postgresql'

[github/Chocobozzz/PeerTube.git] / server / middlewares / secure.js

diff --git a/server/middlewares/secure.js b/server/middlewares/secure.js
index bfd28316a3b1551c38508cd09b59510596fb80c6..b6e6d818b91995561b98f06df70459a6315e3360 100644 (file)
--- a/server/middlewares/secure.js
+++ b/server/middlewares/secure.js
@@ -1,46 +1,47 @@
 'use strict'
 
-var logger = require('../helpers/logger')
-var peertubeCrypto = require('../helpers/peertubeCrypto')
-var Pods = require('../models/pods')
+const db = require('../initializers/database')
+const logger = require('../helpers/logger')
+const peertubeCrypto = require('../helpers/peertube-crypto')
 
-var secureMiddleware = {
-  decryptBody: decryptBody
+const secureMiddleware = {
+  checkSignature
 }
 
-function decryptBody (req, res, next) {
-  var url = req.body.signature.url
-  Pods.findByUrl(url, function (err, pod) {
+function checkSignature (req, res, next) {
+  const host = req.body.signature.host
+  db.Pod.loadByHost(host, function (err, pod) {
     if (err) {
-      logger.error('Cannot get signed url in decryptBody.', { error: err })
+      logger.error('Cannot get signed host in body.', { error: err })
       return res.sendStatus(500)
     }
 
     if (pod === null) {
-      logger.error('Unknown pod %s.', url)
+      logger.error('Unknown pod %s.', host)
       return res.sendStatus(403)
     }
 
-    logger.debug('Decrypting body from %s.', url)
+    logger.debug('Checking signature from %s.', host)
 
-    var signature_ok = peertubeCrypto.checkSignature(pod.publicKey, url, req.body.signature.signature)
+    let signatureShouldBe
+    if (req.body.data) {
+      signatureShouldBe = req.body.data
+    } else {
+      signatureShouldBe = host
+    }
 
-    if (signature_ok === true) {
-      peertubeCrypto.decrypt(req.body.key, req.body.data, function (err, decrypted) {
-        if (err) {
-          logger.error('Cannot decrypt data.', { error: err })
-          return res.sendStatus(500)
-        }
+    const signatureOk = peertubeCrypto.checkSignature(pod.publicKey, signatureShouldBe, req.body.signature.signature)
 
-        req.body.data = JSON.parse(decrypted)
-        delete req.body.key
+    if (signatureOk === true) {
+      res.locals.secure = {
+        pod
+      }
 
-        next()
-      })
-    } else {
-      logger.error('Signature is not okay in decryptBody for %s.', req.body.signature.url)
-      return res.sendStatus(403)
+      return next()
     }
+
+    logger.error('Signature is not okay in body for %s.', req.body.signature.host)
+    return res.sendStatus(403)
   })
 }