mirror of
https://github.com/bitwarden/browser
synced 2025-12-11 22:03:36 +00:00
* [PM-10395] Add new item type ssh key (#10360) * Implement ssh-key cipher type * Fix linting * Fix edit and view components for ssh-keys on desktop * Fix tests * Remove ssh key type references * Remove add ssh key option * Fix typo * Add tests * [PM-10399] Add ssh key import export for bitwarden json (#10529) * Add ssh key import export for bitwarden json * Remove key type from ssh key export * [PM-10406] Add privatekey publickey and fingerprint to both add-edit and view co… (#11046) * Add privatekey publickey and fingerprint to both add-edit and view components * Remove wrong a11y title * Fix testid * [PM-10098] SSH Agent & SSH Key creation for Bitwarden Desktop (#10293) * Add ssh agent, generator & import * Move ssh agent code to bitwarden-russh crate * Remove generator component * Cleanup * Cleanup * Remove left over sshGenerator reference * Cleanup * Add documentation to sshkeyimportstatus * Fix outdated variable name * Update apps/desktop/src/platform/preload.ts Co-authored-by: Andreas Coroiu <acoroiu@bitwarden.com> * Rename renderersshagent * Rename MainSshAgentService * Improve clarity of 'id' variables being used * Improve clarity of 'id' variables being used * Update apps/desktop/src/vault/app/vault/add-edit.component.html Co-authored-by: Andreas Coroiu <acoroiu@bitwarden.com> * Fix outdated cipher/messageid names * Rename SSH to Ssh * Make agent syncing more reactive * Move constants to top of class * Make sshkey cipher filtering clearer * Add stricter equality check on ssh key unlock * Fix build and messages * Fix incorrect featureflag name * Replace anonymous async function with switchmap pipe * Fix build * Update apps/desktop/desktop_native/napi/src/lib.rs Co-authored-by: Andreas Coroiu <acoroiu@bitwarden.com> * Revert incorrectly renamed 'Ssh' usages to SSH * Run cargo fmt * Clean up ssh agent sock path logic * Cleanup and split to platform specific files * Small cleanup * Pull out generator and importer into core * Rename renderersshagentservice to sshagentservice * Rename cipheruuid to cipher_id * Drop ssh dependencies from napi crate * Clean up windows build * Small cleanup * Small cleanup * Cleanup * Add rxjs pipeline for agent services * [PM-12555] Pkcs8 sshkey import & general ssh key import tests (#11048) * Add pkcs8 import and tests * Add key type unsupported error * Remove unsupported formats * Remove code for unsupported formats * Fix encrypted pkcs8 import * Add ed25519 pkcs8 unencrypted test file * SSH agent rxjs tweaks (#11148) * feat: rewrite sshagent.signrequest as purely observable * feat: fail the request when unlock times out * chore: clean up, add some clarifying comments * chore: remove unused dependency * fix: result `undefined` crashing in NAPI -> Rust * Allow concurrent SSH requests in rust * Remove unwraps * Cleanup and add init service init call * Fix windows * Fix timeout behavior on locked vault --------- Co-authored-by: Andreas Coroiu <acoroiu@bitwarden.com> * Fix libc dependency being duplicated * fix SSH casing (#11840) * Move ssh agent behind feature flag (#11841) * Move ssh agent behind feature flag * Add separate flag for ssh agent * [PM-14215] fix unsupported key type error message (#11788) * Fix error message for import of unsupported ssh keys * Use triple equals in add-edit component for ssh keys --------- Co-authored-by: Andreas Coroiu <acoroiu@bitwarden.com> Co-authored-by: aj-bw <81774843+aj-bw@users.noreply.github.com>
290 lines
8.5 KiB
TypeScript
290 lines
8.5 KiB
TypeScript
import { NgIf } from "@angular/common";
|
|
import {
|
|
AfterViewInit,
|
|
ChangeDetectorRef,
|
|
Component,
|
|
DestroyRef,
|
|
EventEmitter,
|
|
forwardRef,
|
|
inject,
|
|
Input,
|
|
OnChanges,
|
|
OnInit,
|
|
Output,
|
|
ViewChild,
|
|
} from "@angular/core";
|
|
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
|
|
import { FormBuilder, FormGroup, ReactiveFormsModule } from "@angular/forms";
|
|
import { Subject } from "rxjs";
|
|
|
|
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
|
|
import { CipherType, SecureNoteType } from "@bitwarden/common/vault/enums";
|
|
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
|
|
import {
|
|
AsyncActionsModule,
|
|
BitSubmitDirective,
|
|
ButtonComponent,
|
|
CardComponent,
|
|
FormFieldModule,
|
|
ItemModule,
|
|
SectionComponent,
|
|
SelectModule,
|
|
ToastService,
|
|
TypographyModule,
|
|
} from "@bitwarden/components";
|
|
|
|
import { CipherFormConfig } from "../abstractions/cipher-form-config.service";
|
|
import { CipherFormService } from "../abstractions/cipher-form.service";
|
|
import { CipherForm, CipherFormContainer } from "../cipher-form-container";
|
|
|
|
import { AdditionalOptionsSectionComponent } from "./additional-options/additional-options-section.component";
|
|
import { CardDetailsSectionComponent } from "./card-details-section/card-details-section.component";
|
|
import { IdentitySectionComponent } from "./identity/identity.component";
|
|
import { ItemDetailsSectionComponent } from "./item-details/item-details-section.component";
|
|
import { LoginDetailsSectionComponent } from "./login-details-section/login-details-section.component";
|
|
import { SshKeySectionComponent } from "./sshkey-section/sshkey-section.component";
|
|
|
|
@Component({
|
|
selector: "vault-cipher-form",
|
|
templateUrl: "./cipher-form.component.html",
|
|
standalone: true,
|
|
providers: [
|
|
{
|
|
provide: CipherFormContainer,
|
|
useExisting: forwardRef(() => CipherFormComponent),
|
|
},
|
|
],
|
|
imports: [
|
|
AsyncActionsModule,
|
|
CardComponent,
|
|
SectionComponent,
|
|
TypographyModule,
|
|
ItemModule,
|
|
FormFieldModule,
|
|
ReactiveFormsModule,
|
|
SelectModule,
|
|
ItemDetailsSectionComponent,
|
|
CardDetailsSectionComponent,
|
|
IdentitySectionComponent,
|
|
SshKeySectionComponent,
|
|
NgIf,
|
|
AdditionalOptionsSectionComponent,
|
|
LoginDetailsSectionComponent,
|
|
],
|
|
})
|
|
export class CipherFormComponent implements AfterViewInit, OnInit, OnChanges, CipherFormContainer {
|
|
@ViewChild(BitSubmitDirective)
|
|
private bitSubmit: BitSubmitDirective;
|
|
private destroyRef = inject(DestroyRef);
|
|
private _firstInitialized = false;
|
|
|
|
/**
|
|
* The form ID to use for the form. Used to connect it to a submit button.
|
|
*/
|
|
@Input({ required: true }) formId: string;
|
|
|
|
/**
|
|
* The configuration for the add/edit form. Used to determine which controls are shown and what values are available.
|
|
*/
|
|
@Input({ required: true }) config: CipherFormConfig;
|
|
|
|
/**
|
|
* Optional submit button that will be disabled or marked as loading when the form is submitting.
|
|
*/
|
|
@Input()
|
|
submitBtn?: ButtonComponent;
|
|
|
|
/**
|
|
* Optional function to call before submitting the form. If the function returns false, the form will not be submitted.
|
|
*/
|
|
@Input()
|
|
beforeSubmit: () => Promise<boolean>;
|
|
|
|
/**
|
|
* Event emitted when the cipher is saved successfully.
|
|
*/
|
|
@Output() cipherSaved = new EventEmitter<CipherView>();
|
|
|
|
private formReadySubject = new Subject<void>();
|
|
|
|
@Output() formReady = this.formReadySubject.asObservable();
|
|
|
|
/**
|
|
* The original cipher being edited or cloned. Null for add mode.
|
|
*/
|
|
originalCipherView: CipherView | null;
|
|
|
|
/**
|
|
* The form group for the cipher. Starts empty and is populated by child components via the `registerChildForm` method.
|
|
* @protected
|
|
*/
|
|
protected cipherForm = this.formBuilder.group<CipherForm>({});
|
|
|
|
/**
|
|
* The value of the updated cipher. Starts as a new cipher (or clone of originalCipher) and is updated
|
|
* by child components via the `patchCipher` method.
|
|
* @protected
|
|
*/
|
|
protected updatedCipherView: CipherView | null;
|
|
|
|
protected loading: boolean = true;
|
|
|
|
CipherType = CipherType;
|
|
|
|
ngAfterViewInit(): void {
|
|
if (this.submitBtn) {
|
|
this.bitSubmit.loading$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((loading) => {
|
|
this.submitBtn.loading = loading;
|
|
});
|
|
|
|
this.bitSubmit.disabled$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((disabled) => {
|
|
this.submitBtn.disabled = disabled;
|
|
});
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Registers a child form group with the parent form group. Used by child components to add their form groups to
|
|
* the parent form for validation.
|
|
* @param name - The name of the form group.
|
|
* @param group - The form group to add.
|
|
*/
|
|
registerChildForm<K extends keyof CipherForm>(
|
|
name: K,
|
|
group: Exclude<CipherForm[K], undefined>,
|
|
): void {
|
|
this.cipherForm.setControl(name, group);
|
|
}
|
|
|
|
/**
|
|
* Method to update the cipherView with the new values. This method should be called by the child form components
|
|
* @param updateFn - A function that takes the current cipherView and returns the updated cipherView
|
|
*/
|
|
patchCipher(updateFn: (current: CipherView) => CipherView): void {
|
|
this.updatedCipherView = updateFn(this.updatedCipherView);
|
|
}
|
|
|
|
/**
|
|
* We need to re-initialize the form when the config is updated.
|
|
*/
|
|
async ngOnChanges() {
|
|
// Avoid re-initializing the form on the first change detection cycle.
|
|
if (this._firstInitialized) {
|
|
await this.init();
|
|
}
|
|
}
|
|
|
|
async ngOnInit() {
|
|
await this.init();
|
|
this._firstInitialized = true;
|
|
}
|
|
|
|
async init() {
|
|
this.loading = true;
|
|
|
|
// Force change detection so that all child components are destroyed and re-created
|
|
this.changeDetectorRef.detectChanges();
|
|
|
|
this.updatedCipherView = new CipherView();
|
|
this.originalCipherView = null;
|
|
this.cipherForm = this.formBuilder.group<CipherForm>({});
|
|
|
|
if (this.config == null) {
|
|
return;
|
|
}
|
|
|
|
if (this.config.mode !== "add") {
|
|
if (this.config.originalCipher == null) {
|
|
throw new Error("Original cipher is required for edit or clone mode");
|
|
}
|
|
|
|
this.originalCipherView = await this.addEditFormService.decryptCipher(
|
|
this.config.originalCipher,
|
|
);
|
|
|
|
// decryptCipher again to ensure we have a separate instance of CipherView
|
|
this.updatedCipherView = await this.addEditFormService.decryptCipher(
|
|
this.config.originalCipher,
|
|
);
|
|
|
|
if (this.config.mode === "clone") {
|
|
this.updatedCipherView.id = null;
|
|
}
|
|
} else {
|
|
this.updatedCipherView.type = this.config.cipherType;
|
|
|
|
if (this.config.cipherType === CipherType.SecureNote) {
|
|
this.updatedCipherView.secureNote.type = SecureNoteType.Generic;
|
|
}
|
|
}
|
|
|
|
this.loading = false;
|
|
this.formReadySubject.next();
|
|
}
|
|
|
|
constructor(
|
|
private formBuilder: FormBuilder,
|
|
private addEditFormService: CipherFormService,
|
|
private toastService: ToastService,
|
|
private i18nService: I18nService,
|
|
private changeDetectorRef: ChangeDetectorRef,
|
|
) {}
|
|
|
|
/**
|
|
* Counts the number of invalid fields in a form group.
|
|
* @param formGroup - The form group to count the invalid fields in.
|
|
* @returns The number of invalid fields in the form group.
|
|
*/
|
|
private countInvalidFields(formGroup: FormGroup): number {
|
|
return Object.values(formGroup.controls).reduce((count, control) => {
|
|
if (control instanceof FormGroup) {
|
|
return count + this.countInvalidFields(control);
|
|
}
|
|
return count + (control.invalid ? 1 : 0);
|
|
}, 0);
|
|
}
|
|
|
|
submit = async () => {
|
|
if (this.cipherForm.invalid) {
|
|
this.cipherForm.markAllAsTouched();
|
|
|
|
const invalidFieldsCount = this.countInvalidFields(this.cipherForm);
|
|
if (invalidFieldsCount > 0) {
|
|
this.toastService.showToast({
|
|
variant: "error",
|
|
title: null,
|
|
message:
|
|
invalidFieldsCount === 1
|
|
? this.i18nService.t("singleFieldNeedsAttention")
|
|
: this.i18nService.t("multipleFieldsNeedAttention", invalidFieldsCount),
|
|
});
|
|
}
|
|
return;
|
|
}
|
|
|
|
if (this.beforeSubmit) {
|
|
const shouldSubmit = await this.beforeSubmit();
|
|
if (!shouldSubmit) {
|
|
return;
|
|
}
|
|
}
|
|
|
|
const savedCipher = await this.addEditFormService.saveCipher(
|
|
this.updatedCipherView,
|
|
this.config,
|
|
);
|
|
|
|
this.toastService.showToast({
|
|
variant: "success",
|
|
title: null,
|
|
message: this.i18nService.t(
|
|
this.config.mode === "edit" || this.config.mode === "partial-edit"
|
|
? "editedItem"
|
|
: "addedItem",
|
|
),
|
|
});
|
|
|
|
this.cipherSaved.emit(savedCipher);
|
|
};
|
|
}
|