mirror of
https://github.com/bitwarden/browser
synced 2025-12-21 10:43:35 +00:00
* Turn on passkeys and dev mode
* PM-19138: Add try-catch to desktop-autofill (#13964)
* PM-19424: React to IPC disconnect (#14123)
* React to IPC disconnects
* Minor cleanup
* Update apps/desktop/package.json
Co-authored-by: Daniel García <dani-garcia@users.noreply.github.com>
* Relaxed ordering
---------
Co-authored-by: Daniel García <dani-garcia@users.noreply.github.com>
* Autofill/pm 9034 implement passkey for unlocked accounts (#13826)
* Passkey stuff
Co-authored-by: Anders Åberg <github@andersaberg.com>
* Ugly hacks
* Work On Modal State Management
* Applying modalStyles
* modal
* Improved hide/show
* fixed promise
* File name
* fix prettier
* Protecting against null API's and undefined data
* Only show fake popup to devs
* cleanup mock code
* rename minmimal-app to modal-app
* Added comment
* Added comment
* removed old comment
* Avoided changing minimum size
* Add small comment
* Rename component
* adress feedback
* Fixed uppercase file
* Fixed build
* Added codeowners
* added void
* commentary
* feat: reset setting on app start
* Moved reset to be in main / process launch
* Add comment to create window
* Added a little bit of styling
* Use Messaging service to loadUrl
* Enable passkeysautofill
* Add logging
* halfbaked
* Integration working
* And now it works without extra delay
* Clean up
* add note about messaging
* lb
* removed console.logs
* Cleanup and adress review feedback
* This hides the swift UI
* add modal components
* update modal with correct ciphers and functionality
* add create screen
* pick credential, draft
* Remove logger
* a whole lot of wiring
* not working
* Improved wiring
* Cancel after 90s
* Introduced observable
* update cipher handling
* update to use matchesUri
* Launching bitwarden if its not running
* Passing position from native to electron
* Rename inModalMode to modalMode
* remove tap
* revert spaces
* added back isDev
* cleaned up a bit
* Cleanup swift file
* tweaked logging
* clean up
* Update apps/desktop/macos/autofill-extension/CredentialProviderViewController.swift
Co-authored-by: Andreas Coroiu <acoroiu@bitwarden.com>
* Update apps/desktop/src/platform/main/autofill/native-autofill.main.ts
Co-authored-by: Andreas Coroiu <acoroiu@bitwarden.com>
* Update apps/desktop/src/platform/services/desktop-settings.service.ts
Co-authored-by: Andreas Coroiu <acoroiu@bitwarden.com>
* adress position feedback
* Update apps/desktop/macos/autofill-extension/CredentialProviderViewController.swift
Co-authored-by: Andreas Coroiu <acoroiu@bitwarden.com>
* Removed extra logging
* Adjusted error logging
* Use .error to log errors
* remove dead code
* Update desktop-autofill.service.ts
* use parseCredentialId instead of guidToRawFormat
* Update apps/desktop/src/autofill/services/desktop-autofill.service.ts
Co-authored-by: Andreas Coroiu <acoroiu@bitwarden.com>
* Change windowXy to a Record instead of [number,number]
* Update apps/desktop/src/autofill/services/desktop-fido2-user-interface.service.ts
Co-authored-by: Andreas Coroiu <acoroiu@bitwarden.com>
* Remove unsued dep and comment
* changed timeout to be spec recommended maxium, 10 minutes, for now.
* Correctly assume UP
* Removed extra cancelRequest in deinint
* Add timeout and UV to confirmChoseCipher
UV is performed by UI, not the service
* Improved docs regarding undefined cipherId
* cleanup: UP is no longer undefined
* Run completeError if ipc messages conversion failed
* don't throw, instead return undefined
* Disabled passkey provider
* Throw error if no activeUserId was found
* removed comment
* Fixed lint
* removed unsued service
* reset entitlement formatting
* Update entitlements.mas.plist
* Fix build issues
* Fix import issues
* Update route names to use `fido2`
* Fix being unable to select a passkey
* Fix linting issues
* Followup to fix merge issues and other comments
* Update `userHandle` value
* Add error handling for missing session or other errors
* Remove unused route
* Fix linting issues
* Simplify updateCredential method
* Followup to remove comments and timeouts and handle errors
* Address lint issue by using `takeUntilDestroyed`
* PR Followup for typescript and vault concerns
* Add try block for cipher creation
* Make userId manditory for cipher service
---------
Co-authored-by: Justin Baur <19896123+justindbaur@users.noreply.github.com>
Co-authored-by: Anders Åberg <github@andersaberg.com>
Co-authored-by: Anders Åberg <anders@andersaberg.com>
Co-authored-by: Colton Hurst <colton@coltonhurst.com>
Co-authored-by: Andreas Coroiu <andreas.coroiu@gmail.com>
Co-authored-by: Evan Bassler <evanbassler@Mac.attlocal.net>
Co-authored-by: Andreas Coroiu <acoroiu@bitwarden.com>
* PM-11455: Trigger sync when user enables OS setting (#14127)
* Implemented a SendNativeStatus command
This allows reporting status or asking the electron app to do something.
* fmt
* Update apps/desktop/src/autofill/services/desktop-autofill.service.ts
Co-authored-by: Daniel García <dani-garcia@users.noreply.github.com>
* clean up
* Don't add empty callbacks
* Removed comment
---------
Co-authored-by: Daniel García <dani-garcia@users.noreply.github.com>
* Added support for handling a locked vault
Handle unlocktimeout
* PM-19511: Add support for ExcludedCredentials (#14128)
* works
* Add mapping
* remove the build script
* cleanup
* simplify updatedCipher (#14179)
* Fix base64url decode on MacOS passkeys (#14227)
* Add support for padding in base64url decode
* whitespace
* whitespace
* Autofill/pm 17444 use reprompt (#14004)
* Passkey stuff
Co-authored-by: Anders Åberg <github@andersaberg.com>
* Ugly hacks
* Work On Modal State Management
* Applying modalStyles
* modal
* Improved hide/show
* fixed promise
* File name
* fix prettier
* Protecting against null API's and undefined data
* Only show fake popup to devs
* cleanup mock code
* rename minmimal-app to modal-app
* Added comment
* Added comment
* removed old comment
* Avoided changing minimum size
* Add small comment
* Rename component
* adress feedback
* Fixed uppercase file
* Fixed build
* Added codeowners
* added void
* commentary
* feat: reset setting on app start
* Moved reset to be in main / process launch
* Add comment to create window
* Added a little bit of styling
* Use Messaging service to loadUrl
* Enable passkeysautofill
* Add logging
* halfbaked
* Integration working
* And now it works without extra delay
* Clean up
* add note about messaging
* lb
* removed console.logs
* Cleanup and adress review feedback
* This hides the swift UI
* add modal components
* update modal with correct ciphers and functionality
* add create screen
* pick credential, draft
* Remove logger
* a whole lot of wiring
* not working
* Improved wiring
* Cancel after 90s
* Introduced observable
* update cipher handling
* update to use matchesUri
* Launching bitwarden if its not running
* Passing position from native to electron
* Rename inModalMode to modalMode
* remove tap
* revert spaces
* added back isDev
* cleaned up a bit
* Cleanup swift file
* tweaked logging
* clean up
* Update apps/desktop/macos/autofill-extension/CredentialProviderViewController.swift
Co-authored-by: Andreas Coroiu <acoroiu@bitwarden.com>
* Update apps/desktop/src/platform/main/autofill/native-autofill.main.ts
Co-authored-by: Andreas Coroiu <acoroiu@bitwarden.com>
* Update apps/desktop/src/platform/services/desktop-settings.service.ts
Co-authored-by: Andreas Coroiu <acoroiu@bitwarden.com>
* adress position feedback
* Update apps/desktop/macos/autofill-extension/CredentialProviderViewController.swift
Co-authored-by: Andreas Coroiu <acoroiu@bitwarden.com>
* Removed extra logging
* Adjusted error logging
* Use .error to log errors
* remove dead code
* Update desktop-autofill.service.ts
* use parseCredentialId instead of guidToRawFormat
* Update apps/desktop/src/autofill/services/desktop-autofill.service.ts
Co-authored-by: Andreas Coroiu <acoroiu@bitwarden.com>
* Change windowXy to a Record instead of [number,number]
* Update apps/desktop/src/autofill/services/desktop-fido2-user-interface.service.ts
Co-authored-by: Andreas Coroiu <acoroiu@bitwarden.com>
* Remove unsued dep and comment
* changed timeout to be spec recommended maxium, 10 minutes, for now.
* Correctly assume UP
* Removed extra cancelRequest in deinint
* Add timeout and UV to confirmChoseCipher
UV is performed by UI, not the service
* Improved docs regarding undefined cipherId
* cleanup: UP is no longer undefined
* Run completeError if ipc messages conversion failed
* don't throw, instead return undefined
* Disabled passkey provider
* Throw error if no activeUserId was found
* removed comment
* Fixed lint
* removed unsued service
* reset entitlement formatting
* Update entitlements.mas.plist
* Fix build issues
* Fix import issues
* Update route names to use `fido2`
* Fix being unable to select a passkey
* Fix linting issues
* Added support for handling a locked vault
* Followup to fix merge issues and other comments
* Update `userHandle` value
* Add error handling for missing session or other errors
* Remove unused route
* Fix linting issues
* Simplify updateCredential method
* Add master password reprompt on passkey create
* Followup to remove comments and timeouts and handle errors
* Address lint issue by using `takeUntilDestroyed`
* Add MP prompt to cipher selection
* Change how timeout is handled
* Include `of` from rxjs
* Hide blue header for passkey popouts (#14095)
* Hide blue header for passkey popouts
* Fix issue with test
* Fix ngOnDestroy complaint
* Import OnDestroy correctly
* Only require master password if item requires it
---------
Co-authored-by: Justin Baur <19896123+justindbaur@users.noreply.github.com>
Co-authored-by: Anders Åberg <github@andersaberg.com>
Co-authored-by: Anders Åberg <anders@andersaberg.com>
Co-authored-by: Colton Hurst <colton@coltonhurst.com>
Co-authored-by: Andreas Coroiu <andreas.coroiu@gmail.com>
Co-authored-by: Evan Bassler <evanbassler@Mac.attlocal.net>
Co-authored-by: Andreas Coroiu <acoroiu@bitwarden.com>
* Change modal size to 600x600
* Improve MacOS Syncing
This changes the behaviour to react to logoff, but not to account locks. It also adds better error handling on the native side.
* Improved modalPosition by allowing multiple calls to applyModalStyles
* moved imports to please lint
* Make passkey header stick for select and create (#14357)
* Added local build command
* Exclude credentials using kvc to avoid comilation error in cicd (#14568)
* Fix syntax error
* Don't use kvc
* Enables the autofill extension in mac and mas builds (#14373)
* Enables autofill extension building
* Try use macos-14
* add --break-system-packages for macos14
* revert using build-native
* try add rustup target add x86_64-apple-darwin
* add more rustup target add x86_64-apple-darwin
* try to force sdk version
* Show SDK versions
* USE KVC for excludedCredentials
* added xcodebuild deugging
* Revert "try to force sdk version"
This reverts commit d94f2550ad.
* Use macos-15
* undo merge
* remove macos-15 from cli
* remove macos-15 from browser
---------
Co-authored-by: Anders Åberg <anders@andersaberg.com>
* Improve Autofill IPC reliability (#14358)
* Delay IPC server start
* Better ipc handling
* Rename ready() to listenerReady()
---------
Co-authored-by: Daniel García <dani-garcia@users.noreply.github.com>
* feat: add test and check for too long buffers (#14775)
* Autofill/PM-19511: Overwrite and reprompt (#14288)
* Show items for url that don't have passkey
* Show existing login items in the UI
* Filter available cipher results (#14399)
* Filter available cipher results
* Fix linting issues
* Update logic for eligible ciphers
* Remove unused method to check matching username
* PM-20608 update styling for excludedCredentials (#14444)
* PM-20608 update styling for excludedCredentials
* Have flow correctly move to creation for excluded cipher
* Remove duplicate confirmNeCredential call
* Revert fido2-authenticator changes and move the excluded check
* Create a separate component for excluded cipher view
* Display traffic light MacOS buttons when the vault is locked (#14673)
* Remove unneccessary filter for excludedCiphers
* Remove dead code from the excluded ciphers work
* Remove excludedCipher checks from fido2 create and vault
* Remove excludedCipher remnants from vault and simplify create cipher logic
* Move cipherHasNoOtherPasskeys to shared fido2-utils
* Remove all containsExcludedCipher references
* Use `bufferToString` to convert `userHandle`
---------
Co-authored-by: Jeffrey Holland <jholland@livefront.com>
Co-authored-by: Jeffrey Holland <124393578+jholland-livefront@users.noreply.github.com>
* Move modal files to `autofill` and rename dir to `credentials` (#14757)
* Show existing login items in the UI
* Filter available cipher results (#14399)
* Filter available cipher results
* Fix linting issues
* Update logic for eligible ciphers
* Remove unused method to check matching username
* PM-20608 update styling for excludedCredentials (#14444)
* PM-20608 update styling for excludedCredentials
* Have flow correctly move to creation for excluded cipher
* Remove duplicate confirmNeCredential call
* Revert fido2-authenticator changes and move the excluded check
* Create a separate component for excluded cipher view
* Display traffic light MacOS buttons when the vault is locked (#14673)
* Remove unneccessary filter for excludedCiphers
* Remove dead code from the excluded ciphers work
* Remove excludedCipher checks from fido2 create and vault
* Move modal files to `autofill` and rename dir to `credentials`
* Update merge issues
* Add tests for `cipherHasNoOtherPasskeys` (#14829)
* Adjust spacing to place new login button below other items (#14877)
* Adjust spacing to place new login button below other items
* Add correct design when no credentials available (#14879)
* Autofill/pm 21903 use translations everywhere for passkeys (#14908)
* Adjust spacing to place new login button below other items
* Add correct design when no credentials available
* Add correct design when no credentials available (#14879)
* Remove hardcoded strings and use translations in passkey flow
* Remove duplicate `select` translation
* Autofill/pm 21864 center unlock vault modal (#14867)
* Center the Locked Vault modal when using passkeys
* Revert swift changes and handle offscreen modals
* Remove comments
* Add rustup for cicd to work (#15055)
* Hide credentials that are in the bin (#15034)
* Add tests for passkey components (#15185)
* Add tests for passkey components
* Reuse cipher in chooseCipher tests and simplify mock creation
* Autofill/pm 22821 center vault modal (#15243)
* Center the vault modal for passkeys
* Add comments and fix electron-builder.json
* Set values to Int32 in the ternaries
* Refactor Fido2 Components (#15105)
* Refactor Fido2 Components
* Address error message and missing session
* Address remaining missing session
* Reset modals so subsequent creates work (#15145)
* Fix broken test
* Rename relevantCiphers to displayedCiphers
* Clean up heading settings, errors, and other concerns
* Address missing comments and throw error in try block
* fix type issue for SimpleDialogType
* fix type issue for SimpleDialogType
* Revert new type
* try using as null to satisfy type issue
* Remove use of firstValueFrom in create component
* PM-22476: Show config UI while enabling Bitwarden (#15149)
* Show config ui while enabling Bitwarden
* locals
* Added Localizable strings
* Changed the linebreakmode
* Removed swedish locals
* Add provisioning profile values to electron build (#15412)
* Address BitwardenShield icon issue
* Fix fido2-vault component
* Display the vault modal when selecting Bitwarden... (#15257)
* Passkeys filtering breaks on SSH keys (#15448)
* Display the blue header on the locked vault passkey flow (#15655)
* PM-23848: Use the MacOS UI-friendly API instead (#15650)
* Implement prepareInterfaceToProvideCredential
* Implement prepareInterfaceToProvideCredential
* Implement prepareInterfaceToProvideCredential
* Implement prepareInterfaceToProvideCredential
* Implement prepareInterfaceToProvideCredential
* Implement prepareInterfaceToProvideCredential
* Implement prepareInterfaceToProvideCredential
* Fix action text and close vault modal (#15634)
* Fix action text and close vault modal
* Fix broken tests
* Update SVG to support dark mode (#15805)
* When a locked vault is unlocked displays correctly (#15612)
* When a locked vault is unlocked displays correctly
* Keep old behavior while checking for recently unlocked vault
* Revert the electron-builder
* Simplify by using a simple redirect when vault unlocked
* Remove single use of `userSelectedCipher`
* Add a guard clause to unlock
* Revert to original spacing
* Add reactive guard to unlock vault
* Fix for passkey picker closing prematurely
* Remove unneeded root navigation in ensureUnlockedVault
* Fix vault not unlocking
* Update broken tests for lock component
* Add missing brace to preload.ts
* Run lint
* Added explainer
* Moved the explainer
* Tidying up readme
* Add feature flag to short-circuit the passkey provider (#16003)
* Add feature flag to short-circuit the passkey provider
* Check FF in renderer instead
* Lint fixes
* PM-22175: Improve launch of app + window positioning (#15658)
* Implement prepareInterfaceToProvideCredential
* Implement prepareInterfaceToProvideCredential
* Implement prepareInterfaceToProvideCredential
* Implement prepareInterfaceToProvideCredential
* Implement prepareInterfaceToProvideCredential
* Implement prepareInterfaceToProvideCredential
* Implement prepareInterfaceToProvideCredential
* Fix launch of app + window pos
* Wait for animation to complete and use proper position
* Wait for animation to complete and use proper position
* Added commentary
* Remove console.log
* Remove call to removed function
---------
Co-authored-by: Jeffrey Holland <jholland@livefront.com>
Co-authored-by: Jeffrey Holland <124393578+jholland-livefront@users.noreply.github.com>
* Update fido2-vault and fido2-service implementations
* Use tailwind-alike classes for new styles
* Add label to biticons in passkey modals
* Fix broken vault test
* Revert to original `isDev` function
* Add comment to lock component describing `disable-redirect` param
* Use tailwind classes instead of custom sticky header class
* Use standard `tw-z-10` for z-index
* Change log service levels
* Mock svg icons for CI
* Add back provisioning profiles
* Remove `--break-system-packages` and simplify commands
* Revert `cipherId` param for `confirmNewCredential`
* Remove placeholder UI
* Small improvements to the readme
* Remove optional userId and deprecated method
* Autofill should own the macos_provider (#16271)
* Autofill should own the macos_provider
* Autofill should own the macos_provider
* Remove unnecessary logs, no magic numbers, revert `cipherId?`
* Fixes for broken build
* Update test issues
* [BEEEP] Use tracing in macOS provider
* Update comments and add null check for ciphers
* Update status comments and readme
* Remove electron modal mode link
* Clarify modal mode use
* Add comment about usernames
* Add comment that we don't support extensions yet
* Added comment about base64 format
* Use NO_CALLBACK_INDICATOR
* cb -> callback
* Update apps/desktop/desktop_native/napi/src/lib.rs
Co-authored-by: neuronull <9162534+neuronull@users.noreply.github.com>
* Clean up Fido2Create subscriptions and update comments
* added comment to clarify silent exception
* Add comments
* clean up unwrap()
* set log level filter to INFO
* Address modal popup issue
* plutil on Info.plist
* Adhere to style guides
* Fix broken lock ui component tests
* Fix broken lock ui component tests
* Added codeowners entry
* logservice.warning -> debug
* Uint8Array -> ArrayBuffer
* Remove autofill entitlement
* Fix linting issues
* Fix arm build issue
* Adjust build command
* Add missing entitlement
* revert missing entitlement change
* Add proper autofill entitlements
* Remove autofill extension from mas builds
* Run rust formatter
---------
Co-authored-by: Daniel García <dani-garcia@users.noreply.github.com>
Co-authored-by: Jeffrey Holland <124393578+jholland-livefront@users.noreply.github.com>
Co-authored-by: Justin Baur <19896123+justindbaur@users.noreply.github.com>
Co-authored-by: Colton Hurst <colton@coltonhurst.com>
Co-authored-by: Andreas Coroiu <andreas.coroiu@gmail.com>
Co-authored-by: Evan Bassler <evanbassler@Mac.attlocal.net>
Co-authored-by: Andreas Coroiu <acoroiu@bitwarden.com>
Co-authored-by: Nathan Ansel <nathan@livefront.com>
Co-authored-by: Jeffrey Holland <jholland@livefront.com>
Co-authored-by: Robyn MacCallum <robyntmaccallum@gmail.com>
Co-authored-by: neuronull <9162534+neuronull@users.noreply.github.com>
297 lines
10 KiB
Rust
297 lines
10 KiB
Rust
#![cfg(target_os = "macos")]
|
|
#![allow(clippy::disallowed_macros)] // uniffi macros trip up clippy's evaluation
|
|
|
|
use std::{
|
|
collections::HashMap,
|
|
sync::{atomic::AtomicU32, Arc, Mutex, Once},
|
|
time::Instant,
|
|
};
|
|
|
|
use futures::FutureExt;
|
|
use serde::{de::DeserializeOwned, Deserialize, Serialize};
|
|
use tracing::{error, info};
|
|
use tracing_subscriber::{
|
|
filter::{EnvFilter, LevelFilter},
|
|
layer::SubscriberExt,
|
|
util::SubscriberInitExt,
|
|
};
|
|
|
|
uniffi::setup_scaffolding!();
|
|
|
|
mod assertion;
|
|
mod registration;
|
|
|
|
use assertion::{
|
|
PasskeyAssertionRequest, PasskeyAssertionWithoutUserInterfaceRequest,
|
|
PreparePasskeyAssertionCallback,
|
|
};
|
|
use registration::{PasskeyRegistrationRequest, PreparePasskeyRegistrationCallback};
|
|
|
|
static INIT: Once = Once::new();
|
|
|
|
#[derive(uniffi::Enum, Debug, Serialize, Deserialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
pub enum UserVerification {
|
|
Preferred,
|
|
Required,
|
|
Discouraged,
|
|
}
|
|
|
|
#[derive(uniffi::Record, Debug, Serialize, Deserialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
pub struct Position {
|
|
pub x: i32,
|
|
pub y: i32,
|
|
}
|
|
|
|
#[derive(Debug, uniffi::Error, Serialize, Deserialize)]
|
|
pub enum BitwardenError {
|
|
Internal(String),
|
|
}
|
|
|
|
// TODO: These have to be named differently than the actual Uniffi traits otherwise
|
|
// the generated code will lead to ambiguous trait implementations
|
|
// These are only used internally, so it doesn't matter that much
|
|
trait Callback: Send + Sync {
|
|
fn complete(&self, credential: serde_json::Value) -> Result<(), serde_json::Error>;
|
|
fn error(&self, error: BitwardenError);
|
|
}
|
|
|
|
#[derive(uniffi::Enum, Debug)]
|
|
/// Store the connection status between the macOS credential provider extension
|
|
/// and the desktop application's IPC server.
|
|
pub enum ConnectionStatus {
|
|
Connected,
|
|
Disconnected,
|
|
}
|
|
|
|
#[derive(uniffi::Object)]
|
|
pub struct MacOSProviderClient {
|
|
to_server_send: tokio::sync::mpsc::Sender<String>,
|
|
|
|
// We need to keep track of the callbacks so we can call them when we receive a response
|
|
response_callbacks_counter: AtomicU32,
|
|
#[allow(clippy::type_complexity)]
|
|
response_callbacks_queue: Arc<Mutex<HashMap<u32, (Box<dyn Callback>, Instant)>>>,
|
|
|
|
// Flag to track connection status - atomic for thread safety without locks
|
|
connection_status: Arc<std::sync::atomic::AtomicBool>,
|
|
}
|
|
|
|
#[derive(Serialize, Deserialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
/// Store native desktop status information to use for IPC communication
|
|
/// between the application and the macOS credential provider.
|
|
pub struct NativeStatus {
|
|
key: String,
|
|
value: String,
|
|
}
|
|
|
|
// In our callback management, 0 is a reserved sequence number indicating that a message does not
|
|
// have a callback.
|
|
const NO_CALLBACK_INDICATOR: u32 = 0;
|
|
|
|
#[uniffi::export]
|
|
impl MacOSProviderClient {
|
|
// FIXME: Remove unwraps! They panic and terminate the whole application.
|
|
#[allow(clippy::unwrap_used)]
|
|
#[uniffi::constructor]
|
|
pub fn connect() -> Self {
|
|
INIT.call_once(|| {
|
|
let filter = EnvFilter::builder()
|
|
// Everything logs at `INFO`
|
|
.with_default_directive(LevelFilter::INFO.into())
|
|
.from_env_lossy();
|
|
|
|
tracing_subscriber::registry()
|
|
.with(filter)
|
|
.with(tracing_oslog::OsLogger::new(
|
|
"com.bitwarden.desktop.autofill-extension",
|
|
"default",
|
|
))
|
|
.init();
|
|
});
|
|
|
|
let (from_server_send, mut from_server_recv) = tokio::sync::mpsc::channel(32);
|
|
let (to_server_send, to_server_recv) = tokio::sync::mpsc::channel(32);
|
|
|
|
let client = MacOSProviderClient {
|
|
to_server_send,
|
|
response_callbacks_counter: AtomicU32::new(1), /* Start at 1 since 0 is reserved for
|
|
* "no callback" scenarios */
|
|
response_callbacks_queue: Arc::new(Mutex::new(HashMap::new())),
|
|
connection_status: Arc::new(std::sync::atomic::AtomicBool::new(false)),
|
|
};
|
|
|
|
let path = desktop_core::ipc::path("af");
|
|
|
|
let queue = client.response_callbacks_queue.clone();
|
|
let connection_status = client.connection_status.clone();
|
|
|
|
std::thread::spawn(move || {
|
|
let rt = tokio::runtime::Builder::new_current_thread()
|
|
.enable_all()
|
|
.build()
|
|
.expect("Can't create runtime");
|
|
|
|
rt.spawn(
|
|
desktop_core::ipc::client::connect(path, from_server_send, to_server_recv)
|
|
.map(|r| r.map_err(|e| e.to_string())),
|
|
);
|
|
|
|
rt.block_on(async move {
|
|
while let Some(message) = from_server_recv.recv().await {
|
|
match serde_json::from_str::<SerializedMessage>(&message) {
|
|
Ok(SerializedMessage::Command(CommandMessage::Connected)) => {
|
|
info!("Connected to server");
|
|
connection_status.store(true, std::sync::atomic::Ordering::Relaxed);
|
|
}
|
|
Ok(SerializedMessage::Command(CommandMessage::Disconnected)) => {
|
|
info!("Disconnected from server");
|
|
connection_status.store(false, std::sync::atomic::Ordering::Relaxed);
|
|
}
|
|
Ok(SerializedMessage::Message {
|
|
sequence_number,
|
|
value,
|
|
}) => match queue.lock().unwrap().remove(&sequence_number) {
|
|
Some((cb, request_start_time)) => {
|
|
info!(
|
|
"Time to process request: {:?}",
|
|
request_start_time.elapsed()
|
|
);
|
|
match value {
|
|
Ok(value) => {
|
|
if let Err(e) = cb.complete(value) {
|
|
error!(error = %e, "Error deserializing message");
|
|
}
|
|
}
|
|
Err(e) => {
|
|
error!(error = ?e, "Error processing message");
|
|
cb.error(e)
|
|
}
|
|
}
|
|
}
|
|
None => {
|
|
error!(sequence_number, "No callback found for sequence number")
|
|
}
|
|
},
|
|
Err(e) => {
|
|
error!(error = %e, "Error deserializing message");
|
|
}
|
|
};
|
|
}
|
|
});
|
|
});
|
|
|
|
client
|
|
}
|
|
|
|
pub fn send_native_status(&self, key: String, value: String) {
|
|
let status = NativeStatus { key, value };
|
|
self.send_message(status, None);
|
|
}
|
|
|
|
pub fn prepare_passkey_registration(
|
|
&self,
|
|
request: PasskeyRegistrationRequest,
|
|
callback: Arc<dyn PreparePasskeyRegistrationCallback>,
|
|
) {
|
|
self.send_message(request, Some(Box::new(callback)));
|
|
}
|
|
|
|
pub fn prepare_passkey_assertion(
|
|
&self,
|
|
request: PasskeyAssertionRequest,
|
|
callback: Arc<dyn PreparePasskeyAssertionCallback>,
|
|
) {
|
|
self.send_message(request, Some(Box::new(callback)));
|
|
}
|
|
|
|
pub fn prepare_passkey_assertion_without_user_interface(
|
|
&self,
|
|
request: PasskeyAssertionWithoutUserInterfaceRequest,
|
|
callback: Arc<dyn PreparePasskeyAssertionCallback>,
|
|
) {
|
|
self.send_message(request, Some(Box::new(callback)));
|
|
}
|
|
|
|
pub fn get_connection_status(&self) -> ConnectionStatus {
|
|
let is_connected = self
|
|
.connection_status
|
|
.load(std::sync::atomic::Ordering::Relaxed);
|
|
if is_connected {
|
|
ConnectionStatus::Connected
|
|
} else {
|
|
ConnectionStatus::Disconnected
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Serialize, Deserialize)]
|
|
#[serde(tag = "command", rename_all = "camelCase")]
|
|
enum CommandMessage {
|
|
Connected,
|
|
Disconnected,
|
|
}
|
|
|
|
#[derive(Serialize, Deserialize)]
|
|
#[serde(untagged, rename_all = "camelCase")]
|
|
enum SerializedMessage {
|
|
Command(CommandMessage),
|
|
Message {
|
|
sequence_number: u32,
|
|
value: Result<serde_json::Value, BitwardenError>,
|
|
},
|
|
}
|
|
|
|
impl MacOSProviderClient {
|
|
#[allow(clippy::unwrap_used)]
|
|
fn add_callback(&self, callback: Box<dyn Callback>) -> u32 {
|
|
let sequence_number = self
|
|
.response_callbacks_counter
|
|
.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
|
|
|
|
self.response_callbacks_queue
|
|
.lock()
|
|
.expect("response callbacks queue mutex should not be poisoned")
|
|
.insert(sequence_number, (callback, Instant::now()));
|
|
|
|
sequence_number
|
|
}
|
|
|
|
#[allow(clippy::unwrap_used)]
|
|
fn send_message(
|
|
&self,
|
|
message: impl Serialize + DeserializeOwned,
|
|
callback: Option<Box<dyn Callback>>,
|
|
) {
|
|
let sequence_number = if let Some(callback) = callback {
|
|
self.add_callback(callback)
|
|
} else {
|
|
NO_CALLBACK_INDICATOR
|
|
};
|
|
|
|
let message = serde_json::to_string(&SerializedMessage::Message {
|
|
sequence_number,
|
|
value: Ok(serde_json::to_value(message).unwrap()),
|
|
})
|
|
.expect("Can't serialize message");
|
|
|
|
if let Err(e) = self.to_server_send.blocking_send(message) {
|
|
// Make sure we remove the callback from the queue if we can't send the message
|
|
if sequence_number != NO_CALLBACK_INDICATOR {
|
|
if let Some((callback, _)) = self
|
|
.response_callbacks_queue
|
|
.lock()
|
|
.expect("response callbacks queue mutex should not be poisoned")
|
|
.remove(&sequence_number)
|
|
{
|
|
callback.error(BitwardenError::Internal(format!(
|
|
"Error sending message: {e}"
|
|
)));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|