urls - reformat headers

[erebus.git] / modules / urls.py

diff --git a/modules/urls.py b/modules/urls.py
index 67abc24a626b737c4c4a5eca008ad1caced9f697..502920864c3fe619e533a28500cc087999f6c1dd 100644 (file)
--- a/modules/urls.py
+++ b/modules/urls.py
@@ -247,7 +247,24 @@ def _do_request(url, try_aia=False):
                - 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'})
+       try:
+               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'
+               })
+       except ValueError:
+               return '', False
        if try_aia:
                opener = urllib2.build_opener(urllib2.HTTPSHandler(context=aia_session.ssl_context_from_url(url)), SmartRedirectHandler())
        else:
@@ -289,7 +306,13 @@ def goturl(url):
                return response
 
        # Try to add type and length headers to reply
-       c_type = response.getheader('Content-Type', '').split(';', 1)[0]
+       c_type_fields = response.getheader('Content-Type', '').split(';')
+       c_type = c_type_fields.pop(0)
+       c_charset = None
+       for f in c_type_fields:
+               f = f.strip()
+               if len(f) > 8 and f[0:8] == 'charset=':
+                       c_charset = f[8:]
        c_len = response.getheader('Content-Length')
        if c_type != '':
                output.append("[%s] " % (c_type))
@@ -316,7 +339,7 @@ def goturl(url):
                        else:
                                output.append("[%s] " % (_humanize_bytes(len(responsebody))))
                        try:
-                               soup = BeautifulSoup(responsebody)
+                               soup = BeautifulSoup(responsebody, from_encoding=c_charset)
                                if soup.title:
                                        output.append('Title: ' + unescape('%s' % (soup.find('title').string.strip())))
                                else:
@@ -327,12 +350,13 @@ def goturl(url):
        return ''.join(output)
 
 url_regex = (
-       re.compile(r'https?://(?:[^/\s.]+\.)+[^/\s.]+(?:/\S+)?'),
+       re.compile(r'https?://(?:[^/\s.]+\.)+[a-z0-9-]+(?:/[^\s\]>)}]+)?', re.I),
 )
 other_regexes = (
        (lambda x: '', (re.compile(r"""https?://(?:www\.)?(?:twitter|x)\.com/""", re.I),)), # skip twitter
        (lambda x: '', (re.compile(r"""https?://(?:www\.)?reddit\.com/""", re.I),)), # skip new-reddit
        (lambda x: '', (re.compile(r"""https?://jfr\.im/git/""", re.I),)), # skip my gitweb
+       (lambda x: '', (re.compile(r"""https?://(?:www\.)?wunderground\.com/""", re.I),)), # skip wunderground, they time us out
 )
 regexes = other_regexes + (
        (goturl, url_regex),