jsunpack non ascii strings

Author: Gujal00

lib/resolveurl/plugins/lib/helpers.py

@@ -83,12 +83,8 @@ 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:
-            js_data = jsunpack.unpack(match.group(1))
-            js_data = js_data.replace('\\', '')
-            packed_data += js_data
-        except:
-            pass
+        if jsunpack.detect(match.group(1)):
+            packed_data += jsunpack.unpack(match.group(1))
 
     return packed_data
 

lib/resolveurl/plugins/lib/jsunpack.py

@@ -1,6 +1,7 @@
 """
-    resolveurl XBMC Addon
-    Copyright (C) 2018 jsergio
+    ResolveUrl Kodi Addon
+    Copyright (C) 2013 Bstrdsmkr
+    Additional fixes by mortael, 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
@@ -32,13 +33,37 @@
 """
 
 import re
+import six
 
 PRIORITY = 1
 
 
 def detect(source):
+    global beginstr
+    global endstr
+    beginstr = ""
+    endstr = ""
+    begin_offset = -1
     """Detects whether `source` is P.A.C.K.E.R. coded."""
-    return source.replace(' ', '').startswith('eval(function(p,a,c,k,e,')
+    mystr = re.search(
+        r"eval[ ]*\([ ]*function[ ]*\([ ]*p[ ]*,[ ]*a[ ]*,[ ]*c["
+        r" ]*,[ ]*k[ ]*,[ ]*e[ ]*,[ ]*",
+        source,
+    )
+    if mystr:
+        begin_offset = mystr.start()
+        beginstr = source[:begin_offset]
+    if begin_offset != -1:
+        """ Find endstr"""
+        source_end = source[begin_offset:]
+        if source_end.split("')))", 1)[0] == source_end:
+            try:
+                endstr = source_end.split("}))", 1)[1]
+            except IndexError:
+                endstr = ""
+        else:
+            endstr = source_end.split("')))", 1)[1]
+    return mystr is not None
 
 
 def unpack(source):
@@ -56,10 +81,13 @@ 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)]
-        return word2 or word
+        return symtab[int(word)] if radix == 1 else symtab[unbase(word)] or word
 
-    source = re.sub(r'\b\w+\b', lookup, payload)
+    payload = payload.replace("\\\\", "\\").replace("\\'", "'")
+    if six.PY2:
+        source = re.sub(r"\b\w+\b", lookup, payload)
+    else:
+        source = re.sub(r"\b\w+\b", lookup, payload, flags=re.ASCII)
     return _replacestrings(source)
 
 
@@ -88,6 +116,8 @@ def _filterargs(source):
 
 
 def _replacestrings(source):
+    global beginstr
+    global endstr
     """Strip string lookup table (list) and replace values in source."""
     match = re.search(r'var *(_\w+)\=\["(.*?)"\];', source, re.DOTALL)
 
@@ -99,16 +129,19 @@ def _replacestrings(source):
         for index, value in enumerate(lookup):
             source = source.replace(variable % index, '"%s"' % value)
         return source[startpoint:]
-    return source
+    return beginstr + source + endstr
 
 
 class Unbaser(object):
     """Functor for a given base. Will efficiently convert
     strings to natural numbers."""
+
     ALPHABET = {
-        62: '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ',
-        95: (' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-             '[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~')
+        62: "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
+        95: (
+            " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+            "[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+        ),
     }
 
     def __init__(self, base):
@@ -128,7 +161,8 @@ def __init__(self, base):
             try:
                 self.dictionary = dict(
                     (cipher, index) for index, cipher in enumerate(
-                        self.ALPHABET[base]))
+                        self.ALPHABET[base])
+                )
             except KeyError:
                 raise TypeError('Unsupported base encoding.')
 

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}')