bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-10 21:50:15 +00:00
Code Issues Releases Wiki Activity

Fix loading

Browse Source
This commit is contained in:
Bernd Schoolmann
2025-10-16 13:08:44 +02:00
parent 1fb20e817b
commit 0f36693af1
4 changed files with 52 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/desktop/desktop_native/napi/src/lib.rs
View File

@@ -1070,7 +1070,7 @@ pub mod sshagent_v2 {
protocol::types::KeyPair,
};
use tokio::{self, sync::Mutex};
use tracing::error;
use tracing::{error, info};
#[napi]
pub struct SshAgentState {
@@ -1201,6 +1201,7 @@ pub mod sshagent_v2 {
#[napi]
pub fn stop(agent_state: &mut SshAgentState) -> napi::Result<()> {
info!("Stopping SSH Agent");
agent_state.agent.stop();
Ok(())
}

97
apps/desktop/src/autofill/main/main-ssh-agent.service.ts
View File

@@ -37,6 +37,49 @@ export class MainSshAgentService {
ipcMain.handle("sshagent.isloaded", async (event: any) => {
return this.agentStateV1 != null && this.agentStateV2 != null;
});
ipcMain.handle(
"sshagent.setkeys",
async (event: any, keys: { name: string; privateKey: string; cipherId: string }[]) => {
if (this.agentStateV1 != null && (await sshagent.isRunning(this.agentStateV1))) {
sshagent.setKeys(this.agentStateV1, keys);
}
if (this.agentStateV2 != null && (await sshagent_v2.isRunning(this.agentStateV2))) {
sshagent_v2.setKeys(this.agentStateV2, keys);
}
},
);
ipcMain.handle(
"sshagent.signrequestresponse",
async (event: any, { requestId, accepted }: { requestId: number; accepted: boolean }) => {
this.requestResponses.push({ requestId, accepted, timestamp: new Date() });
},
);
ipcMain.handle("sshagent.lock", async (event: any) => {
if (this.agentStateV1 != null && (await sshagent.isRunning(this.agentStateV1))) {
sshagent.lock(this.agentStateV1);
}
if (this.agentStateV2 != null && (await sshagent_v2.isRunning(this.agentStateV2))) {
sshagent_v2.lock(this.agentStateV2);
}
});
ipcMain.handle("sshagent.clearkeys", async (event: any) => {
if (this.agentStateV1 != null) {
sshagent.clearKeys(this.agentStateV1);
}
if (this.agentStateV2 != null) {
sshagent_v2.clearKeys(this.agentStateV2);
}
});
ipcMain.handle("sshagent.stop", async (event: any) => {
if (this.agentStateV2 != null) {
sshagent_v2.stop(this.agentStateV2);
this.agentStateV2 = null;
}
});
}
init_v1() {
@@ -94,33 +137,6 @@ export class MainSshAgentService {
.catch((e) => {
this.logService.error("SSH agent encountered an error: ", e);
});
ipcMain.handle(
"sshagent.setkeys",
async (event: any, keys: { name: string; privateKey: string; cipherId: string }[]) => {
if (this.agentStateV1 != null && (await sshagent.isRunning(this.agentStateV1))) {
sshagent.setKeys(this.agentStateV1, keys);
}
},
);
ipcMain.handle(
"sshagent.signrequestresponse",
async (event: any, { requestId, accepted }: { requestId: number; accepted: boolean }) => {
this.requestResponses.push({ requestId, accepted, timestamp: new Date() });
},
);
ipcMain.handle("sshagent.lock", async (event: any) => {
if (this.agentStateV1 != null && (await sshagent.isRunning(this.agentStateV1))) {
sshagent.lock(this.agentStateV1);
}
});
ipcMain.handle("sshagent.clearkeys", async (event: any) => {
if (this.agentStateV1 != null) {
sshagent.clearKeys(this.agentStateV1);
}
});
}
init_v2() {
@@ -178,32 +194,5 @@ export class MainSshAgentService {
.catch((e) => {
this.logService.error("SSH agent encountered an error: ", e);
});
ipcMain.handle(
"sshagent.setkeys",
async (event: any, keys: { name: string; privateKey: string; cipherId: string }[]) => {
if (this.agentStateV2 != null && (await sshagent_v2.isRunning(this.agentStateV2))) {
sshagent_v2.setKeys(this.agentStateV2, keys);
}
},
);
ipcMain.handle(
"sshagent.signrequestresponse",
async (event: any, { requestId, accepted }: { requestId: number; accepted: boolean }) => {
this.requestResponses.push({ requestId, accepted, timestamp: new Date() });
},
);
ipcMain.handle("sshagent.lock", async (event: any) => {
if (this.agentStateV2 != null && (await sshagent_v2.isRunning(this.agentStateV2))) {
sshagent_v2.lock(this.agentStateV2);
}
});
ipcMain.handle("sshagent.clearkeys", async (event: any) => {
if (this.agentStateV2 != null) {
sshagent_v2.clearKeys(this.agentStateV2);
}
});
}
}

4
apps/desktop/src/autofill/services/ssh-agent.service.ts
View File

@@ -75,6 +75,10 @@ export class SshAgentService implements OnDestroy {
);
await ipc.platform.sshAgent.init(isV2FeatureFlagEnabled ? 2 : 1);
}
if (!enabled) {
await ipc.platform.sshAgent.stop();
}
}),
takeUntil(this.destroy$),
)

3
apps/desktop/src/platform/preload.ts
View File

@@ -63,6 +63,9 @@ const sshAgent = {
clearKeys: async () => {
return await ipcRenderer.invoke("sshagent.clearkeys");
},
stop: async () => {
return await ipcRenderer.invoke("sshagent.stop");
},
isLoaded(): Promise<boolean> {
return ipcRenderer.invoke("sshagent.isloaded");
},