Move tags in another table

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

diff --git a/server/middlewares/secure.js b/server/middlewares/secure.js
index fd5bc51d6423babddf197cdbc797d287de77d5ff..b7b4cdfb498443013a8fb59820b8271907ea9048 100644 (file)
--- a/server/middlewares/secure.js
+++ b/server/middlewares/secure.js
@@ -1,21 +1,18 @@
 'use strict'
 
+const db = require('../initializers/database')
 const logger = require('../helpers/logger')
-const mongoose = require('mongoose')
 const peertubeCrypto = require('../helpers/peertube-crypto')
 
-const Pod = mongoose.model('Pod')
-
 const secureMiddleware = {
-  checkSignature,
-  decryptBody
+  checkSignature
 }
 
 function checkSignature (req, res, next) {
   const host = req.body.signature.host
-  Pod.loadByHost(host, function (err, pod) {
+  db.Pod.loadByHost(host, function (err, pod) {
     if (err) {
-      logger.error('Cannot get signed host in decryptBody.', { error: err })
+      logger.error('Cannot get signed host in body.', { error: err })
       return res.sendStatus(500)
     }
 
@@ -24,7 +21,7 @@ function checkSignature (req, res, next) {
       return res.sendStatus(403)
     }
 
-    logger.debug('Decrypting body from %s.', host)
+    logger.debug('Checking signature from %s.', host)
 
     const signatureOk = peertubeCrypto.checkSignature(pod.publicKey, host, req.body.signature.signature)
 
@@ -32,30 +29,11 @@ function checkSignature (req, res, next) {
       return next()
     }
 
-    logger.error('Signature is not okay in decryptBody for %s.', req.body.signature.host)
+    logger.error('Signature is not okay in body for %s.', req.body.signature.host)
     return res.sendStatus(403)
   })
 }
 
-function decryptBody (req, res, next) {
-  peertubeCrypto.decrypt(req.body.key, req.body.data, function (err, decrypted) {
-    if (err) {
-      logger.error('Cannot decrypt data.', { error: err })
-      return res.sendStatus(500)
-    }
-
-    try {
-      req.body.data = JSON.parse(decrypted)
-      delete req.body.key
-    } catch (err) {
-      logger.error('Error in JSON.parse', { error: err })
-      return res.sendStatus(500)
-    }
-
-    next()
-  })
-}
-
 // ---------------------------------------------------------------------------
 
 module.exports = secureMiddleware