Server: do not enable images tests by default because it needs a special

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

diff --git a/server/middlewares/secure.js b/server/middlewares/secure.js
index bfd28316a3b1551c38508cd09b59510596fb80c6..9779c14ac2a4e30d53b50bfcccbb26b9192096ff 100644 (file)
--- a/server/middlewares/secure.js
+++ b/server/middlewares/secure.js
@@ -1,16 +1,18 @@
 'use strict'
 
-var logger = require('../helpers/logger')
-var peertubeCrypto = require('../helpers/peertubeCrypto')
-var Pods = require('../models/pods')
+const logger = require('../helpers/logger')
+const mongoose = require('mongoose')
+const peertubeCrypto = require('../helpers/peertube-crypto')
 
-var secureMiddleware = {
+const Pod = mongoose.model('Pod')
+
+const secureMiddleware = {
   decryptBody: decryptBody
 }
 
 function decryptBody (req, res, next) {
-  var url = req.body.signature.url
-  Pods.findByUrl(url, function (err, pod) {
+  const url = req.body.signature.url
+  Pod.loadByUrl(url, function (err, pod) {
     if (err) {
       logger.error('Cannot get signed url in decryptBody.', { error: err })
       return res.sendStatus(500)
@@ -23,9 +25,9 @@ function decryptBody (req, res, next) {
 
     logger.debug('Decrypting body from %s.', url)
 
-    var signature_ok = peertubeCrypto.checkSignature(pod.publicKey, url, req.body.signature.signature)
+    const signatureOk = peertubeCrypto.checkSignature(pod.publicKey, url, req.body.signature.signature)
 
-    if (signature_ok === true) {
+    if (signatureOk === true) {
       peertubeCrypto.decrypt(req.body.key, req.body.data, function (err, decrypted) {
         if (err) {
           logger.error('Cannot decrypt data.', { error: err })