github-personal/firezone
1
0
Fork 0
mirror of https://github.com/outbackdingo/firezone.git synced 2026-01-27 02:18:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(connlib): fail connection upsert early (#10962)

Browse Source 
When upserting a connection, we need to sample one of our relays to use
as a fallback. If we don't have any relays (because they all got
disconnected), we cannot create the connection.

Right now, we perform this sampling a bit too late in the function and
thus wrongly print "Creating new connection" even though we never make
it that for.

To avoid that, move the `sample_relay` call higher up to avoid making
any state modifications if we cannot proceed.
This commit is contained in:
Thomas Eizinger
2025-11-25 15:11:35 +11:00
committed by GitHub
parent acb709ef42
commit 48e0a89125
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rust/connlib/snownet/src/node.rs
View File

@@ -305,6 +305,8 @@ where
return Ok(());
}
let selected_relay = self.sample_relay()?;
let existing = self.connections.remove_established(&cid, now);
let index = self.index.next();
@@ -315,8 +317,6 @@ where
tracing::info!(local = ?local_creds, remote = ?remote_creds, %index, "Creating new connection");
}
let selected_relay = self.sample_relay()?;
let mut agent = match self.role.kind() {
RoleKind::Client => new_client_agent(),
RoleKind::Server => new_server_agent(),

10
rust/connlib/tunnel/src/tests/sut.rs
View File

@@ -535,12 +535,18 @@ impl TunnelTest {
if let Some(event) = self.client.exec_mut(|c| c.sut.poll_event()) {
match self.on_client_event(self.client.inner().id, event, &ref_state.portal) {
Ok(()) => {}
Err(AuthorizeFlowError::Client(_)) => {
Err(AuthorizeFlowError::Client(e)) => {
tracing::debug!("Failed to handle ClientEvent: {e}");
// Simulate WebSocket reconnect ...
self.client.exec_mut(|c| {
c.update_relays(iter::empty(), self.relays.iter(), now);
});
}
Err(AuthorizeFlowError::Gateway(_)) => {
Err(AuthorizeFlowError::Gateway(e)) => {
tracing::debug!("Failed to handle GatewayEvent: {e}");
// Simulate WebSocket reconnect ...
for gateway in self.gateways.values_mut() {
gateway.exec_mut(|g| {
g.update_relays(iter::empty(), self.relays.iter(), now)