mirror of
https://github.com/bitwarden/browser
synced 2026-01-06 10:33:57 +00:00
* 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
272 lines
9.8 KiB
TypeScript
272 lines
9.8 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 { Utils } from "@bitwarden/common/platform/misc/utils";
|
|
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
|
|
import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
|
|
import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
|
|
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
|
|
import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
|
|
import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
|
|
|
|
import { BitwardenPasswordProtectedImporter } from "../importers/bitwarden/bitwarden-password-protected-importer";
|
|
import { Importer } from "../importers/importer";
|
|
import { ImportResult } from "../models/import-result";
|
|
|
|
import { ImportApiServiceAbstraction } from "./import-api.service.abstraction";
|
|
import { ImportService } from "./import.service";
|
|
|
|
describe("ImportService", () => {
|
|
let importService: ImportService;
|
|
let cipherService: MockProxy<CipherService>;
|
|
let folderService: MockProxy<FolderService>;
|
|
let importApiService: MockProxy<ImportApiServiceAbstraction>;
|
|
let i18nService: MockProxy<I18nService>;
|
|
let collectionService: MockProxy<CollectionService>;
|
|
let cryptoService: MockProxy<CryptoService>;
|
|
let pinService: MockProxy<PinServiceAbstraction>;
|
|
|
|
beforeEach(() => {
|
|
cipherService = mock<CipherService>();
|
|
folderService = mock<FolderService>();
|
|
importApiService = mock<ImportApiServiceAbstraction>();
|
|
i18nService = mock<I18nService>();
|
|
collectionService = mock<CollectionService>();
|
|
cryptoService = mock<CryptoService>();
|
|
pinService = mock<PinServiceAbstraction>();
|
|
|
|
importService = new ImportService(
|
|
cipherService,
|
|
folderService,
|
|
importApiService,
|
|
i18nService,
|
|
collectionService,
|
|
cryptoService,
|
|
pinService,
|
|
);
|
|
});
|
|
|
|
describe("getImporterInstance", () => {
|
|
describe("Get bitPasswordProtected importer", () => {
|
|
let importer: Importer;
|
|
const organizationId = Utils.newGuid();
|
|
const password = Utils.newGuid();
|
|
const promptForPassword_callback = async () => {
|
|
return password;
|
|
};
|
|
|
|
beforeEach(() => {
|
|
importer = importService.getImporter(
|
|
"bitwardenpasswordprotected",
|
|
promptForPassword_callback,
|
|
organizationId,
|
|
);
|
|
});
|
|
|
|
it("returns an instance of BitwardenPasswordProtectedImporter", () => {
|
|
expect(importer).toBeInstanceOf(BitwardenPasswordProtectedImporter);
|
|
});
|
|
|
|
it("has the promptForPassword_callback set", async () => {
|
|
// Cast to any to access private property. Note: assumes instance of BitwardenPasswordProtectedImporter
|
|
expect((importer as any).promptForPassword_callback).not.toBeNull();
|
|
expect(await (importer as any).promptForPassword_callback()).toEqual(password);
|
|
});
|
|
|
|
it("has the appropriate organization Id", () => {
|
|
expect(importer.organizationId).toEqual(organizationId);
|
|
});
|
|
});
|
|
});
|
|
|
|
describe("setImportTarget", () => {
|
|
const organizationId = Utils.newGuid();
|
|
|
|
let importResult: ImportResult;
|
|
|
|
beforeEach(() => {
|
|
importResult = new ImportResult();
|
|
});
|
|
|
|
it("empty importTarget does nothing", async () => {
|
|
await importService["setImportTarget"](importResult, null, null);
|
|
expect(importResult.folders.length).toBe(0);
|
|
});
|
|
|
|
const mockImportTargetFolder = new FolderView();
|
|
mockImportTargetFolder.id = "myImportTarget";
|
|
mockImportTargetFolder.name = "myImportTarget";
|
|
|
|
it("passing importTarget adds it to folders", async () => {
|
|
folderService.getAllDecryptedFromState.mockReturnValue(
|
|
Promise.resolve([mockImportTargetFolder]),
|
|
);
|
|
|
|
await importService["setImportTarget"](importResult, null, mockImportTargetFolder);
|
|
expect(importResult.folders.length).toBe(1);
|
|
expect(importResult.folders[0]).toBe(mockImportTargetFolder);
|
|
});
|
|
|
|
const mockFolder1 = new FolderView();
|
|
mockFolder1.id = "folder1";
|
|
mockFolder1.name = "folder1";
|
|
|
|
const mockFolder2 = new FolderView();
|
|
mockFolder2.id = "folder2";
|
|
mockFolder2.name = "folder2";
|
|
|
|
it("passing importTarget sets it as new root for all existing folders", async () => {
|
|
folderService.getAllDecryptedFromState.mockResolvedValue([
|
|
mockImportTargetFolder,
|
|
mockFolder1,
|
|
mockFolder2,
|
|
]);
|
|
|
|
importResult.folders.push(mockFolder1);
|
|
importResult.folders.push(mockFolder2);
|
|
|
|
await importService["setImportTarget"](importResult, null, mockImportTargetFolder);
|
|
expect(importResult.folders.length).toBe(3);
|
|
expect(importResult.folders[0]).toBe(mockImportTargetFolder);
|
|
expect(importResult.folders[1].name).toBe(
|
|
`${mockImportTargetFolder.name}/${mockFolder1.name}`,
|
|
);
|
|
expect(importResult.folders[2].name).toBe(
|
|
`${mockImportTargetFolder.name}/${mockFolder2.name}`,
|
|
);
|
|
});
|
|
|
|
const mockImportTargetCollection = new CollectionView();
|
|
mockImportTargetCollection.id = "myImportTarget";
|
|
mockImportTargetCollection.name = "myImportTarget";
|
|
mockImportTargetCollection.organizationId = organizationId;
|
|
|
|
const mockCollection1 = new CollectionView();
|
|
mockCollection1.id = "collection1";
|
|
mockCollection1.name = "collection1";
|
|
mockCollection1.organizationId = organizationId;
|
|
|
|
const mockCollection2 = new CollectionView();
|
|
mockCollection1.id = "collection2";
|
|
mockCollection1.name = "collection2";
|
|
mockCollection1.organizationId = organizationId;
|
|
|
|
it("passing importTarget adds it to collections", async () => {
|
|
collectionService.getAllDecrypted.mockResolvedValue([
|
|
mockImportTargetCollection,
|
|
mockCollection1,
|
|
]);
|
|
|
|
await importService["setImportTarget"](
|
|
importResult,
|
|
organizationId,
|
|
mockImportTargetCollection,
|
|
);
|
|
expect(importResult.collections.length).toBe(1);
|
|
expect(importResult.collections[0]).toBe(mockImportTargetCollection);
|
|
});
|
|
|
|
it("passing importTarget sets it as new root for all existing collections", async () => {
|
|
collectionService.getAllDecrypted.mockResolvedValue([
|
|
mockImportTargetCollection,
|
|
mockCollection1,
|
|
mockCollection2,
|
|
]);
|
|
|
|
importResult.collections.push(mockCollection1);
|
|
importResult.collections.push(mockCollection2);
|
|
|
|
await importService["setImportTarget"](
|
|
importResult,
|
|
organizationId,
|
|
mockImportTargetCollection,
|
|
);
|
|
expect(importResult.collections.length).toBe(3);
|
|
expect(importResult.collections[0]).toBe(mockImportTargetCollection);
|
|
expect(importResult.collections[1].name).toBe(
|
|
`${mockImportTargetCollection.name}/${mockCollection1.name}`,
|
|
);
|
|
expect(importResult.collections[2].name).toBe(
|
|
`${mockImportTargetCollection.name}/${mockCollection2.name}`,
|
|
);
|
|
});
|
|
|
|
it("passing importTarget as null on setImportTarget with organizationId throws error", async () => {
|
|
const setImportTargetMethod = importService["setImportTarget"](
|
|
null,
|
|
organizationId,
|
|
new Object() as FolderView,
|
|
);
|
|
|
|
await expect(setImportTargetMethod).rejects.toThrow();
|
|
});
|
|
|
|
it("passing importTarget as null on setImportTarget throws error", async () => {
|
|
const setImportTargetMethod = importService["setImportTarget"](
|
|
null,
|
|
"",
|
|
new Object() as CollectionView,
|
|
);
|
|
|
|
await expect(setImportTargetMethod).rejects.toThrow();
|
|
});
|
|
|
|
it("passing importTarget, collectionRelationship has the expected values", async () => {
|
|
collectionService.getAllDecrypted.mockResolvedValue([
|
|
mockImportTargetCollection,
|
|
mockCollection1,
|
|
mockCollection2,
|
|
]);
|
|
|
|
importResult.ciphers.push(createCipher({ name: "cipher1" }));
|
|
importResult.ciphers.push(createCipher({ name: "cipher2" }));
|
|
importResult.collectionRelationships.push([0, 0]);
|
|
importResult.collections.push(mockCollection1);
|
|
importResult.collections.push(mockCollection2);
|
|
|
|
await importService["setImportTarget"](
|
|
importResult,
|
|
organizationId,
|
|
mockImportTargetCollection,
|
|
);
|
|
expect(importResult.collectionRelationships.length).toEqual(2);
|
|
expect(importResult.collectionRelationships[0]).toEqual([1, 0]);
|
|
expect(importResult.collectionRelationships[1]).toEqual([0, 1]);
|
|
});
|
|
|
|
it("passing importTarget, folderRelationship has the expected values", async () => {
|
|
folderService.getAllDecryptedFromState.mockResolvedValue([
|
|
mockImportTargetFolder,
|
|
mockFolder1,
|
|
mockFolder2,
|
|
]);
|
|
|
|
importResult.folders.push(mockFolder1);
|
|
importResult.folders.push(mockFolder2);
|
|
|
|
importResult.ciphers.push(createCipher({ name: "cipher1", folderId: mockFolder1.id }));
|
|
importResult.ciphers.push(createCipher({ name: "cipher2" }));
|
|
importResult.folderRelationships.push([0, 0]);
|
|
|
|
await importService["setImportTarget"](importResult, "", mockImportTargetFolder);
|
|
expect(importResult.folderRelationships.length).toEqual(2);
|
|
expect(importResult.folderRelationships[0]).toEqual([1, 0]);
|
|
expect(importResult.folderRelationships[1]).toEqual([0, 1]);
|
|
});
|
|
});
|
|
});
|
|
|
|
function createCipher(options: Partial<CipherView> = {}) {
|
|
const cipher = new CipherView();
|
|
|
|
cipher.name;
|
|
cipher.type = options.type;
|
|
cipher.folderId = options.folderId;
|
|
cipher.collectionIds = options.collectionIds;
|
|
cipher.organizationId = options.organizationId;
|
|
|
|
return cipher;
|
|
}
|