handle UnicodeDecodeError on non-utf-8 check_website
This commit is contained in:
@@ -69,7 +69,7 @@ class Proxy:
|
||||
self.exit_ip = parse_ipv4(orjson.loads(content)["origin"])
|
||||
elif settings.check_website_type == CheckWebsiteType.PLAIN_IP:
|
||||
self.exit_ip = parse_ipv4(
|
||||
content.decode(response.get_encoding(), errors="replace")
|
||||
content.decode(response.get_encoding())
|
||||
)
|
||||
else:
|
||||
self.exit_ip = None
|
||||
|
||||
@@ -158,8 +158,10 @@ async def _get_check_website_type_and_real_ip(
|
||||
except orjson.JSONDecodeError:
|
||||
try:
|
||||
return CheckWebsiteType.PLAIN_IP, parse_ipv4(
|
||||
content.decode(response.get_encoding(), errors="replace")
|
||||
content.decode(response.get_encoding())
|
||||
)
|
||||
except UnicodeDecodeError:
|
||||
_logger.error("Error when decoding check_website response as utf-8")
|
||||
except ValueError:
|
||||
pass
|
||||
else:
|
||||
|
||||
Reference in New Issue
Block a user