From f0f5567b6918fc60c8cab15e13aec03a89a91dfb Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Wed, 16 Mar 2016 22:29:27 +0100
Subject: Use const/let now we use node 4.2
---
server/helpers/customValidators.js | 4 +--
server/helpers/logger.js | 10 ++++----
server/helpers/peertubeCrypto.js | 50 ++++++++++++++++++-------------------
server/helpers/requests.js | 51 ++++++++++++++++++--------------------
server/helpers/utils.js | 4 +--
5 files changed, 58 insertions(+), 61 deletions(-)
(limited to 'server/helpers')
diff --git a/server/helpers/customValidators.js b/server/helpers/customValidators.js
index 20c41f5da..a5ae32780 100644
--- a/server/helpers/customValidators.js
+++ b/server/helpers/customValidators.js
@@ -1,8 +1,8 @@
'use strict'
-var validator = require('validator')
+const validator = require('validator')
-var customValidators = {
+const customValidators = {
eachIsRemoteVideosAddValid: eachIsRemoteVideosAddValid,
eachIsRemoteVideosRemoveValid: eachIsRemoteVideosRemoveValid,
isArray: isArray
diff --git a/server/helpers/logger.js b/server/helpers/logger.js
index 1c15a0edd..d3fce4cc9 100644
--- a/server/helpers/logger.js
+++ b/server/helpers/logger.js
@@ -1,13 +1,13 @@
// Thanks http://tostring.it/2014/06/23/advanced-logging-with-nodejs/
'use strict'
-var config = require('config')
-var path = require('path')
-var winston = require('winston')
+const config = require('config')
+const path = require('path')
+const winston = require('winston')
winston.emitErrs = true
-var logDir = path.join(__dirname, '..', '..', config.get('storage.logs'))
-var logger = new winston.Logger({
+const logDir = path.join(__dirname, '..', '..', config.get('storage.logs'))
+const logger = new winston.Logger({
transports: [
new winston.transports.File({
level: 'debug',
diff --git a/server/helpers/peertubeCrypto.js b/server/helpers/peertubeCrypto.js
index 7e65c43e1..3826ebaf6 100644
--- a/server/helpers/peertubeCrypto.js
+++ b/server/helpers/peertubeCrypto.js
@@ -1,18 +1,18 @@
'use strict'
-var config = require('config')
-var crypto = require('crypto')
-var fs = require('fs')
-var openssl = require('openssl-wrapper')
-var path = require('path')
-var ursa = require('ursa')
+const config = require('config')
+const crypto = require('crypto')
+const fs = require('fs')
+const openssl = require('openssl-wrapper')
+const path = require('path')
+const ursa = require('ursa')
-var logger = require('./logger')
+const logger = require('./logger')
-var certDir = path.join(__dirname, '..', '..', config.get('storage.certs'))
-var algorithm = 'aes-256-ctr'
+const certDir = path.join(__dirname, '..', '..', config.get('storage.certs'))
+const algorithm = 'aes-256-ctr'
-var peertubeCrypto = {
+const peertubeCrypto = {
checkSignature: checkSignature,
createCertsIfNotExist: createCertsIfNotExist,
decrypt: decrypt,
@@ -22,8 +22,8 @@ var peertubeCrypto = {
}
function checkSignature (public_key, raw_data, hex_signature) {
- var crt = ursa.createPublicKey(public_key)
- var is_valid = crt.hashAndVerify('sha256', new Buffer(raw_data).toString('hex'), hex_signature, 'hex')
+ const crt = ursa.createPublicKey(public_key)
+ const is_valid = crt.hashAndVerify('sha256', new Buffer(raw_data).toString('hex'), hex_signature, 'hex')
return is_valid
}
@@ -43,22 +43,22 @@ function decrypt (key, data, callback) {
fs.readFile(getCertDir() + 'peertube.key.pem', function (err, file) {
if (err) return callback(err)
- var my_private_key = ursa.createPrivateKey(file)
- var decrypted_key = my_private_key.decrypt(key, 'hex', 'utf8')
- var decrypted_data = symetricDecrypt(data, decrypted_key)
+ const my_private_key = ursa.createPrivateKey(file)
+ const decrypted_key = my_private_key.decrypt(key, 'hex', 'utf8')
+ const decrypted_data = symetricDecrypt(data, decrypted_key)
return callback(null, decrypted_data)
})
}
function encrypt (public_key, data, callback) {
- var crt = ursa.createPublicKey(public_key)
+ const crt = ursa.createPublicKey(public_key)
symetricEncrypt(data, function (err, dataEncrypted) {
if (err) return callback(err)
- var key = crt.encrypt(dataEncrypted.password, 'utf8', 'hex')
- var encrypted = {
+ const key = crt.encrypt(dataEncrypted.password, 'utf8', 'hex')
+ const encrypted = {
data: dataEncrypted.crypted,
key: key
}
@@ -72,8 +72,8 @@ function getCertDir () {
}
function sign (data) {
- var myKey = ursa.createPrivateKey(fs.readFileSync(certDir + 'peertube.key.pem'))
- var signature = myKey.hashAndSign('sha256', data, 'utf8', 'hex')
+ const myKey = ursa.createPrivateKey(fs.readFileSync(certDir + 'peertube.key.pem'))
+ const signature = myKey.hashAndSign('sha256', data, 'utf8', 'hex')
return signature
}
@@ -93,7 +93,7 @@ function certsExist (callback) {
function createCerts (callback) {
certsExist(function (exist) {
if (exist === true) {
- var string = 'Certs already exist.'
+ const string = 'Certs already exist.'
logger.warning(string)
return callback(new Error(string))
}
@@ -129,8 +129,8 @@ function generatePassword (callback) {
}
function symetricDecrypt (text, password) {
- var decipher = crypto.createDecipher(algorithm, password)
- var dec = decipher.update(text, 'hex', 'utf8')
+ const decipher = crypto.createDecipher(algorithm, password)
+ let dec = decipher.update(text, 'hex', 'utf8')
dec += decipher.final('utf8')
return dec
}
@@ -139,8 +139,8 @@ function symetricEncrypt (text, callback) {
generatePassword(function (err, password) {
if (err) return callback(err)
- var cipher = crypto.createCipher(algorithm, password)
- var crypted = cipher.update(text, 'utf8', 'hex')
+ const cipher = crypto.createCipher(algorithm, password)
+ let crypted = cipher.update(text, 'utf8', 'hex')
crypted += cipher.final('hex')
callback(null, { crypted: crypted, password: password })
})
diff --git a/server/helpers/requests.js b/server/helpers/requests.js
index e19afa5ca..17b1127c0 100644
--- a/server/helpers/requests.js
+++ b/server/helpers/requests.js
@@ -1,19 +1,19 @@
'use strict'
-var async = require('async')
-var config = require('config')
-var request = require('request')
-var replay = require('request-replay')
+const async = require('async')
+const config = require('config')
+const request = require('request')
+const replay = require('request-replay')
-var constants = require('../initializers/constants')
-var logger = require('./logger')
-var peertubeCrypto = require('./peertubeCrypto')
+const constants = require('../initializers/constants')
+const logger = require('./logger')
+const peertubeCrypto = require('./peertubeCrypto')
-var http = config.get('webserver.https') ? 'https' : 'http'
-var host = config.get('webserver.host')
-var port = config.get('webserver.port')
+const http = config.get('webserver.https') ? 'https' : 'http'
+const host = config.get('webserver.host')
+const port = config.get('webserver.port')
-var requests = {
+const requests = {
makeMultipleRetryRequest: makeMultipleRetryRequest
}
@@ -23,8 +23,8 @@ function makeMultipleRetryRequest (all_data, pods, callbackEach, callback) {
callbackEach = null
}
- var url = http + '://' + host + ':' + port
- var signature
+ const url = http + '://' + host + ':' + port
+ let signature
// Add signature if it is specified in the params
if (all_data.method === 'POST' && all_data.data && all_data.sign === true) {
@@ -43,7 +43,7 @@ function makeMultipleRetryRequest (all_data, pods, callbackEach, callback) {
}
}
- var params = {
+ const params = {
url: pod.url + all_data.path,
method: all_data.method
}
@@ -52,19 +52,16 @@ function makeMultipleRetryRequest (all_data, pods, callbackEach, callback) {
if (all_data.method === 'POST' && all_data.data) {
// Encrypt data ?
if (all_data.encrypt === true) {
- // TODO: ES6 with let
- ;(function (copy_params, copy_url, copy_pod, copy_signature) {
- peertubeCrypto.encrypt(pod.publicKey, JSON.stringify(all_data.data), function (err, encrypted) {
- if (err) return callback(err)
-
- copy_params.json = {
- data: encrypted.data,
- key: encrypted.key
- }
-
- makeRetryRequest(copy_params, copy_url, copy_pod, copy_signature, callbackEachRetryRequest)
- })
- })(params, url, pod, signature)
+ peertubeCrypto.encrypt(pod.publicKey, JSON.stringify(all_data.data), function (err, encrypted) {
+ if (err) return callback(err)
+
+ params.json = {
+ data: encrypted.data,
+ key: encrypted.key
+ }
+
+ makeRetryRequest(params, url, pod, signature, callbackEachRetryRequest)
+ })
} else {
params.json = { data: all_data.data }
makeRetryRequest(params, url, pod, signature, callbackEachRetryRequest)
diff --git a/server/helpers/utils.js b/server/helpers/utils.js
index d2c9ad8b2..1f7839673 100644
--- a/server/helpers/utils.js
+++ b/server/helpers/utils.js
@@ -1,8 +1,8 @@
'use strict'
-var logger = require('./logger')
+const logger = require('./logger')
-var utils = {
+const utils = {
cleanForExit: cleanForExit
}
--
cgit v1.2.3