Get configs from controller's state, instead of reading the disk
This commit is contained in:
parent
983924303d
commit
94c4155d60
3 changed files with 10 additions and 5 deletions
|
|
@ -4,6 +4,7 @@ from datetime import datetime, timezone
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class ConfigurationController:
|
class ConfigurationController:
|
||||||
_config: Optional[Configuration] = None
|
_config: Optional[Configuration] = None
|
||||||
|
|
||||||
|
|
@ -128,3 +129,8 @@ class ConfigurationController:
|
||||||
configuration = ConfigurationController.get_or_new()
|
configuration = ConfigurationController.get_or_new()
|
||||||
configuration.dns = new_value
|
configuration.dns = new_value
|
||||||
configuration.save()
|
configuration.save()
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def get_dns_setting():
|
||||||
|
configuration = ConfigurationController.get_or_new()
|
||||||
|
return configuration.dns
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ from core.errors.logger import logger
|
||||||
from core.Constants import Constants
|
from core.Constants import Constants
|
||||||
from core.models.system.SystemState import SystemState
|
from core.models.system.SystemState import SystemState
|
||||||
from core.controllers.SystemStateController import SystemStateController
|
from core.controllers.SystemStateController import SystemStateController
|
||||||
from core.services.networking.systemwide.systemwide_utils import get_firewall_setting, get_dns_setting
|
|
||||||
from core.services.networking.systemwide import dns
|
from core.services.networking.systemwide import dns
|
||||||
from core.services.networking.systemwide.general_connection_tools.general_firewall_dns_tools import generic_enable_firewall_w_retry
|
from core.services.networking.systemwide.general_connection_tools.general_firewall_dns_tools import generic_enable_firewall_w_retry
|
||||||
from core.errors.exceptions import FirewallError, DNSError
|
from core.errors.exceptions import FirewallError, DNSError
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
from core.services.networking.general_connection_tools.testing_evaluating import await_connection, system_uses_wireguard_interface, terminate_tor_connection
|
from core.services.networking.general_connection_tools.testing_evaluating import await_connection, system_uses_wireguard_interface, terminate_tor_connection
|
||||||
from core.services.keys_and_verifications.endpoint_verification import verify_wireguard_endpoint
|
from core.services.keys_and_verifications.endpoint_verification import verify_wireguard_endpoint
|
||||||
from core.models.Result import Result, ResultError
|
from core.models.Result import Result, ResultError
|
||||||
from core.services.networking.systemwide.systemwide_utils import extract_wg_interface_name, check_system_prereqs, get_dns_setting
|
from core.services.networking.systemwide.systemwide_utils import extract_wg_interface_name, check_system_prereqs
|
||||||
# , get_firewall_setting
|
|
||||||
# from core.services.networking.general_connection_tools.config_tools import extract_endpoint_ip, extract_dns
|
# from core.services.networking.general_connection_tools.config_tools import extract_endpoint_ip, extract_dns
|
||||||
from core.services.networking.systemwide import killswitch
|
from core.services.networking.systemwide import killswitch
|
||||||
from core.services.networking.systemwide.dns_tools.process_dns_result import orchestrate_dns_check
|
from core.services.networking.systemwide.dns_tools.process_dns_result import orchestrate_dns_check
|
||||||
|
|
@ -40,7 +40,7 @@ def terminate_system_connection(
|
||||||
firewall_setting = ConfigurationController.get_firewall_setting()
|
firewall_setting = ConfigurationController.get_firewall_setting()
|
||||||
|
|
||||||
if dns_setting is None:
|
if dns_setting is None:
|
||||||
dns_setting = get_dns_setting()
|
dns_setting = ConfigurationController.get_dns_setting()
|
||||||
|
|
||||||
if shutil.which('nmcli') is None:
|
if shutil.which('nmcli') is None:
|
||||||
raise CommandNotFoundError('nmcli')
|
raise CommandNotFoundError('nmcli')
|
||||||
|
|
@ -261,7 +261,7 @@ def establish_system_connection(
|
||||||
|
|
||||||
# ================= SETTINGS =================
|
# ================= SETTINGS =================
|
||||||
firewall_setting = ConfigurationController.get_firewall_setting()
|
firewall_setting = ConfigurationController.get_firewall_setting()
|
||||||
dns_setting = get_dns_setting()
|
dns_setting = ConfigurationController.get_dns_setting()
|
||||||
|
|
||||||
# ================= CONNECT WG ================
|
# ================= CONNECT WG ================
|
||||||
try:
|
try:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue