cqrenet/relay
4
0
Fork 0
mirror of https://github.com/chatmail/relay.git synced 2026-05-19 12:28:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

DNS: fix CNAME resolving, don't print ssh commands for DNS requests

Browse Source
This commit is contained in:
missytake
2023-12-14 18:12:56 +01:00
parent 146def2f06
commit 03aab4043c
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmdeploy/src/cmdeploy/cmdeploy.py
View File

@@ -215,8 +215,9 @@ class Out:
color = "red" if red else ("green" if green else None) color = "red" if red else ("green" if green else None)
print(colored(msg, color), file=file) print(colored(msg, color), file=file)
def shell_output(self, arg): def shell_output(self, arg, no_print=False):
self(f"[$ {arg}]", file=sys.stderr) if not no_print:
self(f"[$ {arg}]", file=sys.stderr)
return subprocess.check_output(arg, shell=True).decode() return subprocess.check_output(arg, shell=True).decode()
def check_call(self, arg, env=None, quiet=False): def check_call(self, arg, env=None, quiet=False):

27
cmdeploy/src/cmdeploy/dns.py
View File

@@ -1,3 +1,5 @@
import ipaddress
import requests import requests
import importlib import importlib
import subprocess import subprocess
@@ -10,19 +12,25 @@ class DNS:
self.session = requests.Session() self.session = requests.Session()
self.out = out self.out = out
self.ssh = f"ssh root@{mail_domain}" self.ssh = f"ssh root@{mail_domain}"
self.out.shell_output(f"{self.ssh} -- unbound-control flush {mail_domain}") try:
self.shell(f"unbound-control flush {mail_domain}")
except subprocess.CalledProcessError:
pass
def shell(self, cmd):
return self.out.shell_output(f"{self.ssh} -- {cmd}", no_print=True)
def get_ipv4(self): def get_ipv4(self):
cmd = "ip a | grep 'inet ' | grep 'scope global' | grep -oE '[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}' | head -1" cmd = "ip a | grep 'inet ' | grep 'scope global' | grep -oE '[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}' | head -1"
return self.out.shell_output(f"{self.ssh} -- {cmd}").strip() return self.shell(cmd).strip()
def get_ipv6(self): def get_ipv6(self):
cmd = "ip a | grep inet6 | grep 'scope global' | sed -e 's#/64 scope global##' | sed -e 's#inet6##'" cmd = "ip a | grep inet6 | grep 'scope global' | sed -e 's#/64 scope global##' | sed -e 's#inet6##'"
return self.out.shell_output(f"{self.ssh} -- {cmd}").strip() return self.shell(cmd).strip()
def get(self, typ: str, domain: str) -> str: def get(self, typ: str, domain: str) -> str:
"""Get a DNS entry""" """Get a DNS entry"""
dig_result = self.out.shell_output(f"{self.ssh} -- dig {typ} {domain}") dig_result = self.shell(f"dig {typ} {domain}")
line_num = 0 line_num = 0
for line in dig_result.splitlines(): for line in dig_result.splitlines():
line_num += 1 line_num += 1
@@ -31,12 +39,13 @@ class DNS:
def resolve(self, domain: str) -> str: def resolve(self, domain: str) -> str:
result = self.get("A", domain) result = self.get("A", domain)
if not result: try:
assert ipaddress.ip_address(result).version == 4
except ValueError:
result = self.get("CNAME", domain) result = self.get("CNAME", domain)
if result: return self.resolve(result)
result = self.get("A", result[:-1]) except AssertionError:
if not result: result = self.get("AAAA", domain)
result = self.get("AAAA", domain)
return result return result
def check_ptr_record(self, ip: str, mail_domain) -> str: def check_ptr_record(self, ip: str, mail_domain) -> str: