From 208cb29f77b89c27e25f9a1ea46103fa433a185d Mon Sep 17 00:00:00 2001 From: SimplifiedPrivacy Date: Tue, 21 Jul 2026 11:19:53 -0400 Subject: [PATCH] Improved Systemwide Firewall Disable Logic --- .../systemwide/systemwide_wireguard.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/core/services/networking/systemwide/systemwide_wireguard.py b/core/services/networking/systemwide/systemwide_wireguard.py index b40f945..1138824 100644 --- a/core/services/networking/systemwide/systemwide_wireguard.py +++ b/core/services/networking/systemwide/systemwide_wireguard.py @@ -57,24 +57,24 @@ def turn_on_firewall(profile_id: str, process_output: str) -> Result: # This raises errors on failure. def check_and_kill_firewall(): - firewall_status = killswitch.status() - logger.info(f"Inside check_and_kill_firewall the firewall status is {firewall_status}") + firewall_on = killswitch.status() + logger.info(f"Inside check_and_kill_firewall the firewall status is {firewall_on}") - logger.info(f"Terminate connection ran check_and_kill_firewall which evaluated the status as {firewall_status}") + logger.info(f"Terminate connection ran check_and_kill_firewall which evaluated the status as {firewall_on}") # is it even armed? if not, get lost, - if firewall_status == "on": + if firewall_on: # if it's armed, kill it, logger.info(f"Killing the firewall") - firewall_results = killswitch.disarm() + disable_result_object = killswitch.disarm() # did that work? - if firewall_results.valid: + if disable_result_object.valid: logger.info(f"We disabled the firewall correctly.") return else: - logger.error(f"[FIREWALL] CRITICAL ISSUE with the Firewall being disabled: {firewall_results.message}") - error_msg = f"Firewall couldn't be disabled: {firewall_results.message}" + logger.error(f"[FIREWALL] CRITICAL ISSUE with the Firewall being disabled: {disable_result_object.message}") + error_msg = f"Firewall couldn't be disabled: {disable_result_object.message}" raise ConnectionTerminationError(error_msg) else: logger.info("We are skipping disabling the firewall, because it's already off.")