From 556f91c6d4be06e25e449cc4a88008b13cb9498d Mon Sep 17 00:00:00 2001 From: Spirillen <44526987+spirillen@users.noreply.github.com> Date: Sun, 19 Jan 2025 02:20:38 +0100 Subject: [PATCH] sort script still not running --- .github/workflows/sort.yml | 3 +++ tools/sort_lists.py | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sort.yml b/.github/workflows/sort.yml index 13da9304e79..5f6db9fc43b 100644 --- a/.github/workflows/sort.yml +++ b/.github/workflows/sort.yml @@ -19,6 +19,9 @@ jobs: run: | python -m pip install --upgrade pip pip install -r requirements.txt + - name: Print sort_lists version + run: | + python -c "import tools.sort_lists; print(f'Sort Lists Version: {tools.sort_lists.VERSION}')" - name: Check for changes in source folder id: changed_files run: | diff --git a/tools/sort_lists.py b/tools/sort_lists.py index d72e1c8921a..eaaec63f3cc 100644 --- a/tools/sort_lists.py +++ b/tools/sort_lists.py @@ -13,7 +13,7 @@ import dns.resolver import dns.query -VERSION = "0.2b22" # Incremented beta version +VERSION = "0.2b23" # Incremented beta version def find_files_by_name(directory, filenames): matches = [] @@ -122,12 +122,16 @@ def test_domain_connectivity(domain, proxy): def dns_lookup(domain): resolver = dns.resolver.Resolver() - resolver.nameservers = ['tls://dns10.quad9.net'] # Updated DNS to use tls + resolver.nameservers = ['tls://dns10.quad9.net'] # Updated DNS to use TLS try: resolver.resolve(domain) return True except (dns.resolver.NXDOMAIN, dns.resolver.Timeout, dns.exception.DNSException) as e: print(f"DNS lookup error for domain {domain}: {e}") + # Fallback to DoH + response = requests.get(f"https://dns10.quad9.net/dns-query?name={domain}&type=A", headers={"accept": "application/dns-json"}) + if response.status_code == 200 and "Answer" in response.json(): + return True return False def sort_file_alphanum(file_path, valid_tlds, proxy):