From 9f10b2928df655c3672d9607e864e667d4bc903a Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Sun, 7 Feb 2016 11:23:23 +0100 Subject: Remove useless anonymous functions of files --- helpers/peertubeCrypto.js | 252 +++++++++++++++++++++++----------------------- 1 file changed, 125 insertions(+), 127 deletions(-) (limited to 'helpers/peertubeCrypto.js') diff --git a/helpers/peertubeCrypto.js b/helpers/peertubeCrypto.js index 9031f6ae5..29b9d79c9 100644 --- a/helpers/peertubeCrypto.js +++ b/helpers/peertubeCrypto.js @@ -1,149 +1,147 @@ -;(function () { - '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') - - var logger = require('./logger') - - var certDir = path.join(__dirname, '..', config.get('storage.certs')) - var algorithm = 'aes-256-ctr' - - var peertubeCrypto = { - checkSignature: checkSignature, - createCertsIfNotExist: createCertsIfNotExist, - decrypt: decrypt, - encrypt: encrypt, - getCertDir: getCertDir, - sign: sign - } - - 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') - return is_valid - } - - function createCertsIfNotExist (callback) { - certsExist(function (exist) { - if (exist === true) { - return callback(null) - } - - createCerts(function (err) { - return callback(err) - }) +'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') + +var logger = require('./logger') + +var certDir = path.join(__dirname, '..', config.get('storage.certs')) +var algorithm = 'aes-256-ctr' + +var peertubeCrypto = { + checkSignature: checkSignature, + createCertsIfNotExist: createCertsIfNotExist, + decrypt: decrypt, + encrypt: encrypt, + getCertDir: getCertDir, + sign: sign +} + +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') + return is_valid +} + +function createCertsIfNotExist (callback) { + certsExist(function (exist) { + if (exist === true) { + return callback(null) + } + + createCerts(function (err) { + return callback(err) }) - } + }) +} - function decrypt (key, data, callback) { - fs.readFile(getCertDir() + 'peertube.key.pem', function (err, file) { - if (err) return callback(err) +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) + var my_private_key = ursa.createPrivateKey(file) + var decrypted_key = my_private_key.decrypt(key, 'hex', 'utf8') + var decrypted_data = symetricDecrypt(data, decrypted_key) - return callback(null, decrypted_data) - }) - } + return callback(null, decrypted_data) + }) +} - function encrypt (public_key, data, callback) { - var crt = ursa.createPublicKey(public_key) +function encrypt (public_key, data, callback) { + var crt = ursa.createPublicKey(public_key) - symetricEncrypt(data, function (err, dataEncrypted) { - if (err) return callback(err) + symetricEncrypt(data, function (err, dataEncrypted) { + if (err) return callback(err) - var key = crt.encrypt(dataEncrypted.password, 'utf8', 'hex') - var encrypted = { - data: dataEncrypted.crypted, - key: key - } + var key = crt.encrypt(dataEncrypted.password, 'utf8', 'hex') + var encrypted = { + data: dataEncrypted.crypted, + key: key + } - callback(null, encrypted) - }) - } + callback(null, encrypted) + }) +} - function getCertDir () { - return certDir - } +function getCertDir () { + return certDir +} - function sign (data) { - var myKey = ursa.createPrivateKey(fs.readFileSync(certDir + 'peertube.key.pem')) - var signature = myKey.hashAndSign('sha256', data, 'utf8', 'hex') +function sign (data) { + var myKey = ursa.createPrivateKey(fs.readFileSync(certDir + 'peertube.key.pem')) + var signature = myKey.hashAndSign('sha256', data, 'utf8', 'hex') - return signature - } + return signature +} - // --------------------------------------------------------------------------- +// --------------------------------------------------------------------------- - module.exports = peertubeCrypto +module.exports = peertubeCrypto - // --------------------------------------------------------------------------- +// --------------------------------------------------------------------------- - function certsExist (callback) { - fs.exists(certDir + 'peertube.key.pem', function (exists) { - return callback(exists) - }) - } - - function createCerts (callback) { - certsExist(function (exist) { - if (exist === true) { - var string = 'Certs already exist.' - logger.warning(string) - return callback(new Error(string)) +function certsExist (callback) { + fs.exists(certDir + 'peertube.key.pem', function (exists) { + return callback(exists) + }) +} + +function createCerts (callback) { + certsExist(function (exist) { + if (exist === true) { + var string = 'Certs already exist.' + logger.warning(string) + return callback(new Error(string)) + } + + logger.info('Generating a RSA key...') + openssl.exec('genrsa', { 'out': certDir + 'peertube.key.pem', '2048': false }, function (err) { + if (err) { + logger.error('Cannot create private key on this pod.') + return callback(err) } + logger.info('RSA key generated.') - logger.info('Generating a RSA key...') - openssl.exec('genrsa', { 'out': certDir + 'peertube.key.pem', '2048': false }, function (err) { + logger.info('Manage public key...') + openssl.exec('rsa', { 'in': certDir + 'peertube.key.pem', 'pubout': true, 'out': certDir + 'peertube.pub' }, function (err) { if (err) { - logger.error('Cannot create private key on this pod.') + logger.error('Cannot create public key on this pod.') return callback(err) } - logger.info('RSA key generated.') - - logger.info('Manage public key...') - openssl.exec('rsa', { 'in': certDir + 'peertube.key.pem', 'pubout': true, 'out': certDir + 'peertube.pub' }, function (err) { - if (err) { - logger.error('Cannot create public key on this pod.') - return callback(err) - } - - logger.info('Public key managed.') - return callback(null) - }) - }) - }) - } - function generatePassword (callback) { - crypto.randomBytes(32, function (err, buf) { - if (err) return callback(err) - - callback(null, buf.toString('utf8')) - }) - } - - function symetricDecrypt (text, password) { - var decipher = crypto.createDecipher(algorithm, password) - var dec = decipher.update(text, 'hex', 'utf8') - dec += decipher.final('utf8') - return dec - } - - 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') - crypted += cipher.final('hex') - callback(null, { crypted: crypted, password: password }) + logger.info('Public key managed.') + return callback(null) + }) }) - } -})() + }) +} + +function generatePassword (callback) { + crypto.randomBytes(32, function (err, buf) { + if (err) return callback(err) + + callback(null, buf.toString('utf8')) + }) +} + +function symetricDecrypt (text, password) { + var decipher = crypto.createDecipher(algorithm, password) + var dec = decipher.update(text, 'hex', 'utf8') + dec += decipher.final('utf8') + return dec +} + +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') + crypted += cipher.final('hex') + callback(null, { crypted: crypted, password: password }) + }) +} -- cgit v1.2.3