mirror of
https://github.com/bitwarden/browser
synced 2024-12-24 09:02:40 +01:00
a42de41587
* move pinKeyEncryptedUserKey * move pinKeyEncryptedUserKeyEphemeral * remove comments, move docs * cleanup * use UserKeyDefinition * refactor methods * add migration * fix browser dependency * add tests for migration * rename to pinService * move state to PinService * add PinService dep to CryptoService * move protectedPin to state provider * update service deps * renaming * move decryptUserKeyWithPin to pinService * update service injection * move more methods our of crypto service * remove CryptoService dep from PinService and update service injection * remove cryptoService reference * add method to FakeMasterPasswordService * fix circular dependency * fix desktop service injection * update browser dependencies * add protectedPin to migrations * move storePinKey to pinService * update and clarify documentation * more jsdoc updates * update import paths * refactor isPinLockSet method * update state definitions * initialize service before injecting into other services * initialize service before injecting into other services (bw.ts) * update clearOn and do additional cleanup * clarify docs and naming * assign abstract & private methods, add clarity to decryptAndMigrateOldPinKeyEncryptedMasterKey() method * derived state (attempt) * fix typos * use accountService to get active user email * use constant userId * add derived state * add get and clear for oldPinKeyEncryptedMasterKey * require userId * move pinProtected * add clear methods * remove pinProtected from account.ts and replace methods * add methods to create and store pinKeyEncryptedUserKey * add pinProtected/oldPinKeyEncrypterMasterKey to migration * update migration tests * update migration rollback tests * update to systemService and decryptAndMigrate... method * remove old test * increase length of state definition name to meet test requirements * rename 'TRANSIENT' to 'EPHEMERAL' for consistency * fix tests for login strategies, vault-export, and fake MP service * more updates to login-strategy tests * write new tests for core pinKeyEncrypterUserKey methods and isPinSet * write new tests for pinProtected and oldPinKeyEncryptedMasterKey methods * minor test reformatting * update test for decryptUserKeyWithPin() * fix bug with oldPinKeyEncryptedMasterKey * fix tests for vault-timeout-settings.service * fix bitwarden-password-protected-importer test * fix login strategy tests and auth-request.service test * update pinService tests * fix crypto service tests * add jsdoc * fix test file import * update jsdocs for decryptAndMigrateOldPinKeyEncryptedMasterKey() * update error messages and jsdocs * add null checks, move userId retrievals * update migration tests * update stateService calls to require userId * update test for decryptUserKeyWithPin() * update oldPinKeyEncryptedMasterKey migration tests * more test updates * fix factory import * update tests for isPinSet() and createProtectedPin() * add test for makePinKey() * add test for createPinKeyEncryptedUserKey() * add tests for getPinLockType() * consolidate userId verification tests * add tests for storePinKeyEncryptedUserKey() * fix service dep * get email based on userId * use MasterPasswordService instead of internal * rename protectedPin to userKeyEncryptedPin * rename to pinKeyEncryptedUserKeyPersistent * update method params * fix CryptoService tests * jsdoc update * use EncString for userKeyEncryptedPin * remove comment * use cryptoFunctionService.compareFast() * update tests * cleanup, remove comments * resolve merge conflict * fix DI of MasterPasswordService * more DI fixes
136 lines
4.5 KiB
TypeScript
136 lines
4.5 KiB
TypeScript
import { mock, MockProxy } from "jest-mock-extended";
|
|
|
|
import { PinServiceAbstraction } from "@bitwarden/auth/common";
|
|
import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
|
|
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
|
|
import { KdfType } from "@bitwarden/common/platform/enums";
|
|
import { Utils } from "@bitwarden/common/platform/misc/utils";
|
|
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
|
|
|
|
import {
|
|
BitwardenPasswordProtectedImporter,
|
|
BitwardenJsonImporter,
|
|
} from "../src/importers/bitwarden";
|
|
|
|
import { emptyAccountEncrypted } from "./test-data/bitwarden-json/account-encrypted.json";
|
|
import { emptyUnencryptedExport } from "./test-data/bitwarden-json/unencrypted.json";
|
|
|
|
describe("BitwardenPasswordProtectedImporter", () => {
|
|
let importer: BitwardenPasswordProtectedImporter;
|
|
let cryptoService: MockProxy<CryptoService>;
|
|
let i18nService: MockProxy<I18nService>;
|
|
let cipherService: MockProxy<CipherService>;
|
|
let pinService: MockProxy<PinServiceAbstraction>;
|
|
const password = Utils.newGuid();
|
|
const promptForPassword_callback = async () => {
|
|
return password;
|
|
};
|
|
|
|
beforeEach(() => {
|
|
cryptoService = mock<CryptoService>();
|
|
i18nService = mock<I18nService>();
|
|
cipherService = mock<CipherService>();
|
|
pinService = mock<PinServiceAbstraction>();
|
|
|
|
importer = new BitwardenPasswordProtectedImporter(
|
|
cryptoService,
|
|
i18nService,
|
|
cipherService,
|
|
pinService,
|
|
promptForPassword_callback,
|
|
);
|
|
});
|
|
|
|
describe("Unencrypted", () => {
|
|
beforeAll(() => {
|
|
jest.spyOn(BitwardenJsonImporter.prototype, "parse");
|
|
});
|
|
|
|
it("Should call BitwardenJsonImporter", async () => {
|
|
expect((await importer.parse(emptyUnencryptedExport)).success).toEqual(true);
|
|
expect(BitwardenJsonImporter.prototype.parse).toHaveBeenCalledWith(emptyUnencryptedExport);
|
|
});
|
|
});
|
|
|
|
describe("Account encrypted", () => {
|
|
beforeAll(() => {
|
|
jest.spyOn(BitwardenJsonImporter.prototype, "parse");
|
|
});
|
|
|
|
it("Should call BitwardenJsonImporter", async () => {
|
|
expect((await importer.parse(emptyAccountEncrypted)).success).toEqual(true);
|
|
expect(BitwardenJsonImporter.prototype.parse).toHaveBeenCalledWith(emptyAccountEncrypted);
|
|
});
|
|
});
|
|
|
|
describe("Password protected", () => {
|
|
let jDoc: {
|
|
encrypted?: boolean;
|
|
passwordProtected?: boolean;
|
|
salt?: string;
|
|
kdfIterations?: any;
|
|
kdfType?: any;
|
|
encKeyValidation_DO_NOT_EDIT?: string;
|
|
data?: string;
|
|
};
|
|
|
|
beforeEach(() => {
|
|
jDoc = {
|
|
encrypted: true,
|
|
passwordProtected: true,
|
|
salt: "c2FsdA==",
|
|
kdfIterations: 100000,
|
|
kdfType: KdfType.PBKDF2_SHA256,
|
|
encKeyValidation_DO_NOT_EDIT: Utils.newGuid(),
|
|
data: Utils.newGuid(),
|
|
};
|
|
});
|
|
|
|
it("succeeds with default jdoc", async () => {
|
|
cryptoService.decryptToUtf8.mockReturnValue(Promise.resolve(emptyUnencryptedExport));
|
|
|
|
expect((await importer.parse(JSON.stringify(jDoc))).success).toEqual(true);
|
|
});
|
|
|
|
it("fails if salt === null", async () => {
|
|
jDoc.salt = null;
|
|
expect((await importer.parse(JSON.stringify(jDoc))).success).toEqual(false);
|
|
});
|
|
|
|
it("fails if kdfIterations === null", async () => {
|
|
jDoc.kdfIterations = null;
|
|
expect((await importer.parse(JSON.stringify(jDoc))).success).toEqual(false);
|
|
});
|
|
|
|
it("fails if kdfIterations is not a number", async () => {
|
|
jDoc.kdfIterations = "not a number";
|
|
expect((await importer.parse(JSON.stringify(jDoc))).success).toEqual(false);
|
|
});
|
|
|
|
it("fails if kdfType === null", async () => {
|
|
jDoc.kdfType = null;
|
|
expect((await importer.parse(JSON.stringify(jDoc))).success).toEqual(false);
|
|
});
|
|
|
|
it("fails if kdfType is not a string", async () => {
|
|
jDoc.kdfType = "not a valid kdf type";
|
|
expect((await importer.parse(JSON.stringify(jDoc))).success).toEqual(false);
|
|
});
|
|
|
|
it("fails if kdfType is not a known kdfType", async () => {
|
|
jDoc.kdfType = -1;
|
|
expect((await importer.parse(JSON.stringify(jDoc))).success).toEqual(false);
|
|
});
|
|
|
|
it("fails if encKeyValidation_DO_NOT_EDIT === null", async () => {
|
|
jDoc.encKeyValidation_DO_NOT_EDIT = null;
|
|
expect((await importer.parse(JSON.stringify(jDoc))).success).toEqual(false);
|
|
});
|
|
|
|
it("fails if data === null", async () => {
|
|
jDoc.data = null;
|
|
expect((await importer.parse(JSON.stringify(jDoc))).success).toEqual(false);
|
|
});
|
|
});
|
|
});
|