me/omegafox
1
0
Fork 0
mirror of https://forge.fsky.io/oneflux/omegafox.git synced 2026-02-10 19:52:04 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #228 from techinz/main

Browse source 
Get IP fix
This commit is contained in:
daijro 2025-03-09 01:39:47 -06:00 • committed by GitHub
commit c390b260b5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -17,6 +17,7 @@ pythonlib/*.png
scripts/*.png scripts/*.png
scripts/test* scripts/test*
.vscode .vscode
.idea
/tests/*.disabled /tests/*.disabled
k8s/ k8s/

8
pythonlib/camoufox/ip.py
View file

@ -100,6 +100,8 @@ def public_ip(proxy: Optional[str] = None) -> str:
"https://ifconfig.co/ip", "https://ifconfig.co/ip",
"https://ipecho.net/plain", "https://ipecho.net/plain",
] ]
exception = None
for url in URLS: for url in URLS:
try: try:
with _suppress_insecure_warning(): with _suppress_insecure_warning():
@ -113,8 +115,6 @@ def public_ip(proxy: Optional[str] = None) -> str:
ip = resp.text.strip() ip = resp.text.strip()
validate_ip(ip) validate_ip(ip)
return ip return ip
except requests.exceptions.ProxyError as e: except (requests.exceptions.ProxyError, requests.RequestException, InvalidIP) as exception:
raise InvalidProxy(f"Failed to connect to proxy: {proxy}") from e
except (requests.RequestException, InvalidIP):
pass pass
raise InvalidIP("Failed to get IP address") raise InvalidIP(f"Failed to get IP address: {exception}")