Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-12-29 17:38:04 +01:00
Code Issues Projects Releases Wiki Activity

encrypt cipher data

Browse Source
This commit is contained in:
Kyle Spearrin 2017-10-13 22:34:36 -04:00
parent 925102a86b
commit b5c70c4941
2 changed files with 103 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/models/domainModels.js
View File

@ -154,16 +154,16 @@ var Cipher = function (obj, alreadyEncrypted, localData) {
switch (this.type) {
case 1: // cipherType.login
this.login = new Login2(obj.login);
this.login = new Login2(obj.login, alreadyEncrypted);
break;
case 2: // cipherType.secureNote
this.secureNote = new SecureNote(obj.secureNote);
this.secureNote = new SecureNote(obj.secureNote, alreadyEncrypted);
break;
case 3: // cipherType.card
this.card = new Card(obj.card);
this.card = new Card(obj.card, alreadyEncrypted);
break;
case 4: // cipherType.identity
this.identity = new Identity(obj.identity);
this.identity = new Identity(obj.identity, alreadyEncrypted);
break;
default:
break;
@ -278,6 +278,9 @@ function buildDomainModel(model, obj, map, alreadyEncrypted, notEncList) {
}
(function () {
var bg = chrome.extension.getBackgroundPage(),
cryptoService = bg ? bg.bg_cryptoService : null;
CipherString.prototype.decrypt = function (orgId) {
if (this.decryptedValue) {
var deferred = Q.defer();
@ -286,7 +289,6 @@ function buildDomainModel(model, obj, map, alreadyEncrypted, notEncList) {
}
var self = this;
var cryptoService = chrome.extension.getBackgroundPage().bg_cryptoService;
return cryptoService.getOrgKey(orgId).then(function (orgKey) {
return cryptoService.decrypt(self, orgKey);
}).then(function (decValue) {

133
src/services/loginService.js
View File

@ -22,33 +22,75 @@ function initLoginService() {
id: login.id,
folderId: login.folderId,
favorite: login.favorite,
organizationId: login.organizationId
organizationId: login.organizationId,
type: login.type
};
var orgKey = null;
function encryptCipherData(cipher, model, key, self) {
switch (cipher.type) {
case 1: // cipherType.login
return encryptObjProperty(cipher.login, model.login, {
uri: 'uri',
username: 'username',
password: 'password',
totp: 'totp'
}, key, self);
break;
case 2: // cipherType.secureNote
model.secureNote = {
type: cipher.secureNote.type
};
return Q();
break;
case 3: // cipherType.card
return encryptObjProperty(cipher.card, model.card, {
cardholderName: 'cardholderName',
brand: 'brand',
number: 'number',
expMonth: 'expMonth',
expYear: 'expYear',
code: 'code'
}, key, self);
break;
case 4: // cipherType.identity
return encryptObjProperty(cipher.identity, model.identity, {
title: 'title',
firstName: 'firstName',
middleName: 'middleName',
lastName: 'lastName',
address1: 'address1',
address2: 'address2',
address3: 'address3',
city: 'city',
state: 'state',
postalCode: 'postalCode',
country: 'country',
company: 'company',
email: 'email',
phone: 'phone',
ssn: 'ssn',
username: 'username',
passportNumber: 'passportNumber',
licenseNumber: 'licenseNumber'
}, key, self);
break;
default:
break;
}
}
return self.cryptoService.getOrgKey(login.organizationId).then(function (key) {
orgKey = key;
return self.cryptoService.encrypt(login.name, orgKey);
}).then(function (cs) {
model.name = cs;
return self.cryptoService.encrypt(login.uri, orgKey);
}).then(function (cs) {
model.uri = cs;
return self.cryptoService.encrypt(login.username, orgKey);
}).then(function (cs) {
model.username = cs;
return self.cryptoService.encrypt(login.password, orgKey);
}).then(function (cs) {
model.password = cs;
return self.cryptoService.encrypt(login.notes, orgKey);
}).then(function (cs) {
model.notes = cs;
return self.cryptoService.encrypt(login.totp, orgKey);
}).then(function (cs) {
model.totp = cs;
return self.encryptFields(login.fields, orgKey);
}).then(function (fields) {
model.fields = fields;
return Q.all([
encryptObjProperty(login, model, {
name: 'name',
notes: 'notes'
}, key, self),
encryptCipherData(login, model, key),
self.encryptFields(login.fields, key).then(function (fields) {
model.fields = fields;
})
]);
}).then(function () {
return model;
});
};
@ -78,23 +120,40 @@ function initLoginService() {
type: field.type
};
return Q().then(function () {
if (!field.name || field.name === '') {
return null;
}
return self.cryptoService.encrypt(field.name, key);
}).then(function (cs) {
model.name = cs;
if (!field.value || field.value === '') {
return null;
}
return self.cryptoService.encrypt(field.value, key);
}).then(function (cs) {
model.value = cs;
return encryptObjProperty(field, model, {
name: 'name',
value: 'value'
}, key, self).then(function () {
return model;
});
};
function encryptObjProperty(obj, model, map, key, self) {
var promises = [];
for (var prop in map) {
if (map.hasOwnProperty(prop)) {
/* jshint ignore:start */
(function (theProp) {
var promise = Q().then(function () {
if (obj[map[theProp]] && obj[map[theProp]] !== '') {
return self.cryptoService.encrypt(obj[map[theProp]], key);
}
return null;
}).then(function (val) {
model[theProp] = val;
return;
});
promises.push(promise);
})(prop);
/* jshint ignore:end */
}
}
return Q.all(promises);
}
LoginService.prototype.get = function (id) {
var self = this,
key = null,