Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 14 additions & 1 deletion src-tauri/src/sync/identity.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,20 @@ pub fn default_device_name() -> String {
"linux" => "Linux",
other => other,
};
format!("Flow Desktop ({os})")
let host = std::env::var("COMPUTERNAME")
.or_else(|_| std::env::var("HOSTNAME"))
.ok()
.map(|h| h.trim().to_string())
.filter(|h| !h.is_empty());

let label = match (host, cfg!(debug_assertions)) {
(Some(host), true) => format!("{host} - {os}, Dev"),
(Some(host), false) => format!("{host} - {os}"),
(None, true) => format!("{os}, Dev"),
(None, false) => os.to_string(),
};

format!("Flow Desktop ({label})")
}

// Tests for this module live in `tests/sync_phase1.rs` (integration test) — see the note in
Expand Down
23 changes: 16 additions & 7 deletions src-tauri/src/sync2/lan_link.rs
Original file line number Diff line number Diff line change
Expand Up @@ -200,15 +200,24 @@ fn field<const N: usize>(body: &Value, name: &str) -> Result<[u8; N]> {
.ok_or(EngineError::Unexpected)
}

/// The signing key of `did` when it is a current device of the group.
fn device_key<S: Store>(session: &Session<'_, S>, did: &str) -> Result<[u8; 32]> {
session
/// The signing key of `did` when it was a device of the group in `epoch`.
fn device_key<S: Store>(session: &Session<'_, S>, did: &str, epoch: u32) -> Result<[u8; 32]> {
if let Some(member) = session
.roster()
.members
.get(did)
.filter(|member| member.role == Role::Device)
.map(|member| member.sig)
.ok_or(EngineError::Removed)
{
return Ok(member.sig);
}
if let Some(sender) = session.senders().get(did).filter(|sender| {
sender.role == Role::Device
&& epoch >= sender.since
&& sender.until.is_none_or(|until| epoch <= until)
}) {
return Ok(sender.sig);
}
Err(EngineError::Removed)
}

fn did_bytes(did: &str) -> Result<[u8; 16]> {
Expand Down Expand Up @@ -265,7 +274,7 @@ where
&server,
);
if !verify(
&device_key(session, &peer)?,
&device_key(session, &peer, epoch)?,
&signed,
&field::<64>(&reply, "sig")?,
) {
Expand Down Expand Up @@ -317,7 +326,7 @@ where
.as_str()
.ok_or(EngineError::Unexpected)?
.to_owned();
let peer_key = device_key(session, &peer)?;
let peer_key = device_key(session, &peer, epoch)?;
let client_nonce = field::<NONCE_SIZE>(&hello, "n")?;
let listening = hello["p"].as_u64().and_then(|p| u16::try_from(p).ok());
let (client, server) = (did_bytes(&peer)?, device.did);
Expand Down
31 changes: 30 additions & 1 deletion src-tauri/tests/sync2_lan.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ use flow_desktop_lib::sync2::linking::{
};
use flow_desktop_lib::sync2::live_message::{LiveMessage, Now, PlayState};
use flow_desktop_lib::sync2::live_seal::LiveKeys;
use flow_desktop_lib::sync2::membership::{leave_group, member_keys, new_epoch, rename_device};
use flow_desktop_lib::sync2::membership::{
leave_group, member_keys, new_epoch, remove_devices, rename_device,
};
use flow_desktop_lib::sync2::pairing::pairing_proof;
use flow_desktop_lib::sync2::paths::log_path;
use flow_desktop_lib::sync2::pipe::{Pipe, listen_on};
Expand Down Expand Up @@ -340,6 +342,33 @@ async fn a_leaving_member_passes_its_leave_to_a_member_it_reaches() {
panic!("the member never pulled the leave");
}

#[tokio::test]
async fn a_removed_device_learns_its_removal_over_lan_and_is_shut_out() {
let g = group().await;
let (pool_a, pool_b) = (holding(&g).await, holding(&g).await);
let session_a = Session::open(&pool_a, HeldStore::new(pool_a.clone()), &g.a)
.await
.unwrap();
remove_devices(&pool_a, &session_a, &g.a, &[hex::encode(g.b.did)])
.await
.unwrap();

let port = listening(&pool_a, &g.a).await;

// Device B dials Device A over LAN. B's handshake presents epoch 0.
// Device A accepts the handshake for epoch 0 and serves the removal roster entry.
let met = meet(&pool_b, &g.b, ("127.0.0.1", port), None, &[], no_live())
.await
.unwrap();
assert_eq!(met.peer, hex::encode(g.a.did));

// After pulling the new roster entries from A, B sees that it has been removed.
assert!(matches!(
Session::open(&pool_b, HeldStore::new(pool_b.clone()), &g.b).await,
Err(EngineError::Removed)
));
}

fn loopback() -> Vec<String> {
vec!["127.0.0.1".into()]
}
Expand Down
Loading