Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-23 11:56:00 +01:00
Code Issues Projects Releases Wiki Activity

service fixes for ciphers

Browse Source
This commit is contained in:
Kyle Spearrin 2017-10-14 14:27:14 -04:00
parent 5a1bf8299f
commit 355a58f67c
5 changed files with 179 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/background.js
View File

@ -38,7 +38,8 @@ var bg_isBackground = true,
bg_environmentService = new EnvironmentService(bg_constantsService, bg_apiService);
bg_userService = new UserService(bg_tokenService, bg_apiService, bg_cryptoService, bg_utilsService);
bg_settingsService = new SettingsService(bg_userService, bg_utilsService);
bg_loginService = new LoginService(bg_cryptoService, bg_userService, bg_apiService, bg_settingsService, bg_utilsService);
bg_loginService = new LoginService(bg_cryptoService, bg_userService, bg_apiService, bg_settingsService, bg_utilsService,
bg_constantsService);
bg_folderService = new FolderService(bg_cryptoService, bg_userService, bg_apiService, bg_i18nService, bg_utilsService);
bg_lockService = new LockService(bg_constantsService, bg_cryptoService, bg_folderService, bg_loginService, bg_utilsService,
setIcon, refreshBadgeAndMenu);

9
src/models/api/requestModels.js
View File

@ -6,8 +6,9 @@
this.notes = cipher.notes ? cipher.notes.encryptedString : null;
this.favorite = cipher.favorite;
var constantsService = chrome.extension.getBackgroundPage().bg_constantsService;
switch (type) {
case 1: // cipherType.login
case constantsService.cipherType.login:
this.login = {
uri: cipher.login.uri ? cipher.login.uri.encryptedString : null,
username: cipher.login.username ? cipher.login.username.encryptedString : null,
@ -15,12 +16,12 @@
totp: cipher.login.totp ? cipher.login.totp.encryptedString : null
};
break;
case 2: // cipherType.secureNote
case constantsService.cipherType.secureNote:
this.secureNote = {
type: cipher.secureNote.type
};
break;
case 3: // cipherType.card
case constantsService.cipherType.card:
this.card = {
cardholderName: cipher.card.cardholderName ? cipher.card.cardholderName.encryptedString : null,
brand: cipher.card.brand ? cipher.card.brand.encryptedString : null,
@ -30,7 +31,7 @@
code: cipher.card.code ? cipher.card.code.encryptedString : null
};
break;
case 4: // cipherType.identity
case constantsService.cipherType.identity:
this.identity = {
title: cipher.identity.title ? cipher.identity.title.encryptedString : null,
firstName: cipher.identity.firstName ? cipher.identity.firstName.encryptedString : null,

9
src/models/dataModels.js
View File

@ -62,17 +62,18 @@ var CipherData = function (response, userId) {
this.name = response.data.Name;
this.notes = response.notes = response.data.Notes;
var constantsService = chrome.extension.getBackgroundPage().bg_constantsService;
switch (this.type) {
case 1: // cipherType.login
case constantsService.cipherType.login:
this.login = new LoginData2(response.data);
break;
case 2: // cipherType.secureNote
case constantsService.cipherType.secureNote:
this.secureNote = new SecureNoteData(response.data);
break;
case 3: // cipherType.card
case constantsService.cipherType.card:
this.card = new CardData(response.data);
break;
case 4: // cipherType.identity
case constantsService.cipherType.identity:
this.identity = new IdentityData(response.data);
break;
default:

197
src/models/domainModels.js
View File

@ -5,6 +5,7 @@ var CipherString = function () {
this.cipherText = null;
this.initializationVector = null;
this.mac = null;
this.cryptoService = chrome.extension.getBackgroundPage().bg_cryptoService;
var constants = chrome.extension.getBackgroundPage().bg_constantsService;
@ -138,12 +139,14 @@ var Login = function (obj, alreadyEncrypted, localData) {
};
var Cipher = function (obj, alreadyEncrypted, localData) {
this.constantsService = chrome.extension.getBackgroundPage().bg_constantsService;
buildDomainModel(this, obj, {
id: 'id',
organizationId: 'organizationId',
folderId: 'folderId',
name: 'name',
notes: 'notes'
id: null,
organizationId: null,
folderId: null,
name: null,
notes: null
}, alreadyEncrypted, ['id', 'organizationId', 'folderId']);
this.type = obj.type;
@ -153,16 +156,16 @@ var Cipher = function (obj, alreadyEncrypted, localData) {
this.localData = localData;
switch (this.type) {
case 1: // cipherType.login
case this.constantsService.cipherType.login:
this.login = new Login2(obj.login, alreadyEncrypted);
break;
case 2: // cipherType.secureNote
case this.constantsService.cipherType.secureNote:
this.secureNote = new SecureNote(obj.secureNote, alreadyEncrypted);
break;
case 3: // cipherType.card
case this.constantsService.cipherType.card:
this.card = new Card(obj.card, alreadyEncrypted);
break;
case 4: // cipherType.identity
case this.constantsService.cipherType.identity:
this.identity = new Identity(obj.identity, alreadyEncrypted);
break;
default:
@ -193,44 +196,44 @@ var Cipher = function (obj, alreadyEncrypted, localData) {
var Login2 = function (obj, alreadyEncrypted) {
buildDomainModel(this, obj, {
uri: 'uri',
username: 'username',
password: 'password',
totp: 'totp'
uri: null,
username: null,
password: null,
totp: null
}, alreadyEncrypted, []);
};
var Identity = function (obj, alreadyEncrypted) {
buildDomainModel(this, obj, {
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'
title: null,
firstName: null,
middleName: null,
lastName: null,
address1: null,
address2: null,
address3: null,
city: null,
state: null,
postalCode: null,
country: null,
company: null,
email: null,
phone: null,
ssn: null,
username: null,
passportNumber: null,
licenseNumber: null
}, alreadyEncrypted, []);
};
var Card = function (obj, alreadyEncrypted) {
buildDomainModel(this, obj, {
cardholderName: 'cardholderName',
brand: 'brand',
number: 'number',
expMonth: 'expMonth',
expYear: 'expYear',
code: 'code'
cardholderName: null,
brand: null,
number: null,
expMonth: null,
expYear: null,
code: null
}, alreadyEncrypted, []);
};
@ -241,25 +244,25 @@ var SecureNote = function (obj, alreadyEncrypted) {
var Field = function (obj, alreadyEncrypted) {
this.type = obj.type;
buildDomainModel(this, obj, {
name: 'name',
value: 'value'
name: null,
value: null
}, alreadyEncrypted, []);
};
var Attachment = function (obj, alreadyEncrypted) {
this.size = obj.size;
buildDomainModel(this, obj, {
id: 'id',
url: 'url',
sizeName: 'sizeName',
fileName: 'fileName'
id: null,
url: null,
sizeName: null,
fileName: null
}, alreadyEncrypted, ['id', 'url', 'sizeName']);
};
var Folder = function (obj, alreadyEncrypted) {
buildDomainModel(this, obj, {
id: 'id',
name: 'name'
id: null,
name: null
}, alreadyEncrypted, ['id']);
};
@ -267,11 +270,12 @@ function buildDomainModel(model, obj, map, alreadyEncrypted, notEncList) {
notEncList = notEncList || [];
for (var prop in map) {
if (map.hasOwnProperty(prop)) {
var objProp = obj[(map[prop] || prop)];
if (alreadyEncrypted === true || notEncList.indexOf(prop) > -1) {
model[prop] = obj[map[prop]] ? obj[map[prop]] : null;
model[prop] = objProp ? objProp : null;
}
else {
model[prop] = obj[map[prop]] ? new CipherString(obj[map[prop]]) : null;
model[prop] = objProp ? new CipherString(objProp) : null;
}
}
}
@ -283,10 +287,9 @@ function buildDomainModel(model, obj, map, alreadyEncrypted, notEncList) {
return Q(this.decryptedValue);
}
var self = this,
cryptoService = chrome.extension.getBackgroundPage().bg_cryptoService;
return cryptoService.getOrgKey(orgId).then(function (orgKey) {
return cryptoService.decrypt(self, orgKey);
var self = this;
return self.cryptoService.getOrgKey(orgId).then(function (orgKey) {
return self.cryptoService.decrypt(self, orgKey);
}).then(function (decValue) {
self.decryptedValue = decValue;
return self.decryptedValue;
@ -380,6 +383,7 @@ function buildDomainModel(model, obj, map, alreadyEncrypted, notEncList) {
Cipher.prototype.decrypt = function () {
var self = this;
var model = {
id: self.id,
organizationId: self.organizationId,
@ -393,36 +397,36 @@ function buildDomainModel(model, obj, map, alreadyEncrypted, notEncList) {
var fields = [];
return decryptObj(model, this, {
name: 'name',
notes: 'notes'
}, null).then(function () {
name: null,
notes: null
}, self.organizationId).then(function () {
switch (self.type) {
case 1: // cipherType.login
case self.constantsService.cipherType.login:
return self.login.decrypt(self.organizationId);
case 2: // cipherType.secureNote
case self.constantsService.cipherType.secureNote:
return self.secureNote.decrypt(self.organizationId);
case 3: // cipherType.card
case self.constantsService.cipherType.card:
return self.card.decrypt(self.organizationId);
case 4: // cipherType.identity
case self.constantsService.cipherType.identity:
return self.identity.decrypt(self.organizationId);
default:
return;
}
}).then(function (decObj) {
switch (self.type) {
case 1: // cipherType.login
case self.constantsService.cipherType.login:
model.login = decObj;
model.subTitle = model.login.username;
break;
case 2: // cipherType.secureNote
case self.constantsService.cipherType.secureNote:
model.secureNote = decObj;
model.subTitle = '-';
break;
case 3: // cipherType.card
case self.constantsService.cipherType.card:
model.card = decObj;
model.subTitle = model.identity.brand;
break;
case 4: // cipherType.identity
case self.constantsService.cipherType.identity:
model.identity = decObj;
model.subTitle = model.identity.firstName;
break;
@ -464,21 +468,21 @@ function buildDomainModel(model, obj, map, alreadyEncrypted, notEncList) {
Login2.prototype.decrypt = function (orgId) {
return decryptObj({}, this, {
uri: 'uri',
username: 'username',
password: 'password',
totp: 'totp'
uri: null,
username: null,
password: null,
totp: null
}, orgId);
};
Card.prototype.decrypt = function (orgId) {
return decryptObj({}, this, {
cardholderName: 'cardholderName',
brand: 'brand',
number: 'number',
expMonth: 'expMonth',
expYear: 'expYear',
code: 'code'
cardholderName: null,
brand: null,
number: null,
expMonth: null,
expYear: null,
code: null
}, orgId);
};
@ -490,24 +494,24 @@ function buildDomainModel(model, obj, map, alreadyEncrypted, notEncList) {
Identity.prototype.decrypt = function (orgId) {
return decryptObj({}, this, {
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'
title: null,
firstName: null,
middleName: null,
lastName: null,
address1: null,
address2: null,
address3: null,
city: null,
state: null,
postalCode: null,
country: null,
company: null,
email: null,
phone: null,
ssn: null,
username: null,
passportNumber: null,
licenseNumber: null
}, orgId);
};
@ -517,8 +521,8 @@ function buildDomainModel(model, obj, map, alreadyEncrypted, notEncList) {
};
return decryptObj(model, this, {
name: 'name',
value: 'value'
name: null,
value: null
}, orgId);
};
@ -531,7 +535,7 @@ function buildDomainModel(model, obj, map, alreadyEncrypted, notEncList) {
};
return decryptObj(model, this, {
fileName: 'fileName'
fileName: null
}, orgId);
};
@ -542,7 +546,7 @@ function buildDomainModel(model, obj, map, alreadyEncrypted, notEncList) {
};
return decryptObj(model, this, {
name: 'name'
name: null
}, null);
};
@ -553,8 +557,9 @@ function buildDomainModel(model, obj, map, alreadyEncrypted, notEncList) {
/* jshint ignore:start */
(function (theProp) {
var promise = Q().then(function () {
if (self[map[theProp]]) {
return self[map[theProp]].decrypt(orgId);
var mapProp = map[theProp] || theProp;
if (self[mapProp]) {
return self[mapProp].decrypt(orgId);
}
return null;
}).then(function (val) {

123
src/services/loginService.js
View File

@ -1,11 +1,13 @@
function LoginService(cryptoService, userService, apiService, settingsService, utilsService) {
function LoginService(cryptoService, userService, apiService, settingsService, utilsService, constantsService) {
this.cryptoService = cryptoService;
this.userService = userService;
this.apiService = apiService;
this.settingsService = settingsService;
this.utilsService = utilsService;
this.constantsService = constantsService;
this.decryptedCipherCache = null;
this.localDataKey = 'sitesLocalData';
this.neverDomainsKey = 'neverDomains';
initLoginService();
}
@ -28,62 +30,58 @@ function initLoginService() {
function encryptCipherData(cipher, model, key, self) {
switch (cipher.type) {
case 1: // cipherType.login
case constantsService.cipherType.login:
return encryptObjProperty(cipher.login, model.login, {
uri: 'uri',
username: 'username',
password: 'password',
totp: 'totp'
uri: null,
username: null,
password: null,
totp: null
}, key, self);
break;
case 2: // cipherType.secureNote
case constantsService.cipherType.secureNote:
model.secureNote = {
type: cipher.secureNote.type
};
return Q();
break;
case 3: // cipherType.card
case constantsService.cipherType.card:
return encryptObjProperty(cipher.card, model.card, {
cardholderName: 'cardholderName',
brand: 'brand',
number: 'number',
expMonth: 'expMonth',
expYear: 'expYear',
code: 'code'
cardholderName: null,
brand: null,
number: null,
expMonth: null,
expYear: null,
code: null
}, key, self);
break;
case 4: // cipherType.identity
case constantsService.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'
title: null,
firstName: null,
middleName: null,
lastName: null,
address1: null,
address2: null,
address3: null,
city: null,
state: null,
postalCode: null,
country: null,
company: null,
email: null,
phone: null,
ssn: null,
username: null,
passportNumber: null,
licenseNumber: null
}, key, self);
break;
default:
break;
throw 'Unknown type.';
}
}
return self.cryptoService.getOrgKey(login.organizationId).then(function (key) {
return Q.all([
encryptObjProperty(login, model, {
name: 'name',
notes: 'notes'
name: null,
notes: null
}, key, self),
encryptCipherData(login, model, key),
self.encryptFields(login.fields, key).then(function (fields) {
@ -121,8 +119,8 @@ function initLoginService() {
};
return encryptObjProperty(field, model, {
name: 'name',
value: 'value'
name: null,
value: null
}, key, self).then(function () {
return model;
});
@ -136,8 +134,9 @@ function initLoginService() {
/* 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);
var objProb = obj[(map[theProp] || theProp)];
if (objProb && objProb !== '') {
return self.cryptoService.encrypt(objProb, key);
}
return null;
}).then(function (val) {
@ -204,22 +203,26 @@ function initLoginService() {
};
LoginService.prototype.getAllDecrypted = function () {
var self = this,
decCiphers = [];
if (this.decryptedCipherCache) {
return Q(this.decryptedCipherCache);
}
return self.cryptoService.getKey().then(function (key) {
var deferred = Q.defer(),
decCiphers = [],
self = this;
self.cryptoService.getKey().then(function (key) {
if (!key) {
deferred.reject();
return;
}
if (self.decryptedCipherCache) {
deferred.resolve(self.decryptedCipherCache);
return;
return true;
}
return self.getAll();
}).then(function (ciphers) {
if (ciphers === true) {
return;
}
var promises = [];
for (var i = 0; i < ciphers.length; i++) {
/* jshint ignore:start */
@ -230,10 +233,16 @@ function initLoginService() {
}
return Q.all(promises);
}).then(function () {
}).then(function (stop) {
if (stop === true) {
return;
}
self.decryptedCipherCache = decCiphers;
return self.decryptedCipherCache;
deferred.resolve(self.decryptedCipherCache);
});
return deferred.promise;
};
LoginService.prototype.getAllDecryptedForFolder = function (folderId) {
@ -460,8 +469,8 @@ function initLoginService() {
return Q();
}
var key = 'neverDomains';
return self.utilsService.getObjFromStorage(key).then(function (domains) {
var self = this;
return self.utilsService.getObjFromStorage(self.neverDomainsKey).then(function (domains) {
if (!domains) {
domains = {};
}