urls - fix error messages working

diff --git a/modules/urls.py b/modules/urls.py
index 3583d16c6bc0bc9a96fd0c52b7581e9c9d9575ff..67abc24a626b737c4c4a5eca008ad1caced9f697 100644 (file)
--- a/modules/urls.py
+++ b/modules/urls.py
@@ -242,7 +242,11 @@ def _humanize_bytes(b):
                return "%.2f%siB" % (b, table[i])
 
 def _do_request(url, try_aia=False):
-       """Returns the HTTPResponse object, or a string on error. Empty string -> no response."""
+       """
+               Return value is a tuple consisting of:
+               - the HTTPResponse object, or a string on error. Empty string -> no response.
+               - and a flag indicating whether AIA was used
+       """
        request = urllib2.Request(url, headers={'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.0.0 Safari/537.36', 'Sec-Ch-Ua': '"Chromium";v="116", "Not)A;Brand";v="24", "Google Chrome";v="116"', 'Sec-Ch-Ua-Mobile': '?0', 'Sec-Ch-Ua-Platform': '"Linux"', 'Sec-Fetch-Dest': 'document', 'Sec-Fetch-Mode': 'navigate', 'Sec-Fetch-Site': 'same-origin', 'Sec-Fetch-User': '?1', 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7', 'Accept-Language': 'en-US,en;q=0.9', 'Cache-Control': 'no-cache', 'Pragma': 'no-cache', 'Upgrade-Insecure-Requests': '1'})
        if try_aia:
                opener = urllib2.build_opener(urllib2.HTTPSHandler(context=aia_session.ssl_context_from_url(url)), SmartRedirectHandler())
@@ -253,22 +257,22 @@ def _do_request(url, try_aia=False):
        try:
                response = opener.open(request, timeout=2)
        except http.client.InvalidURL as e: # why does a method under urllib.request raise an exception under http.client???
-               return ''
+               return '', False
        except urllib2.HTTPError as e:
-               return 'Request error: %s %s' % (e.code, e.reason)
+               return 'Request error: %s %s' % (e.code, e.reason), False
        except urllib2.URLError as e:
                if "certificate verify failed: unable to get local issuer certificate" in str(e.reason):
-                       if aia: # Retry with AIA enabled
+                       if aia: # Retry with AIA enabled, if module is present
                                return _do_request(url, True)
                        else:
                                lib.parent.log('urls', '?', 'If the site is not serving the certificate chain, installing the aia library might make this request work: pip install aia')
-                               return 'Request error: site may have broken TLS configuration (%s)' % (e.reason)
+                               return 'Request error: site may have broken TLS configuration (%s)' % (e.reason), False
                else:
-                       return 'Request error: %s' % (e.reason)
+                       return 'Request error: %s' % (e.reason), False
        except TimeoutError as e:
-               return 'Request error: request timed out'
+               return 'Request error: request timed out', False
        except Exception as e:
-               return 'Unknown error: %s %r' % (type(e).__name__, e.args)
+               return 'Unknown error: %s %r' % (type(e).__name__, e.args), False
 
        return response, try_aia