nathanwoodburn/hnsdoh-status
nathanwoodburn/hnsdoh-status
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Collect server name for DoH endpoints
All checks were successful
Build Docker / BuildImage (push) Successful in 38s
Details

Browse Source
This commit is contained in:
Nathan Woodburn 2024-09-17 13:59:32 +10:00
parent bf0e884e2f
commit c3184c3104
Signed by: nathanwoodburn
GPG Key ID: 203B000478AD0EF1
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server.py
View File

@ -166,8 +166,9 @@ def build_dns_query(domain: str, qtype: str = "A"):
return q.pack() return q.pack()
def check_doh(ip: str) -> bool: def check_doh(ip: str) -> dict:
status = False status = False
server_name = []
try: try:
dns_query = build_dns_query("2.wdbrn", "TXT") dns_query = build_dns_query("2.wdbrn", "TXT")
request = ( request = (
@ -194,6 +195,12 @@ def check_doh(ip: str) -> bool:
response_str = response_data.decode("latin-1") response_str = response_data.decode("latin-1")
headers, body = response_str.split("\r\n\r\n", 1) headers, body = response_str.split("\r\n\r\n", 1)
# Try to get server from headers
for header in headers.split("\r\n"):
if header.startswith("Server:"):
server_name.append(header.split(":")[1].strip())
dns_response: dnslib.DNSRecord = dnslib.DNSRecord.parse(body.encode("latin-1")) dns_response: dnslib.DNSRecord = dnslib.DNSRecord.parse(body.encode("latin-1"))
for rr in dns_response.rr: for rr in dns_response.rr:
if "Test 2" in str(rr): if "Test 2" in str(rr):
@ -207,7 +214,7 @@ def check_doh(ip: str) -> bool:
# Check if ssock is defined # Check if ssock is defined
if "ssock" in locals(): if "ssock" in locals():
ssock.close() ssock.close()
return status return {"status": status, "server": server_name}
def check_dot(ip: str) -> bool: def check_dot(ip: str) -> bool:
@ -217,6 +224,7 @@ def check_dot(ip: str) -> bool:
response = dns.query.tls( response = dns.query.tls(
q, ip, timeout=5, port=853, server_hostname="hnsdoh.com" q, ip, timeout=5, port=853, server_hostname="hnsdoh.com"
) )
print(response, flush=True)
if response.rcode() == dns.rcode.NOERROR: if response.rcode() == dns.rcode.NOERROR:
for rrset in response.answer: for rrset in response.answer:
for rr in rrset: for rr in rrset:
@ -323,7 +331,8 @@ def check_nodes() -> list:
node_locations[ip] if ip in node_locations else "Unknown" node_locations[ip] if ip in node_locations else "Unknown"
), ),
"plain_dns": check_plain_dns(ip), "plain_dns": check_plain_dns(ip),
"doh": check_doh(ip), "doh": check_doh(ip)["status"],
"doh_server": check_doh(ip)["server"],
"dot": check_dot(ip), "dot": check_dot(ip),
"cert": verify_cert(ip, 443), "cert": verify_cert(ip, 443),
"cert_853": verify_cert(ip, 853), "cert_853": verify_cert(ip, 853),
@ -340,7 +349,8 @@ def check_nodes() -> list:
node_locations[ip] if ip in node_locations else "Unknown" node_locations[ip] if ip in node_locations else "Unknown"
), ),
"plain_dns": check_plain_dns(ip), "plain_dns": check_plain_dns(ip),
"doh": check_doh(ip), "doh": check_doh(ip)["status"],
"doh_server": check_doh(ip)["server"],
"dot": check_dot(ip), "dot": check_dot(ip),
"cert": verify_cert(ip, 443), "cert": verify_cert(ip, 443),
"cert_853": verify_cert(ip, 853), "cert_853": verify_cert(ip, 853),