Skip to content

Commit

Permalink
Enable generic secrets in keytar via ipc
Browse files Browse the repository at this point in the history
Signed-off-by: Nils Hanff <[email protected]>
  • Loading branch information
Nils Hanff committed Oct 19, 2023
1 parent ecf8a28 commit e57ac17
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 0 deletions.
21 changes: 21 additions & 0 deletions src/ipc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import { randomArray } from "./utils";
import { Settings } from "./settings";
import { keytar } from "./keytar";
import { getDisplayMediaCallback, setDisplayMediaCallback } from "./displayMediaCallback";
import { getSecretStore } from "./secrets";

ipcMain.on("setBadgeCount", function (_ev: IpcMainEvent, count: number): void {
if (process.platform !== "win32") {
Expand Down Expand Up @@ -147,6 +148,26 @@ ipcMain.on("ipcCall", async function (_ev: IpcMainEvent, payload) {
recordSSOSession(args[0]);
break;

case "getSecret":
try {
ret = getSecretStore().getSecret(args[0]);
} catch (e) {
ret = null;
}
break;
case "saveSecret":
try {
ret = getSecretStore().saveSecret(args[0], args[1]);
} catch (e) {
ret = null;
}
break;
case "destroySecret":
try {
ret = getSecretStore().destroySecret(args[0]);
} catch (e) {}
break;

case "getPickleKey":
try {
ret = await keytar?.getPassword("element.io", `${args[0]}|${args[1]}`);
Expand Down
60 changes: 60 additions & 0 deletions src/secrets.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
/*
Copyright 2022 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

import { keytar } from "./keytar";
import type * as Keytar from "keytar";

interface SecretStore {
saveSecret(name: string, value: string): Promise<string | null>;
getSecret(name: string): Promise<string | null>;
destroySecret(name: string): Promise<void>;
}

class KeytarSecretStore implements SecretStore {
public constructor(public readonly keytar: typeof Keytar) { }

public async saveSecret(name: string, value: string): Promise<string | null> {
await this.keytar!.setPassword("element.io", `generic|${name}`, value);
return await this.getSecret(name);
}
public async getSecret(name: string): Promise<string | null> {
return await this.keytar!.getPassword("element.io", `generic|${name}`);
}
public async destroySecret(name: string): Promise<void> {
await this.keytar?.deletePassword("element.io", `generic|${name}`);
}
}

class NullSecretStore implements SecretStore {
public async saveSecret(): Promise<string | null> { return null; }
public async getSecret(): Promise<string | null> { return null; }
public async destroySecret(): Promise<void> { }
}

function createSecretStore(): SecretStore {
if (keytar) {
return new KeytarSecretStore(keytar);
}
return new NullSecretStore();
}

let secretStore: SecretStore | null = null;
export function getSecretStore(): SecretStore {
if (!secretStore) {
secretStore = createSecretStore();
}
return secretStore;
}

0 comments on commit e57ac17

Please sign in to comment.