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

fix(windows-client): clear Firezone-specific DNS rules at startup (#4918)

Browse Source 
Closes #4899

This has a known gap where theoretically the GUI could sign in while the
service is hung in startup, and then the service would wipe out the
GUI's DNS rules.

The workaround for that would be to restart the GUI, but in practice I
think the gap will not be hit, and it will go away once #3712 is done
anyway.

I tested it manually once using the reproduction steps from #4899 and it
worked.
This commit is contained in:
Reactor Scram
2024-05-13 09:51:14 -05:00
committed by GitHub
parent 5ef9b0627c
commit dadaeb072a
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rust/headless-client/src/imp_windows.rs
View File

@@ -122,6 +122,10 @@ fn fallible_windows_service_run() -> Result<()> {
}
};
// Fixes <https://github.com/firezone/firezone/issues/4899>,
// DNS rules persisting after reboot
connlib_shared::deactivate_dns_control().ok();
// Tell Windows that we're running (equivalent to sd_notify in systemd)
let status_handle = service_control_handler::register(SERVICE_NAME, event_handler)?;
status_handle.set_service_status(ServiceStatus {
@@ -134,7 +138,9 @@ fn fallible_windows_service_run() -> Result<()> {
process_id: None,
})?;
run_ipc_service(cli, rt, shutdown_rx)?;
if let Err(error) = run_ipc_service(cli, rt, shutdown_rx) {
tracing::error!(?error, "error from run_ipc_service");
}
// Tell Windows that we're stopping
status_handle.set_service_status(ServiceStatus {