jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-20 15:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

DNS loop protection (#1599)

Browse Source 
* DNS loop protection

* Update supervisor/dns.py

Co-Authored-By: Franck Nijhof <git@frenck.dev>

* cleanup not needed code

* Fix

Co-authored-by: Franck Nijhof <git@frenck.dev>
This commit is contained in:
Pascal Vizeli 2020-03-27 11:54:32 +01:00 committed by GitHub
parent d0db466e67
commit 8e83e007e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
supervisor/dns.py
View File

@ -45,6 +45,7 @@ class CoreDNS(JsonConfig, CoreSysAttributes):
self.coredns_template: Optional[jinja2.Template] = None self.coredns_template: Optional[jinja2.Template] = None
self._hosts: List[HostEntry] = [] self._hosts: List[HostEntry] = []
self._loop: bool = False
@property @property
def corefile(self) -> Path: def corefile(self) -> Path:
@ -209,16 +210,36 @@ class CoreDNS(JsonConfig, CoreSysAttributes):
self.hosts.unlink() self.hosts.unlink()
self._init_hosts() self._init_hosts()
# Reset loop protection
self._loop = False
await self.sys_addons.sync_dns() await self.sys_addons.sync_dns()
async def loop_detection(self) -> None:
"""Check if there was a loop found."""
log = await self.instance.logs()
# Check the log for loop plugin output
if b"plugin/loop: Loop" in log:
_LOGGER.error("Detect a DNS loop in local Network!")
self._loop = True
else:
self._loop = False
def _write_corefile(self) -> None: def _write_corefile(self) -> None:
"""Write CoreDNS config.""" """Write CoreDNS config."""
dns_servers: List[str] = [] dns_servers: List[str] = []
local_dns: List[str] = []
servers: List[str] = []
# Prepare DNS serverlist: Prio 1 Manual, Prio 2 Local, Prio 3 Fallback # Prepare DNS serverlist: Prio 1 Manual, Prio 2 Local, Prio 3 Fallback
local_dns: List[str] = self.sys_host.network.dns_servers or ["dns://127.0.0.11"] if not self._loop:
servers: List[str] = self.servers + local_dns local_dns = self.sys_host.network.dns_servers or ["dns://127.0.0.11"]
servers = self.servers + local_dns
else:
_LOGGER.warning("Ignore user DNS settings because of loop")
# Print some usefully debug data
_LOGGER.debug( _LOGGER.debug(
"config-dns = %s, local-dns = %s , backup-dns = CloudFlare DoT", "config-dns = %s, local-dns = %s , backup-dns = CloudFlare DoT",
self.servers, self.servers,
@ -339,7 +360,6 @@ class CoreDNS(JsonConfig, CoreSysAttributes):
def is_fails(self) -> Awaitable[bool]: def is_fails(self) -> Awaitable[bool]:
"""Return True if a Docker container is fails state. """Return True if a Docker container is fails state.
Return a coroutine. Return a coroutine.
""" """
return self.instance.is_fails() return self.instance.is_fails()

4
supervisor/tasks.py
View File

@ -232,9 +232,11 @@ class Tasks(CoreSysAttributes):
return return
_LOGGER.warning("Watchdog found a problem with CoreDNS plugin!") _LOGGER.warning("Watchdog found a problem with CoreDNS plugin!")
# Reset of fails
if await self.sys_dns.is_fails(): if await self.sys_dns.is_fails():
_LOGGER.warning("CoreDNS plugin is in fails state / Reset config") _LOGGER.error("CoreDNS plugin is in fails state / Reset config")
await self.sys_dns.reset() await self.sys_dns.reset()
await self.sys_dns.loop_detection()
try: try:
await self.sys_dns.start() await self.sys_dns.start()