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

Move import to sdk and enable it in browser/web #12479

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Move import to sdk and enable it in browser/web #12479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
646f245
Move import to sdk and enable it in browser/web
quexten Dec 19, 2024
b57c5a9
Add uncomitted files
quexten Dec 19, 2024
4a1b674
Update package lock
quexten Dec 19, 2024
34a60d0
Fix prettier formatting
quexten Dec 19, 2024
b42aed6
Merge branch 'main' into km/pm-16227/ssh-import-web-browser
quexten Dec 19, 2024
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
29 changes: 28 additions & 1 deletion apps/browser/src/_locales/en/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
"copyNotes": {
"message": "Copy notes"
},
"fill":{
"fill": {
"message": "Fill",
"description": "This string is used on the vault page to indicate autofilling. Horizontal space is limited in the interface here so try and keep translations as concise as possible."
},
Expand Down Expand Up @@ -4954,5 +4954,32 @@
},
"extraWide": {
"message": "Extra wide"
},
"sshKeyWrongPassword": {
"message": "The password you entered is incorrect."
},
"importSshKey": {
"message": "Import"
},
"confirmSshKeyPassword": {
"message": "Confirm password"
},
"enterSshKeyPasswordDesc": {
"message": "Enter the password for the SSH key."
},
"enterSshKeyPassword": {
"message": "Enter password"
},
"invalidSshKey": {
"message": "The SSH key is invalid"
},
"sshKeyTypeUnsupported": {
"message": "The SSH key type is not supported"
},
"importSshKeyFromClipboard": {
"message": "Import key from clipboard"
},
"sshKeyPasted": {
"message": "SSH key imported successfully"
}
}
4 changes: 3 additions & 1 deletion apps/browser/src/vault/popup/components/vault/add-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folde
import { CipherType } from "@bitwarden/common/vault/enums";
import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cipher-authorization.service";
import { DialogService } from "@bitwarden/components";
import { DialogService, ToastService } from "@bitwarden/components";
import { PasswordRepromptService } from "@bitwarden/vault";

import { BrowserFido2UserInterfaceSession } from "../../../../autofill/fido2/services/browser-fido2-user-interface.service";
Expand Down Expand Up @@ -74,6 +74,7 @@ export class AddEditComponent extends BaseAddEditComponent implements OnInit {
configService: ConfigService,
private fido2UserVerificationService: Fido2UserVerificationService,
cipherAuthorizationService: CipherAuthorizationService,
toastService: ToastService,
) {
super(
cipherService,
Expand All @@ -94,6 +95,7 @@ export class AddEditComponent extends BaseAddEditComponent implements OnInit {
datePipe,
configService,
cipherAuthorizationService,
toastService,
);
}

Expand Down
6 changes: 5 additions & 1 deletion apps/desktop/desktop_native/core/src/ssh_agent/generator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ use rand::SeedableRng;
use rand_chacha::ChaCha8Rng;
use ssh_key::{Algorithm, HashAlg, LineEnding};

use super::importer::SshKey;
pub struct SshKey {
pub private_key: String,
pub public_key: String,
pub key_fingerprint: String,
}

pub async fn generate_keypair(key_algorithm: String) -> Result<SshKey, anyhow::Error> {
// sourced from cryptographically secure entropy source, with sources for all targets: https://docs.rs/getrandom
Expand Down
Loading
Loading