mirror of
https://github.com/bitwarden/browser
synced 2025-12-29 06:33:40 +00:00
* 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 * pick credential, draft * Remove logger * a whole lot of wiring * not working * Improved wiring * Cancel after 90s * Introduced observable * 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 --------- 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: Andreas Coroiu <acoroiu@bitwarden.com>
224 lines
7.2 KiB
Rust
224 lines
7.2 KiB
Rust
#![cfg(target_os = "macos")]
|
|
|
|
use std::{
|
|
collections::HashMap,
|
|
sync::{atomic::AtomicU32, Arc, Mutex},
|
|
time::Instant,
|
|
};
|
|
|
|
use futures::FutureExt;
|
|
use log::{error, info};
|
|
use serde::{de::DeserializeOwned, Deserialize, Serialize};
|
|
|
|
uniffi::setup_scaffolding!();
|
|
|
|
mod assertion;
|
|
mod registration;
|
|
|
|
use assertion::{
|
|
PasskeyAssertionRequest, PasskeyAssertionWithoutUserInterfaceRequest,
|
|
PreparePasskeyAssertionCallback,
|
|
};
|
|
use registration::{PasskeyRegistrationRequest, PreparePasskeyRegistrationCallback};
|
|
|
|
#[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::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)>>>,
|
|
}
|
|
|
|
#[uniffi::export]
|
|
impl MacOSProviderClient {
|
|
#[uniffi::constructor]
|
|
pub fn connect() -> Self {
|
|
let _ = oslog::OsLogger::new("com.bitwarden.desktop.autofill-extension")
|
|
.level_filter(log::LevelFilter::Trace)
|
|
.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(0),
|
|
response_callbacks_queue: Arc::new(Mutex::new(HashMap::new())),
|
|
};
|
|
|
|
let path = desktop_core::ipc::path("autofill");
|
|
|
|
let queue = client.response_callbacks_queue.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");
|
|
}
|
|
Ok(SerializedMessage::Command(CommandMessage::Disconnected)) => {
|
|
info!("Disconnected from server");
|
|
}
|
|
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 deserializing message: {e}");
|
|
}
|
|
}
|
|
Err(e) => {
|
|
error!("Error processing message: {e:?}");
|
|
cb.error(e)
|
|
}
|
|
}
|
|
}
|
|
None => {
|
|
error!("No callback found for sequence number: {sequence_number}")
|
|
}
|
|
},
|
|
Err(e) => {
|
|
error!("Error deserializing message: {e}");
|
|
}
|
|
};
|
|
}
|
|
});
|
|
});
|
|
|
|
client
|
|
}
|
|
|
|
pub fn prepare_passkey_registration(
|
|
&self,
|
|
request: PasskeyRegistrationRequest,
|
|
callback: Arc<dyn PreparePasskeyRegistrationCallback>,
|
|
) {
|
|
self.send_message(request, Box::new(callback));
|
|
}
|
|
|
|
pub fn prepare_passkey_assertion(
|
|
&self,
|
|
request: PasskeyAssertionRequest,
|
|
callback: Arc<dyn PreparePasskeyAssertionCallback>,
|
|
) {
|
|
self.send_message(request, Box::new(callback));
|
|
}
|
|
|
|
pub fn prepare_passkey_assertion_without_user_interface(
|
|
&self,
|
|
request: PasskeyAssertionWithoutUserInterfaceRequest,
|
|
callback: Arc<dyn PreparePasskeyAssertionCallback>,
|
|
) {
|
|
self.send_message(request, Box::new(callback));
|
|
}
|
|
}
|
|
|
|
#[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 {
|
|
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()
|
|
.unwrap()
|
|
.insert(sequence_number, (callback, Instant::now()));
|
|
|
|
sequence_number
|
|
}
|
|
|
|
fn send_message(
|
|
&self,
|
|
message: impl Serialize + DeserializeOwned,
|
|
callback: Box<dyn Callback>,
|
|
) {
|
|
let sequence_number = self.add_callback(callback);
|
|
|
|
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 let Some((cb, _)) = self
|
|
.response_callbacks_queue
|
|
.lock()
|
|
.unwrap()
|
|
.remove(&sequence_number)
|
|
{
|
|
cb.error(BitwardenError::Internal(format!(
|
|
"Error sending message: {}",
|
|
e
|
|
)));
|
|
}
|
|
}
|
|
}
|
|
}
|