mirror of
https://github.com/bitwarden/browser
synced 2024-12-15 10:48:59 +01:00
dedd7f1b5c
* updated cipher service to stop using the deprecated getUserKeyWithLegacySupport and use the version that requires a user id * Added account service mock * fixed cipher test * Fixed test * removed async from encryptCipher * updated encryptSharedCipher to pass userId to the encrypt function * Pass userId to getUserKeyWithLegacySupport on encryptSharedCipher * pass in userid when setting masterKeyEncryptedUserKey * Added activer usedId to new web refresh function
140 lines
4.7 KiB
TypeScript
140 lines
4.7 KiB
TypeScript
import { mock, MockProxy } from "jest-mock-extended";
|
|
|
|
import { PinServiceAbstraction } from "@bitwarden/auth/common";
|
|
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
|
|
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>;
|
|
let accountService: MockProxy<AccountService>;
|
|
const password = Utils.newGuid();
|
|
const promptForPassword_callback = async () => {
|
|
return password;
|
|
};
|
|
|
|
beforeEach(() => {
|
|
cryptoService = mock<CryptoService>();
|
|
i18nService = mock<I18nService>();
|
|
cipherService = mock<CipherService>();
|
|
pinService = mock<PinServiceAbstraction>();
|
|
accountService = mock<AccountService>();
|
|
|
|
importer = new BitwardenPasswordProtectedImporter(
|
|
cryptoService,
|
|
i18nService,
|
|
cipherService,
|
|
pinService,
|
|
accountService,
|
|
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);
|
|
});
|
|
});
|
|
});
|