mirror of
https://github.com/bitwarden/browser.git
synced 2025-02-22 02:21:34 +01:00
[PM-9465] Move shared ipc keys to main process (#9944)
* Remove old biometrics masterkey logic * Move shared ipc keys to main process * Update apps/desktop/src/platform/services/ephemeral-value-storage.main.service.ts Co-authored-by: Daniel García <dani-garcia@users.noreply.github.com> * Extract ephemeral store functions to it's own object --------- Co-authored-by: Daniel García <dani-garcia@users.noreply.github.com>
This commit is contained in:
parent
4a0b6fc191
commit
537fa67b09
@ -39,6 +39,7 @@ import { MainCryptoFunctionService } from "./platform/main/main-crypto-function.
|
||||
import { DesktopSettingsService } from "./platform/services/desktop-settings.service";
|
||||
import { ElectronLogMainService } from "./platform/services/electron-log.main.service";
|
||||
import { ElectronStorageService } from "./platform/services/electron-storage.service";
|
||||
import { EphemeralValueStorageService } from "./platform/services/ephemeral-value-storage.main.service";
|
||||
import { I18nMainService } from "./platform/services/i18n.main.service";
|
||||
import { ElectronMainMessagingService } from "./services/electron-main-messaging.service";
|
||||
import { isMacAppStore } from "./utils";
|
||||
@ -224,6 +225,8 @@ export class Main {
|
||||
|
||||
this.clipboardMain = new ClipboardMain();
|
||||
this.clipboardMain.init();
|
||||
|
||||
new EphemeralValueStorageService();
|
||||
}
|
||||
|
||||
bootstrap() {
|
||||
|
@ -99,6 +99,14 @@ const crypto = {
|
||||
ipcRenderer.invoke("crypto.argon2", { password, salt, iterations, memory, parallelism }),
|
||||
};
|
||||
|
||||
const ephemeralStore = {
|
||||
setEphemeralValue: (key: string, value: string): Promise<void> =>
|
||||
ipcRenderer.invoke("setEphemeralValue", { key, value }),
|
||||
getEphemeralValue: (key: string): Promise<string> => ipcRenderer.invoke("getEphemeralValue", key),
|
||||
removeEphemeralValue: (key: string): Promise<void> =>
|
||||
ipcRenderer.invoke("deleteEphemeralValue", key),
|
||||
};
|
||||
|
||||
export default {
|
||||
versions: {
|
||||
app: (): Promise<string> => ipcRenderer.invoke("appVersion"),
|
||||
@ -156,6 +164,7 @@ export default {
|
||||
powermonitor,
|
||||
nativeMessaging,
|
||||
crypto,
|
||||
ephemeralStore,
|
||||
};
|
||||
|
||||
function deviceType(): DeviceType {
|
||||
|
@ -0,0 +1,21 @@
|
||||
import { ipcMain } from "electron";
|
||||
|
||||
/**
|
||||
* The ephemeral value store holds values that should be accessible to the renderer past a process reload.
|
||||
* In the current state, this store must not contain any keys that can decrypt a vault by themselves.
|
||||
*/
|
||||
export class EphemeralValueStorageService {
|
||||
private ephemeralValues = new Map<string, string>();
|
||||
|
||||
constructor() {
|
||||
ipcMain.handle("setEphemeralValue", async (event, { key, value }) => {
|
||||
this.ephemeralValues.set(key, value);
|
||||
});
|
||||
ipcMain.handle("getEphemeralValue", async (event, key: string) => {
|
||||
return this.ephemeralValues.get(key);
|
||||
});
|
||||
ipcMain.handle("deleteEphemeralValue", async (event, key: string) => {
|
||||
this.ephemeralValues.delete(key);
|
||||
});
|
||||
}
|
||||
}
|
@ -30,8 +30,6 @@ const HashAlgorithmForAsymmetricEncryption = "sha1";
|
||||
|
||||
@Injectable()
|
||||
export class NativeMessagingService {
|
||||
private sharedSecrets = new Map<string, SymmetricCryptoKey>();
|
||||
|
||||
constructor(
|
||||
private cryptoFunctionService: CryptoFunctionService,
|
||||
private cryptoService: CryptoService,
|
||||
@ -104,7 +102,7 @@ export class NativeMessagingService {
|
||||
return;
|
||||
}
|
||||
|
||||
if (this.sharedSecrets.get(appId) == null) {
|
||||
if ((await ipc.platform.ephemeralStore.getEphemeralValue(appId)) == null) {
|
||||
ipc.platform.nativeMessaging.sendMessage({
|
||||
command: "invalidateEncryption",
|
||||
appId: appId,
|
||||
@ -115,7 +113,7 @@ export class NativeMessagingService {
|
||||
const message: LegacyMessage = JSON.parse(
|
||||
await this.cryptoService.decryptToUtf8(
|
||||
rawMessage as EncString,
|
||||
this.sharedSecrets.get(appId),
|
||||
SymmetricCryptoKey.fromString(await ipc.platform.ephemeralStore.getEphemeralValue(appId)),
|
||||
),
|
||||
);
|
||||
|
||||
@ -205,7 +203,7 @@ export class NativeMessagingService {
|
||||
|
||||
const encrypted = await this.cryptoService.encrypt(
|
||||
JSON.stringify(message),
|
||||
this.sharedSecrets.get(appId),
|
||||
SymmetricCryptoKey.fromString(await ipc.platform.ephemeralStore.getEphemeralValue(appId)),
|
||||
);
|
||||
|
||||
ipc.platform.nativeMessaging.sendMessage({ appId: appId, message: encrypted });
|
||||
@ -213,7 +211,10 @@ export class NativeMessagingService {
|
||||
|
||||
private async secureCommunication(remotePublicKey: Uint8Array, appId: string) {
|
||||
const secret = await this.cryptoFunctionService.randomBytes(64);
|
||||
this.sharedSecrets.set(appId, new SymmetricCryptoKey(secret));
|
||||
await ipc.platform.ephemeralStore.setEphemeralValue(
|
||||
appId,
|
||||
new SymmetricCryptoKey(secret).keyB64,
|
||||
);
|
||||
|
||||
const encryptedSecret = await this.cryptoFunctionService.rsaEncrypt(
|
||||
secret,
|
||||
|
Loading…
Reference in New Issue
Block a user