nathanwoodburn/debug-tools
1
0
Fork 0
generated from nathanwoodburn/python-webserver-template
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Update some script replacement and use custom requests-doh

Browse Source
This commit is contained in:
Nathan Woodburn 2025-02-28 21:55:15 +11:00
parent 003e14343b
commit 3370d01a54
Signed by: nathanwoodburn
GPG Key ID: 203B000478AD0EF1
2 changed files with 8 additions and 7 deletions

3
requirements.txt
View File

@ -6,4 +6,5 @@ dnspython
cryptography cryptography
datetime datetime
beautifulsoup4 beautifulsoup4
requests-doh requests-doh
git+https://github.com/Nathanwoodburn/requests-doh.git

12
tools.py
View File

@ -18,7 +18,7 @@ import socket
resolver = dns.resolver.Resolver() resolver = dns.resolver.Resolver()
resolver.nameservers = ["194.50.5.28","194.50.5.27","194.50.5.26"] resolver.nameservers = ["194.50.5.28","194.50.5.27","194.50.5.26"]
resolver.port = 53 resolver.port = 53
requests_doh.add_dns_provider("HNSDoH", "https://hnsdoh.com/dns-query") DoHsession = requests_doh.DNSOverHTTPSSession("hnsdoh")
# Disable warnings # Disable warnings
urllib3.disable_warnings() urllib3.disable_warnings()
@ -211,8 +211,7 @@ class ProxyError(Exception):
def proxy(url: str) -> requests.Response: def proxy(url: str) -> requests.Response:
try: try:
session = requests_doh.DNSOverHTTPSSession("HNSDoH") r = DoHsession.get(url,verify=False,timeout=30)
r = session.get(url,verify=False,timeout=30)
return r return r
except Exception as e: except Exception as e:
return ProxyError(str(e)) return ProxyError(str(e))
@ -249,9 +248,10 @@ def cleanProxyContent(htmlContent: str,url:str, proxyHost: str):
ignored = True ignored = True
break break
if not ignored: if not ignored:
# link.attrs[attrib] = f"{proxyUrl}/{link[attrib]}" if link[attrib].startswith("/"):
# Add path also link.attrs[attrib] = f"{proxyUrl}{link[attrib]}"
link.attrs[attrib] = f"{proxyUrl}/{urlparse(link[attrib]).path}/{link[attrib]}" else:
link.attrs[attrib] = f"{proxyUrl}/{urlparse(url).path}{link[attrib]}"
scripts = soup.find_all('script') scripts = soup.find_all('script')
for script in scripts: for script in scripts: