From 49fbf2c849c0ce51da6b5a7970277a5c50de56f8 Mon Sep 17 00:00:00 2001 From: Esteban Ordano Date: Tue, 4 Nov 2014 11:47:38 -0300 Subject: [PATCH] Use hmac instead of a second pbkdf --- js/plugins/InsightStorage.js | 56 ++++++++++++++++++++---------------- js/util/crypto.js | 11 +++++++ test/plugin.insight.js | 9 +++--- test/util.crypto.js | 3 ++ 4 files changed, 51 insertions(+), 28 deletions(-) diff --git a/js/plugins/InsightStorage.js b/js/plugins/InsightStorage.js index 5d5d2f88c..f360ce439 100644 --- a/js/plugins/InsightStorage.js +++ b/js/plugins/InsightStorage.js @@ -4,6 +4,8 @@ var buffers = require('buffer'); var querystring = require('querystring'); var Identity = require('../models/Identity'); +var SEPARATOR = '|'; + function InsightStorage(config) { this.type = 'DB'; this.storeUrl = config.url || 'https://test-insight.bitpay.com:443/api/email'; @@ -15,6 +17,7 @@ InsightStorage.prototype.init = function () {}; InsightStorage.prototype.setCredentials = function(email, password, opts) { this.email = email; this.password = password; + this._cachedKey = null; }; InsightStorage.prototype.createItem = function(name, value, callback) { @@ -35,24 +38,23 @@ function mayBeOldPassword(password) { } InsightStorage.prototype.getItem = function(name, callback) { - var key = cryptoUtil.kdf(this.password + this.email); - var secret = this.makeSecret(key); + var passphrase = this.getPassphrase(); var self = this; - this._makeGetRequest(secret, name, function(err, body) { + this._makeGetRequest(passphrase, name, function(err, body) { if (err && err.indexOf('PNOTFOUND') !== -1 && mayBeOldPassword(self.password)) { - return self._brokenGetItem(key, name, callback); + return self._brokenGetItem(name, callback); } return callback(err, body); }); }; -InsightStorage.prototype.makeSecret = function(key) { - return cryptoUtil.kdf(key + this.password); +InsightStorage.prototype.getPassphrase = function() { + return cryptoUtil.hmac(this.getKey(), this.password); }; -InsightStorage.prototype._makeGetRequest = function(secret, key, callback) { - var authHeader = new Buffer(this.email + ':' + secret).toString('base64'); +InsightStorage.prototype._makeGetRequest = function(passphrase, key, callback) { + var authHeader = new buffers.Buffer(this.email + ':' + passphrase).toString('base64'); var retrieveUrl = this.storeUrl + '/retrieve'; this.request.get({ url: retrieveUrl + '?' + querystring.encode({key: key}), @@ -73,12 +75,12 @@ InsightStorage.prototype._makeGetRequest = function(secret, key, callback) { ); }; -InsightStorage.prototype._brokenGetItem = function(key, name, callback) { - var secret = this._makeBrokenSecret(key); +InsightStorage.prototype._brokenGetItem = function(name, callback) { + var passphrase = this._makeBrokenSecret(); var self = this; - this._makeGetRequest(secret, name, function(err, body) { + this._makeGetRequest(passphrase, name, function(err, body) { if (!err) { - return self._changePassword(function(err) { + return self._changePassphrase(function(err) { if (err) { return callback(err); } @@ -89,22 +91,29 @@ InsightStorage.prototype._brokenGetItem = function(key, name, callback) { }); }; -InsightStorage.prototype._makeBrokenSecret = function(key) { +InsightStorage.prototype.getKey = function() { + if (!this._cachedKey) { + this._cachedKey = cryptoUtil.kdf(this.password + SEPARATOR + this.email); + } + return this._cachedKey; +}; + +InsightStorage.prototype._makeBrokenSecret = function() { + var key = cryptoUtil.kdf(this.password + this.email); return cryptoUtil.kdf(key, this.password); }; -InsightStorage.prototype._changePassword = function(callback) { - var key = cryptoUtil.kdf(this.password + this.email); - var secret = this._makeBrokenSecret(key); - var newSecret = this.makeSecret(key); +InsightStorage.prototype._changePassphrase = function(callback) { + var passphrase = this._makeBrokenSecret(); + var newPassphrase = this.getPassphrase(); + var authHeader = new buffers.Buffer(this.email + ':' + passphrase).toString('base64'); var url = this.storeUrl + '/change_passphrase'; this.request.post({ url: url, + headers: {'Authorization': authHeader}, body: querystring.encode({ - email: this.email, - secret: secret, - newSecret: newSecret + newPassphrase: newPassphrase }) }, function(err, response, body) { if (err) { @@ -121,15 +130,14 @@ InsightStorage.prototype._changePassword = function(callback) { }; InsightStorage.prototype.setItem = function(name, value, callback) { - var key = cryptoUtil.kdf(this.password + this.email); - var secret = this.makeSecret(key); + var passphrase = this.getPassphrase(); + var authHeader = new buffers.Buffer(this.email + ':' + passphrase).toString('base64'); var registerUrl = this.storeUrl + '/register'; this.request.post({ url: registerUrl, + headers: {'Authorization': authHeader}, body: querystring.encode({ key: name, - email: this.email, - secret: secret, record: value }) }, function(err, response, body) { diff --git a/js/util/crypto.js b/js/util/crypto.js index 46da407df..b1a521c0c 100644 --- a/js/util/crypto.js +++ b/js/util/crypto.js @@ -23,6 +23,17 @@ module.exports = { ); }, + /** + * @param {string} key + * @param {string} data + * @return {string} base64 encoded hmac + */ + hmac: function(key, data) { + return sjcl.codec.base64.fromBits( + new sjcl.misc.hmac(key, sjcl.hash.sha256).encrypt(data) + ); + }, + /** * @param {string} password * @param {string} salt - base64 encoded, defaults to 'mjuBtGybi/4=' diff --git a/test/plugin.insight.js b/test/plugin.insight.js index 2a202c849..77d323c96 100644 --- a/test/plugin.insight.js +++ b/test/plugin.insight.js @@ -14,8 +14,7 @@ describe('insight storage plugin', function() { var oldSecret = 'rFA+F/N+ZvKXp717zBdfCKYQ5v9Fjry0W6tautj5etIH' + 'KLQliZBEYXA7AXjTJ9K3DglzGWJKost3QJUCMbhM/A==' - var newSecret = '2YTcmtkmC/WSVrfmjAEyOmDnmntVQ8A9wS/q1DbD6rkc' - + 'si8LrIvS2Ru85Feb5Bvk2ziQbEN6PzlL1mIyQ3a+Vw==' + var newSecret = '+72pwnQ/ukrXVXZ/L4vFeiykwn522uVz0J6p81TGXvI='; var setupStorageCredentials = function() { storage.setCredentials(email, password); @@ -122,8 +121,10 @@ describe('insight storage plugin', function() { var url = requestMock.post.firstCall.args[0].url; var args = querystring.decode(receivedArgs); assert(url.indexOf('change_passphrase') !== -1); - assert(args.secret === oldSecret); - assert(args.newSecret === newSecret); + assert(requestMock.post.firstCall.args[0].headers.Authorization + === + new Buffer(email + ':' + oldSecret).toString('base64')); + assert(args.newPassphrase === newSecret); done(); }); } diff --git a/test/util.crypto.js b/test/util.crypto.js index cc991b947..2cb42211c 100644 --- a/test/util.crypto.js +++ b/test/util.crypto.js @@ -50,6 +50,9 @@ describe('crypto utils', function() { }); it('should generate a passphrase from weird chars', function() { var phrase = cryptoUtils.kdf('Pwd123!@#$%^&*(){}[]\|/?.>,<=+-_`~åéþ䲤þçæ¶'); + var expected = 'CZwb5KdikvZHVsEoZUdJckAy+yyzGnd++XhyqxJXbc30' + + 'pEoO+WqHgqBbdf0gn2wiyWZv3zymB+7L75Xnz3uSlg=='; + phrase.should.equal(expected); }); });