jsunpack non ascii strings

Author: Gujal00

lib/resolveurl/plugins/lib/helpers.py

@@ -83,12 +83,10 @@ def append_headers(headers):
 def get_packed_data(html):
     packed_data = ''
     for match in re.finditer(r'(eval\s*\(function.*?)</script>', html, re.DOTALL | re.I):
-        try:
+        if jsunpack.detect(match.group(1)):
             js_data = jsunpack.unpack(match.group(1))
             js_data = js_data.replace('\\', '')
             packed_data += js_data
-        except:
-            pass
 
     return packed_data
 

lib/resolveurl/plugins/lib/jsunpack.py

@@ -1,6 +1,7 @@
 """
-    resolveurl XBMC Addon
+    ResolveUrl Kodi Addon
     Copyright (C) 2018 jsergio
+    Copyright (C) 2021 jairoxyz
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -56,7 +57,10 @@ def unpack(source):
     def lookup(match):
         """Look up symbols in the synthetic symtab."""
         word = match.group(0)
-        word2 = symtab[int(word)] if radix == 1 else symtab[unbase(word)]
+        try:
+            word2 = symtab[int(word)] if radix == 1 else symtab[unbase(word)]
+        except:
+            word2 = None
         return word2 or word
 
     source = re.sub(r'\b\w+\b', lookup, payload)

lib/resolveurl/plugins/userload.py

@@ -25,14 +25,15 @@
 class UserLoadResolver(ResolveUrl):
     name = "UserLoad"
     domains = ['userload.co']
-    pattern = r'(?://|\.)(userload\.co)/f/([0-9a-zA-Z]+)'
+    pattern = r'(?://|\.)(userload\.co)/(?:e|f)/([0-9a-zA-Z]+)'
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
         blurl = 'https://{0}/api/assets/userload/js/form.framework.js'.format(host)
         headers = {'User-Agent': common.RAND_UA}
         html = self.net.http_GET(web_url, headers=headers).content
         html = helpers.get_packed_data(html)
+        headers.update({'Referer': web_url})
         bl = self.net.http_GET(blurl, headers=headers).content
         if jsunhunt.detect(bl):
             bl = jsunhunt.unhunt(bl)
@@ -50,8 +51,7 @@ def get_media_url(self, host, media_id):
                 api_url = 'https://{0}{1}'.format(host, b1.group(1))
                 headers.update({
                     'X-Requested-With': 'XMLHttpRequest',
-                    'Origin': 'https://{0}'.format(host),
-                    'Referer': web_url
+                    'Origin': 'https://{0}'.format(host)
                 })
                 stream_url = self.net.http_POST(api_url, data, headers=headers).content
                 headers.pop('X-Requested-With')
@@ -61,4 +61,4 @@ def get_media_url(self, host, media_id):
         raise ResolverError('File not found')
 
     def get_url(self, host, media_id):
-        return self._default_get_url(host, media_id, template='https://{host}/f/{media_id}')
+        return self._default_get_url(host, media_id, template='https://{host}/e/{media_id}')