Skip to content

fix(gui-client): don't fail DNS control on nameservers #7972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thomaseizinger merged 3 commits into from
Feb 3, 2025
Merged

fix(gui-client): don't fail DNS control on nameservers #7972

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f6cab5
Make apply nameservers optional
thomaseizinger Jan 31, 2025
eefbdcb
Make it a warning
thomaseizinger Jan 31, 2025
789f1de
Fix import
thomaseizinger Jan 31, 2025
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
6 changes: 4 additions & 2 deletions rust/headless-client/src/dns_control/windows.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
use super::DnsController;
use anyhow::{Context as _, Result};
use firezone_bin_shared::platform::{DnsControlMethod, CREATE_NO_WINDOW, TUNNEL_UUID};
use firezone_logging::std_dyn_err;
use firezone_logging::{anyhow_dyn_err, std_dyn_err};
use std::{io, net::IpAddr, os::windows::process::CommandExt, path::Path, process::Command};
use windows::Win32::System::GroupPolicy::{RefreshPolicyEx, RP_FORCE};

Expand Down Expand Up @@ -125,7 +125,9 @@ fn activate(dns_config: &[IpAddr]) -> Result<()> {

let hklm = winreg::RegKey::predef(winreg::enums::HKEY_LOCAL_MACHINE);

set_nameservers_on_interface(dns_config).context("Failed to set nameservers")?;
if let Err(e) = set_nameservers_on_interface(dns_config) {
tracing::warn!(error = anyhow_dyn_err(&e), "Failed to explicitly set nameservers on tunnel interface; DNS resources in WSL may not work");
}

// e.g. [100.100.111.1, 100.100.111.2] -> "100.100.111.1;100.100.111.2"
let dns_config_string = itertools::join(dns_config, ";");
Expand Down
Loading