Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-09-18 02:41:15 +02:00
Code Issues Projects Releases Wiki Activity

set private key when logging in

Browse Source
This commit is contained in:
Kyle Spearrin 2017-02-21 00:29:15 -05:00
parent 086d924f06
commit cf144aa2c1
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/services/authService.js
View File

@ -33,6 +33,9 @@ angular
tokenService.setToken(response.access_token); tokenService.setToken(response.access_token);
tokenService.setRefreshToken(response.refresh_token); tokenService.setRefreshToken(response.refresh_token);
cryptoService.setKey(key); cryptoService.setKey(key);
if (response.EncryptedPrivateKey) {
cryptoService.setPrivateKey(response.EncryptedPrivateKey, key);
}
deferred.resolve(); deferred.resolve();
}, function (error) { }, function (error) {
if (error.status === 400 && error.data.TwoFactorProviders && error.data.TwoFactorProviders.length) { if (error.status === 400 && error.data.TwoFactorProviders && error.data.TwoFactorProviders.length) {

34
src/app/services/cryptoService.js
View File

@ -12,9 +12,15 @@ angular
$sessionStorage.key = forge.util.encode64(key); $sessionStorage.key = forge.util.encode64(key);
}; };
_service.setPrivateKey = function (privateKey) { _service.setPrivateKey = function (privateKeyCt, key) {
_privateKey = privateKey; try {
$sessionStorage.privateKey = forge.util.encode64(privateKey); var privateKey = _service.decrypt(privateKeyCt, key, 'raw');
_privateKey = privateKey;
$sessionStorage.privateKey = forge.util.encode64(privateKey);
}
catch (e) {
console.log('Cannot set private key. Decryption failed.');
}
}; };
_service.getKey = function (b64) { _service.getKey = function (b64) {
@ -121,7 +127,7 @@ angular
return forge.util.encode64(hashBits); return forge.util.encode64(hashBits);
}; };
_service.encrypt = function (plainValue, key, encoding) { _service.encrypt = function (plainValue, key, plainValueEncoding) {
if (!_service.getKey() && !key) { if (!_service.getKey() && !key) {
throw 'Encryption key unavailable.'; throw 'Encryption key unavailable.';
} }
@ -135,8 +141,8 @@ angular
encKey = key || _service.getKey(); encKey = key || _service.getKey();
} }
encoding = encoding || 'utf8'; plainValueEncoding = plainValueEncoding || 'utf8';
var buffer = forge.util.createBuffer(plainValue, encoding); var buffer = forge.util.createBuffer(plainValue, plainValueEncoding);
var ivBytes = forge.random.getBytesSync(16); var ivBytes = forge.random.getBytesSync(16);
var cipher = forge.cipher.createCipher('AES-CBC', encKey); var cipher = forge.cipher.createCipher('AES-CBC', encKey);
cipher.start({ iv: ivBytes }); cipher.start({ iv: ivBytes });
@ -157,9 +163,9 @@ angular
return cipherString; return cipherString;
}; };
_service.decrypt = function (encValue, outputEncoding) { _service.decrypt = function (encValue, key, outputEncoding) {
if (!_service.getKey()) { if (!_service.getKey() && !key) {
throw 'AES encryption unavailable.'; throw 'Encryption key unavailable.';
} }
var encPieces = encValue.split('|'); var encPieces = encValue.split('|');
@ -179,8 +185,16 @@ angular
} }
} }
var encKey;
if (computedMac) {
encKey = _service.getEncKey(key);
}
else {
encKey = key || _service.getKey();
}
var ctBuffer = forge.util.createBuffer(ctBytes); var ctBuffer = forge.util.createBuffer(ctBytes);
var decipher = forge.cipher.createDecipher('AES-CBC', computedMac ? _service.getEncKey() : _service.getKey()); var decipher = forge.cipher.createDecipher('AES-CBC', encKey);
decipher.start({ iv: ivBytes }); decipher.start({ iv: ivBytes });
decipher.update(ctBuffer); decipher.update(ctBuffer);
decipher.finish(); decipher.finish();