mirror of
https://github.com/bitwarden/browser.git
synced 2024-08-18 21:54:02 +02:00
* Implement argon2 * Remove argon2 webassembly warning * Replace magic numbers by enum * move packages * cleanup call to argon2 * update call to node argon2 * don't need wasm-eval * revert config changes * Update libs/common/src/enums/kdfType.ts Co-authored-by: Martin Weinelt <mweinelt@users.noreply.github.com> * Update kdfType.ts * apply DEFAULT_PBKDF2_ITERATIONS * checkIfWasmSupported Co-authored-by: Kyle Spearrin <kyle.spearrin@gmail.com> Co-authored-by: Kyle Spearrin <kspearrin@users.noreply.github.com> Co-authored-by: Martin Weinelt <mweinelt@users.noreply.github.com>
286 lines
9.1 KiB
TypeScript
286 lines
9.1 KiB
TypeScript
// eslint-disable-next-line no-restricted-imports
|
|
import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute";
|
|
|
|
import { ApiService } from "@bitwarden/common/abstractions/api.service";
|
|
import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
|
|
import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
|
|
import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
|
|
import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
|
|
import { CipherType } from "@bitwarden/common/enums/cipherType";
|
|
import { KdfType, DEFAULT_PBKDF2_ITERATIONS } from "@bitwarden/common/enums/kdfType";
|
|
import { Utils } from "@bitwarden/common/misc/utils";
|
|
import { Cipher } from "@bitwarden/common/models/domain/cipher";
|
|
import { EncString } from "@bitwarden/common/models/domain/enc-string";
|
|
import { Folder } from "@bitwarden/common/models/domain/folder";
|
|
import { Login } from "@bitwarden/common/models/domain/login";
|
|
import { CipherWithIdExport as CipherExport } from "@bitwarden/common/models/export/cipher-with-ids.export";
|
|
import { CipherView } from "@bitwarden/common/models/view/cipher.view";
|
|
import { FolderView } from "@bitwarden/common/models/view/folder.view";
|
|
import { LoginView } from "@bitwarden/common/models/view/login.view";
|
|
import { ExportService } from "@bitwarden/common/services/export.service";
|
|
|
|
import { BuildTestObject, GetUniqueString } from "../utils";
|
|
|
|
const UserCipherViews = [
|
|
generateCipherView(false),
|
|
generateCipherView(false),
|
|
generateCipherView(true),
|
|
];
|
|
|
|
const UserCipherDomains = [
|
|
generateCipherDomain(false),
|
|
generateCipherDomain(false),
|
|
generateCipherDomain(true),
|
|
];
|
|
|
|
const UserFolderViews = [generateFolderView(), generateFolderView()];
|
|
|
|
const UserFolders = [generateFolder(), generateFolder()];
|
|
|
|
function generateCipherView(deleted: boolean) {
|
|
return BuildTestObject(
|
|
{
|
|
id: GetUniqueString("id"),
|
|
notes: GetUniqueString("notes"),
|
|
type: CipherType.Login,
|
|
login: BuildTestObject<LoginView>(
|
|
{
|
|
username: GetUniqueString("username"),
|
|
password: GetUniqueString("password"),
|
|
},
|
|
LoginView
|
|
),
|
|
collectionIds: null,
|
|
deletedDate: deleted ? new Date() : null,
|
|
},
|
|
CipherView
|
|
);
|
|
}
|
|
|
|
function generateCipherDomain(deleted: boolean) {
|
|
return BuildTestObject(
|
|
{
|
|
id: GetUniqueString("id"),
|
|
notes: new EncString(GetUniqueString("notes")),
|
|
type: CipherType.Login,
|
|
login: BuildTestObject<Login>(
|
|
{
|
|
username: new EncString(GetUniqueString("username")),
|
|
password: new EncString(GetUniqueString("password")),
|
|
},
|
|
Login
|
|
),
|
|
collectionIds: null,
|
|
deletedDate: deleted ? new Date() : null,
|
|
},
|
|
Cipher
|
|
);
|
|
}
|
|
|
|
function generateFolderView() {
|
|
return BuildTestObject(
|
|
{
|
|
id: GetUniqueString("id"),
|
|
name: GetUniqueString("name"),
|
|
revisionDate: new Date(),
|
|
},
|
|
FolderView
|
|
);
|
|
}
|
|
|
|
function generateFolder() {
|
|
const actual = Folder.fromJSON({
|
|
revisionDate: new Date("2022-08-04T01:06:40.441Z").toISOString(),
|
|
name: "name",
|
|
id: "id",
|
|
});
|
|
return actual;
|
|
}
|
|
|
|
function expectEqualCiphers(ciphers: CipherView[] | Cipher[], jsonResult: string) {
|
|
const actual = JSON.stringify(JSON.parse(jsonResult).items);
|
|
const items: CipherExport[] = [];
|
|
ciphers.forEach((c: CipherView | Cipher) => {
|
|
const item = new CipherExport();
|
|
item.build(c);
|
|
items.push(item);
|
|
});
|
|
|
|
expect(actual).toEqual(JSON.stringify(items));
|
|
}
|
|
|
|
function expectEqualFolderViews(folderviews: FolderView[] | Folder[], jsonResult: string) {
|
|
const actual = JSON.stringify(JSON.parse(jsonResult).folders);
|
|
const folders: FolderResponse[] = [];
|
|
folderviews.forEach((c) => {
|
|
const folder = new FolderResponse();
|
|
folder.id = c.id;
|
|
folder.name = c.name.toString();
|
|
folders.push(folder);
|
|
});
|
|
|
|
expect(actual.length).toBeGreaterThan(0);
|
|
expect(actual).toEqual(JSON.stringify(folders));
|
|
}
|
|
|
|
function expectEqualFolders(folders: Folder[], jsonResult: string) {
|
|
const actual = JSON.stringify(JSON.parse(jsonResult).folders);
|
|
const items: Folder[] = [];
|
|
folders.forEach((c) => {
|
|
const item = new Folder();
|
|
item.id = c.id;
|
|
item.name = c.name;
|
|
items.push(item);
|
|
});
|
|
|
|
expect(actual.length).toBeGreaterThan(0);
|
|
expect(actual).toEqual(JSON.stringify(items));
|
|
}
|
|
|
|
describe("ExportService", () => {
|
|
let exportService: ExportService;
|
|
let apiService: SubstituteOf<ApiService>;
|
|
let cryptoFunctionService: SubstituteOf<CryptoFunctionService>;
|
|
let cipherService: SubstituteOf<CipherService>;
|
|
let folderService: SubstituteOf<FolderService>;
|
|
let cryptoService: SubstituteOf<CryptoService>;
|
|
|
|
beforeEach(() => {
|
|
apiService = Substitute.for<ApiService>();
|
|
cryptoFunctionService = Substitute.for<CryptoFunctionService>();
|
|
cipherService = Substitute.for<CipherService>();
|
|
folderService = Substitute.for<FolderService>();
|
|
cryptoService = Substitute.for<CryptoService>();
|
|
|
|
folderService.getAllDecryptedFromState().resolves(UserFolderViews);
|
|
folderService.getAllFromState().resolves(UserFolders);
|
|
|
|
exportService = new ExportService(
|
|
folderService,
|
|
cipherService,
|
|
apiService,
|
|
cryptoService,
|
|
cryptoFunctionService
|
|
);
|
|
});
|
|
|
|
it("exports unecrypted user ciphers", async () => {
|
|
cipherService.getAllDecrypted().resolves(UserCipherViews.slice(0, 1));
|
|
|
|
const actual = await exportService.getExport("json");
|
|
|
|
expectEqualCiphers(UserCipherViews.slice(0, 1), actual);
|
|
});
|
|
|
|
it("exports encrypted json user ciphers", async () => {
|
|
cipherService.getAll().resolves(UserCipherDomains.slice(0, 1));
|
|
|
|
const actual = await exportService.getExport("encrypted_json");
|
|
|
|
expectEqualCiphers(UserCipherDomains.slice(0, 1), actual);
|
|
});
|
|
|
|
it("does not unecrypted export trashed user items", async () => {
|
|
cipherService.getAllDecrypted().resolves(UserCipherViews);
|
|
|
|
const actual = await exportService.getExport("json");
|
|
|
|
expectEqualCiphers(UserCipherViews.slice(0, 2), actual);
|
|
});
|
|
|
|
it("does not encrypted export trashed user items", async () => {
|
|
cipherService.getAll().resolves(UserCipherDomains);
|
|
|
|
const actual = await exportService.getExport("encrypted_json");
|
|
|
|
expectEqualCiphers(UserCipherDomains.slice(0, 2), actual);
|
|
});
|
|
|
|
describe("password protected export", () => {
|
|
let exportString: string;
|
|
let exportObject: any;
|
|
let mac: SubstituteOf<EncString>;
|
|
let data: SubstituteOf<EncString>;
|
|
const password = "password";
|
|
const salt = "salt";
|
|
|
|
describe("export json object", () => {
|
|
beforeEach(async () => {
|
|
mac = Substitute.for<EncString>();
|
|
data = Substitute.for<EncString>();
|
|
|
|
mac.encryptedString.returns("mac");
|
|
data.encryptedString.returns("encData");
|
|
|
|
jest.spyOn(Utils, "fromBufferToB64").mockReturnValue(salt);
|
|
cipherService.getAllDecrypted().resolves(UserCipherViews.slice(0, 1));
|
|
|
|
exportString = await exportService.getPasswordProtectedExport(password);
|
|
exportObject = JSON.parse(exportString);
|
|
});
|
|
|
|
it("specifies it is encrypted", () => {
|
|
expect(exportObject.encrypted).toBe(true);
|
|
});
|
|
|
|
it("specifies it's password protected", () => {
|
|
expect(exportObject.passwordProtected).toBe(true);
|
|
});
|
|
|
|
it("specifies salt", () => {
|
|
expect(exportObject.salt).toEqual("salt");
|
|
});
|
|
|
|
it("specifies kdfIterations", () => {
|
|
expect(exportObject.kdfIterations).toEqual(DEFAULT_PBKDF2_ITERATIONS);
|
|
});
|
|
|
|
it("has kdfType", () => {
|
|
expect(exportObject.kdfType).toEqual(KdfType.PBKDF2_SHA256);
|
|
});
|
|
|
|
it("has a mac property", async () => {
|
|
cryptoService.encrypt(Arg.any(), Arg.any()).resolves(mac);
|
|
exportString = await exportService.getPasswordProtectedExport(password);
|
|
exportObject = JSON.parse(exportString);
|
|
|
|
expect(exportObject.encKeyValidation_DO_NOT_EDIT).toEqual(mac.encryptedString);
|
|
});
|
|
|
|
it("has data property", async () => {
|
|
cryptoService.encrypt(Arg.any(), Arg.any()).resolves(data);
|
|
exportString = await exportService.getPasswordProtectedExport(password);
|
|
exportObject = JSON.parse(exportString);
|
|
|
|
expect(exportObject.data).toEqual(data.encryptedString);
|
|
});
|
|
|
|
it("encrypts the data property", async () => {
|
|
const unencrypted = await exportService.getExport();
|
|
expect(exportObject.data).not.toEqual(unencrypted);
|
|
});
|
|
});
|
|
});
|
|
|
|
it("exported unencrypted object contains folders", async () => {
|
|
cipherService.getAllDecrypted().resolves(UserCipherViews.slice(0, 1));
|
|
await folderService.getAllDecryptedFromState();
|
|
const actual = await exportService.getExport("json");
|
|
|
|
expectEqualFolderViews(UserFolderViews, actual);
|
|
});
|
|
|
|
it("exported encrypted json contains folders", async () => {
|
|
cipherService.getAll().resolves(UserCipherDomains.slice(0, 1));
|
|
await folderService.getAllFromState();
|
|
const actual = await exportService.getExport("encrypted_json");
|
|
|
|
expectEqualFolders(UserFolders, actual);
|
|
});
|
|
});
|
|
|
|
export class FolderResponse {
|
|
id: string = null;
|
|
name: string = null;
|
|
}
|