Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SG-626] Fix Desktop app not showing updated credentials from native messages #3380

Merged
merged 2 commits into from
Aug 25, 2022
Merged

[SG-626] Fix Desktop app not showing updated credentials from native messages #3380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5909a72
Add MessagingService to send messages on login create and update
differsthecat Aug 25, 2022
09f5441
Add `not-active-user` error to create and update and other refactors
differsthecat Aug 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion apps/desktop/native-messaging-test-runner/src/bw-credential-create.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import "module-alias/register";
import yargs from "yargs";
import { hideBin } from "yargs/helpers";

import { CredentialCreatePayload } from "../../src/models/nativeMessaging/credentialCreatePayload";

import { LogUtils } from "./logUtils";
import NativeMessageService from "./nativeMessageService";
import * as config from "./variables";
Expand All @@ -28,8 +30,23 @@ const { name } = argv;
return;
}

// Get active account userId
const status = await nativeMessageService.checkStatus(handshakeResponse.sharedKey);

const activeUser = status.payload.filter((a) => a.active === true && a.status === "unlocked")[0];
if (activeUser === undefined) {
LogUtils.logError("No active or unlocked user");
}
LogUtils.logWarning("Active userId: " + activeUser.id);

LogUtils.logSuccess("Handshake success response");
const response = await nativeMessageService.credentialCreation(handshakeResponse.sharedKey, name);
const response = await nativeMessageService.credentialCreation(handshakeResponse.sharedKey, {
name: name,
userName: "SuperAwesomeUser",
password: "dolhpin",
uri: "google.com",
userId: activeUser.id,
} as CredentialCreatePayload);

if (response.payload.status === "failure") {
LogUtils.logError("Failure response returned ");
Expand Down
19 changes: 10 additions & 9 deletions apps/desktop/native-messaging-test-runner/src/bw-credential-update.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import "module-alias/register";
import yargs from "yargs";
import { hideBin } from "yargs/helpers";

import { CredentialUpdatePayload } from "../../src/models/nativeMessaging/credentialUpdatePayload";

import { LogUtils } from "./logUtils";
import NativeMessageService from "./nativeMessageService";
import * as config from "./variables";
Expand Down Expand Up @@ -57,16 +59,15 @@ const { name, username, password, uri } = argv;
}
LogUtils.logWarning("Active userId: " + activeUser.id);

const response = await nativeMessageService.credentialUpdate(
handshakeResponse.sharedKey,
name,
password,
username,
uri,
activeUser.id,
const response = await nativeMessageService.credentialUpdate(handshakeResponse.sharedKey, {
name: name,
password: password,
userName: username,
uri: uri,
userId: activeUser.id,
// Replace with credentialId you want to update
"2a08b546-fa9d-48cc-ae8e-ae7601207da9"
);
credentialId: "2a08b546-fa9d-48cc-ae8e-ae7601207da9",
} as CredentialUpdatePayload);

if (response.payload.status === "failure") {
LogUtils.logError("Failure response returned ");
Expand Down
28 changes: 7 additions & 21 deletions apps/desktop/native-messaging-test-runner/src/nativeMessageService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,16 +89,14 @@ export default class NativeMessageService {
return this.decryptResponsePayload(response.encryptedPayload, key);
}

async credentialCreation(key: string, name: string): Promise<DecryptedCommandData> {
async credentialCreation(
key: string,
credentialData: CredentialCreatePayload
): Promise<DecryptedCommandData> {
const encryptedCommand = await this.encryptCommandData(
{
command: "bw-credential-create",
payload: {
name: name,
userName: "SuperAwesomeUser",
password: "dolhpin",
uri: "google.com",
} as CredentialCreatePayload,
payload: credentialData,
},
key
);
Expand All @@ -111,24 +109,12 @@ export default class NativeMessageService {

async credentialUpdate(
key: string,
name: string,
password: string,
username: string,
uri: string,
userId: string,
credentialId: string
credentialData: CredentialUpdatePayload
): Promise<DecryptedCommandData> {
const encryptedCommand = await this.encryptCommandData(
{
command: "bw-credential-update",
payload: {
userId: userId,
credentialId: credentialId,
userName: username,
uri: uri,
password: password,
name: name,
} as CredentialUpdatePayload,
payload: credentialData,
},
key
);
Expand Down
9 changes: 5 additions & 4 deletions apps/desktop/src/app/services/services.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { AbstractThemingService } from "@bitwarden/angular/services/theming/them
import { AbstractEncryptService } from "@bitwarden/common/abstractions/abstractEncrypt.service";
import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/abstractions/auth.service";
import { BroadcasterService as BroadcasterServiceAbstraction } from "@bitwarden/common/abstractions/broadcaster.service";
import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
import { CipherService as CipherServiceAbstraction } from "@bitwarden/common/abstractions/cipher.service";
import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/abstractions/crypto.service";
import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@bitwarden/common/abstractions/cryptoFunction.service";
import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service";
Expand All @@ -26,7 +26,7 @@ import {
import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/abstractions/messaging.service";
import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/abstractions/passwordReprompt.service";
import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/abstractions/platformUtils.service";
import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
import { PolicyService as PolicyServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
import { StateService as StateServiceAbstraction } from "@bitwarden/common/abstractions/state.service";
import { StateMigrationService as StateMigrationServiceAbstraction } from "@bitwarden/common/abstractions/stateMigration.service";
import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service";
Expand Down Expand Up @@ -158,8 +158,9 @@ const RELOAD_CALLBACK = new InjectionToken<() => any>("RELOAD_CALLBACK");
AuthServiceAbstraction,
CryptoServiceAbstraction,
CryptoFunctionServiceAbstraction,
CipherService,
PolicyService,
CipherServiceAbstraction,
PolicyServiceAbstraction,
MessagingServiceAbstraction,
],
},
],
Expand Down
24 changes: 21 additions & 3 deletions apps/desktop/src/services/nativeMessageHandler.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { ipcRenderer } from "electron";
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 { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus";
import { CipherType } from "@bitwarden/common/enums/cipherType";
Expand Down Expand Up @@ -39,7 +40,8 @@ export class NativeMessageHandler {
private cryptoService: CryptoService,
private cryptoFunctionService: CryptoFunctionService,
private cipherService: CipherService,
private policyService: PolicyService
private policyService: PolicyService,
private messagingService: MessagingService
) {}

async handleMessage(message: Message) {
Expand Down Expand Up @@ -181,8 +183,11 @@ export class NativeMessageHandler {
}
case "bw-credential-create": {
const activeUserId = await this.stateService.getUserId();
const authStatus = await this.authService.getAuthStatus(activeUserId);
if (payload.userId !== activeUserId) {
return { error: "not-active-user" };
}

const authStatus = await this.authService.getAuthStatus(activeUserId);
if (authStatus !== AuthenticationStatus.Unlocked) {
return { error: "locked" };
}
Expand All @@ -209,15 +214,23 @@ export class NativeMessageHandler {
const encrypted = await this.cipherService.encrypt(cipherView);
await this.cipherService.saveWithServer(encrypted);

// Notify other clients of new login
await this.messagingService.send("addedCipher");
// Refresh Desktop ciphers list
await this.messagingService.send("refreshCiphers");

return { status: "success" };
} catch (error) {
return { status: "failure" };
}
}
case "bw-credential-update": {
const activeUserId = await this.stateService.getUserId();
const authStatus = await this.authService.getAuthStatus(activeUserId);
if (payload.userId !== activeUserId) {
return { error: "not-active-user" };
}

const authStatus = await this.authService.getAuthStatus(activeUserId);
if (authStatus !== AuthenticationStatus.Unlocked) {
return { error: "locked" };
}
Expand All @@ -242,6 +255,11 @@ export class NativeMessageHandler {

await this.cipherService.saveWithServer(encrypted);

// Notify other clients of update
await this.messagingService.send("editedCipher");
// Refresh Desktop ciphers list
await this.messagingService.send("refreshCiphers");

return { status: "success" };
} catch (error) {
return { status: "failure" };
Expand Down