summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar GamaC0de <nitzo2001@yahoo.com> 2016-04-26 16:38:41 +0200
committerGravatar GamaC0de <nitzo2001@yahoo.com> 2016-04-26 16:38:41 +0200
commit5879addcb98195f595226bc01768f55b0edc5d20 (patch)
treea9070f8407a899dd35723074a8dc1b1dbd4fdb0f
parent[Checksum] Fix 'retry' behaviour (diff)
downloadpyload-5879addcb98195f595226bc01768f55b0edc5d20.tar.xz
[MegaCoNz] Add checksum and folder support (fix #481)
-rw-r--r--module/plugins/crypter/MegaCoNzFolder.py142
-rw-r--r--module/plugins/hoster/MegaCoNz.py189
2 files changed, 265 insertions, 66 deletions
diff --git a/module/plugins/crypter/MegaCoNzFolder.py b/module/plugins/crypter/MegaCoNzFolder.py
index 442e6beea..686f67594 100644
--- a/module/plugins/crypter/MegaCoNzFolder.py
+++ b/module/plugins/crypter/MegaCoNzFolder.py
@@ -1,31 +1,155 @@
# -*- coding: utf-8 -*-
+import base64
+import random
import re
+import struct
+
+import Crypto.Cipher.AES
from module.plugins.internal.Crypter import Crypter
+from module.plugins.internal.misc import decode, json
+
+
+############################ General errors ###################################
+# EINTERNAL (-1): An internal error has occurred. Please submit a bug report, detailing the exact circumstances in which this error occurred
+# EARGS (-2): You have passed invalid arguments to this command
+# EAGAIN (-3): (always at the request level) A temporary congestion or server malfunction prevented your request from being processed. No data was altered. Retry. Retries must be spaced with exponential backoff
+# ERATELIMIT (-4): You have exceeded your command weight per time quota. Please wait a few seconds, then try again (this should never happen in sane real-life applications)
+#
+############################ Upload errors ####################################
+# EFAILED (-5): The upload failed. Please restart it from scratch
+# ETOOMANY (-6): Too many concurrent IP addresses are accessing this upload target URL
+# ERANGE (-7): The upload file packet is out of range or not starting and ending on a chunk boundary
+# EEXPIRED (-8): The upload target URL you are trying to access has expired. Please request a fresh one
+#
+############################ Stream/System errors #############################
+# ENOENT (-9): Object (typically, node or user) not found
+# ECIRCULAR (-10): Circular linkage attempted
+# EACCESS (-11): Access violation (e.g., trying to write to a read-only share)
+# EEXIST (-12): Trying to create an object that already exists
+# EINCOMPLETE (-13): Trying to access an incomplete resource
+# EKEY (-14): A decryption operation failed (never returned by the API)
+# ESID (-15): Invalid or expired user session, please relogin
+# EBLOCKED (-16): User blocked
+# EOVERQUOTA (-17): Request over quota
+# ETEMPUNAVAIL (-18): Resource temporarily not available, please try again later
+# ETOOMANYCONNECTIONS (-19): Too many connections on this resource
+# EWRITE (-20): Write failed
+# EREAD (-21): Read failed
+# EAPPKEY (-22): Invalid application key; request not processed
class MegaCoNzFolder(Crypter):
__name__ = "MegaCoNzFolder"
__type__ = "crypter"
- __version__ = "0.10"
- __status__ = "broken"
+ __version__ = "0.11"
+ __status__ = "testing"
- __pattern__ = r'(https?://(?:www\.)?mega(\.co)?\.nz/|mega:|chrome:.+?)#F!(?P<ID>[\w^_]+)!(?P<KEY>[\w,\\-]+)'
+ __pattern__ = r'(https?://(?:www\.)?mega(\.co)?\.nz/|mega:|chrome:.+?)#F!(?P<ID>[\w^_]+)!(?P<KEY>[\w,\-=]+)'
__config__ = [("activated" , "bool" , "Activated" , True ),
("use_premium" , "bool" , "Use premium account if available", True ),
("folder_per_package", "Default;Yes;No", "Create folder for each package" , "Default")]
__description__ = """Mega.co.nz folder decrypter plugin"""
__license__ = "GPLv3"
- __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+ __authors__ = [("Walter Purcaro", "vuolter@gmail.com" ),
+ ("GammaC0de", "nitzo2001[AT]yahoo[DOT]com")]
+
+
+ API_URL = "https://eu.api.mega.co.nz/cs"
+
+
+ def base64_decode(self, data):
+ data += '=' * (-len(data) % 4)
+ return base64.b64decode(str(data), "-_")
+
+
+ def base64_b64encode(self, data):
+ return base64.b64encode(data, "-_")
+
+
+ def a32_to_str(self, a):
+ return struct.pack(_(">%dI") % len(a), *a) #: big-endian, unsigned int
+
+
+ def str_to_a32(self, s):
+ s += '\0' * (-len(s) % 4) # Add padding, we need a string with a length multiple of 4
+ return struct.unpack(_(">%dI") % (len(s) / 4), s) #: big-endian, unsigned int
+
+
+ def base64_to_a32(self, s):
+ return self.str_to_a32(self.base64_decode(s))
+
+
+ def cbc_decrypt(self, data, key):
+ cbc = Crypto.Cipher.AES.new(self.a32_to_str(key), Crypto.Cipher.AES.MODE_CBC, "\0" * 16)
+ return cbc.decrypt(data)
+
+
+ def decrypt_key(self, a, key):
+ a = self.base64_decode(a)
+ k = sum((self.str_to_a32(self.cbc_decrypt(a[_i:_i + 16], key))
+ for _i in xrange(0, len(a), 16)), ())
+ self.log_debug("Decrypted Key: %s" % decode(k))
- def setup(self):
- self.req.setOption("timeout", 300)
+ return k
+
+
+ def api_response(self, **kwargs):
+ """
+ Dispatch a call to the api, see https://mega.co.nz/#developers
+ """
+ uid = random.randint(10 << 9, 10 ** 10) #: Generate a session id, no idea where to obtain elsewhere
+
+ res = self.load(self.API_URL,
+ get={'id': uid,
+ 'n' : self.info['pattern']['ID']},
+ post=json.dumps([kwargs]))
+
+ self.log_debug("Api Response: " + res)
+
+ return json.loads(res)
+
+
+ def check_error(self, code):
+ ecode = abs(code)
+
+ if ecode in (9, 16, 21):
+ self.offline()
+
+ elif ecode in (3, 13, 17, 18, 19):
+ self.temp_offline()
+
+ elif ecode in (1, 4, 6, 10, 15, 21):
+ self.retry(5, 30, _("Error code: [%s]") % -ecode)
+
+ else:
+ self.fail(_("Error code: [%s]") % -ecode)
def decrypt(self, pyfile):
- url = "https://mega.co.nz/#F!%s!%s" % re.match(self.__pattern__, pyfile.url).groups()
- self.data = self.load("http://rapidgen.org/linkfinder", post={'linklisturl': url})
- self.links = re.findall(r'(https://mega(\.co)?\.nz/#N!.+?)<', self.data)
+ id = self.info['pattern']['ID']
+ master_key = self.info['pattern']['KEY']
+
+ self.log_debug("ID: %s" % id, "Key: %s" % master_key, "Type: public folder")
+
+ master_key = self.base64_to_a32(master_key)
+
+ mega = self.api_response(a="f", c=1, r=1, ca=1, ssl=1)[0]
+
+ if isinstance(mega, int):
+ self.check_error(mega)
+ elif "e" in mega:
+ self.check_error(mega['e'])
+
+
+ get_node_key = lambda k: self.base64_b64encode(self.a32_to_str(self.decrypt_key(k, master_key)))
+
+ self.links = [_("https://mega.co.nz/#N!%s!%s=###n=%s") %
+ (_f['h'],
+ get_node_key(_f['k'][_f['k'].index(':') + 1:]),
+ id)
+ for _f in mega['f']
+ if _f['t'] == 0]
diff --git a/module/plugins/hoster/MegaCoNz.py b/module/plugins/hoster/MegaCoNz.py
index 1fd430e83..3f0d6889a 100644
--- a/module/plugins/hoster/MegaCoNz.py
+++ b/module/plugins/hoster/MegaCoNz.py
@@ -1,10 +1,10 @@
# -*- coding: utf-8 -*-
-import array
import base64
import os
import random
import re
+import struct
import Crypto.Cipher.AES
import Crypto.Util.Counter
@@ -46,76 +46,109 @@ from module.plugins.internal.misc import decode, encode, json
class MegaCoNz(Hoster):
__name__ = "MegaCoNz"
__type__ = "hoster"
- __version__ = "0.37"
+ __version__ = "0.38"
__status__ = "testing"
- __pattern__ = r'(https?://(?:www\.)?mega(\.co)?\.nz/|mega:|chrome:.+?)#(?P<TYPE>N|)!(?P<ID>[\w^_]+)!(?P<KEY>[\w\-,]+)'
- __config__ = [("activated", "bool", "Activated", True)]
+ __pattern__ = r'(https?://(?:www\.)?mega(\.co)?\.nz/|mega:|chrome:.+?)#(?P<TYPE>N|)!(?P<ID>[\w^_]+)!(?P<KEY>[\w\-,=]+)(?:###n=(?P<OWNER>[\w^_]+))?'
+ __config__ = [("activated", "bool", "Activated", True)]
__description__ = """Mega.co.nz hoster plugin"""
__license__ = "GPLv3"
- __authors__ = [("RaNaN", "ranan@pyload.org"),
- ("Walter Purcaro", "vuolter@gmail.com")]
+ __authors__ = [("RaNaN", "ranan@pyload.org" ),
+ ("Walter Purcaro", "vuolter@gmail.com" ),
+ ("GammaC0de", "nitzo2001[AT}yahoo[DOT]com")]
API_URL = "https://eu.api.mega.co.nz/cs"
FILE_SUFFIX = ".crypted"
- def b64_decode(self, data):
- data = data.replace("-", "+").replace("_", "/")
- return base64.standard_b64decode(data + '=' * (-len(data) % 4))
+ def base64_decode(self, data):
+ data += '=' * (-len(data) % 4)
+ return base64.b64decode(str(data), "-_")
+
+
+ def base64_b64encode(self, data):
+ return base64.b64encode(data, "-_")
+
+
+ def a32_to_str(self, a):
+ return struct.pack(_(">%dI") % len(a), *a) #: big-endian, unsigned int
+
+
+ def str_to_a32(self, s):
+ s += '\0' * (-len(s) % 4) # Add padding, we need a string with a length multiple of 4
+ return struct.unpack(_(">%dI") % (len(s) / 4), s) #: big-endian, unsigned int
+
+
+ def base64_to_a32(self, s):
+ return self.str_to_a32(self.base64_decode(s))
def get_cipher_key(self, key):
"""
Construct the cipher key from the given data
"""
- a = array.array("I", self.b64_decode(key))
-
- k = array.array("I", (a[0] ^ a[4], a[1] ^ a[5], a[2] ^ a[6], a[3] ^ a[7]))
- iv = a[4:6] + array.array("I", (0, 0))
- meta_mac = a[6:8]
+ k = (key[0] ^ key[4], key[1] ^ key[5], key[2] ^ key[6], key[3] ^ key[7])
+ iv = key[4:6] + (0, 0)
+ meta_mac = key[6:8]
return k, iv, meta_mac
+ def decrypt_attr(self, data, key):
+ k, iv, meta_mac = self.get_cipher_key(key)
+ cbc = Crypto.Cipher.AES.new(self.a32_to_str(k), Crypto.Cipher.AES.MODE_CBC, "\0" * 16)
+ attr = cbc.decrypt(self.base64_decode(data))
+
+ if not attr.startswith("MEGA"):
+ self.fail(_("Decryption failed"))
+
+ self.log_debug("Decrypted Attr: %s" % decode(attr))
+
+ #: Data is padded, 0-bytes must be stripped
+ return json.loads(re.search(r'{.+?}', attr).group(0))
+
+
def api_response(self, **kwargs):
"""
Dispatch a call to the api, see https://mega.co.nz/#developers
"""
- #: Generate a session id, no idea where to obtain elsewhere
- uid = random.randint(10 << 9, 10 ** 10)
+ uid = random.randint(10 << 9, 10 ** 10) #: Generate a session id, no idea where to obtain elsewhere
+
+ res = self.load(self.API_URL,
+ get={'id': uid,
+ 'n' : self.info['pattern']['OWNER'] or self.info['pattern']['ID']},
+ post=json.dumps([kwargs]))
- res = self.load(self.API_URL, get={'id': uid}, post=json.dumps([kwargs]))
self.log_debug("Api Response: " + res)
return json.loads(res)
- def decrypt_attr(self, data, key):
- k, iv, meta_mac = self.get_cipher_key(key)
- cbc = Crypto.Cipher.AES.new(k, Crypto.Cipher.AES.MODE_CBC, "\0" * 16)
- attr = decode(cbc.decrypt(self.b64_decode(data)))
+ def get_chunks(self, size):
+ """
+ Calculate chunks for a given encrypted file size
+ """
+ chunk_start = 0
+ chunk_size = 0x20000
- self.log_debug("Decrypted Attr: %s" % attr)
- if not attr.startswith("MEGA"):
- self.fail(_("Decryption failed"))
+ while chunk_start + chunk_size < size:
+ yield (chunk_start, chunk_size)
+ chunk_start += chunk_size
+ if chunk_size < 0x100000:
+ chunk_size += 0x20000
- #: Data is padded, 0-bytes must be stripped
- return json.loads(re.search(r'{.+?}', attr).group(0))
+ if chunk_start < size:
+ yield (chunk_start, size - chunk_start)
def decrypt_file(self, key):
"""
- Decrypts the file at last_download`
+ Decrypts and verifies checksum to the file at last_download`
"""
- #: Upper 64 bit of counter start
- n = self.b64_decode(key)[16:24]
-
- #: Convert counter to long and shift bytes
k, iv, meta_mac = self.get_cipher_key(key)
- ctr = Crypto.Util.Counter.new(128, initial_value=long(n.encode("hex"), 16) << 64)
- cipher = Crypto.Cipher.AES.new(k, Crypto.Cipher.AES.MODE_CTR, counter=ctr)
+ ctr = Crypto.Util.Counter.new(128, initial_value = ((iv[0] << 32) + iv[1]) << 64)
+ cipher = Crypto.Cipher.AES.new(self.a32_to_str(k), Crypto.Cipher.AES.MODE_CTR, counter=ctr)
self.pyfile.setStatus("decrypting")
self.pyfile.setProgress(0)
@@ -130,11 +163,15 @@ class MegaCoNz(Hoster):
except IOError, e:
self.fail(e.message)
- chunk_size = 2 ** 15 #: Buffer size, 32k
- # file_mac = [0, 0, 0, 0] # calculate CBC-MAC for checksum
+ file_mac = [0, 0, 0, 0] # calculate CBC-MAC for checksum
+
+ crypted_size = os.path.getsize(file_crypted)
+
+ checksum_activated = self.config.get("activated", default=False, plugin="Checksum")
+ check_checksum = self.config.get("check_checksum", default=True, plugin="Checksum")
- chunks = os.path.getsize(file_crypted) / chunk_size + 1
- for i in xrange(chunks):
+ progress = 0
+ for chunk_start, chunk_size in self.get_chunks(crypted_size):
buf = f.read(chunk_size)
if not buf:
break
@@ -142,34 +179,66 @@ class MegaCoNz(Hoster):
chunk = cipher.decrypt(buf)
df.write(chunk)
- self.pyfile.setProgress(int((100.0 / chunks) * i))
+ progress += chunk_size
+ self.pyfile.setProgress(int((100.0 / crypted_size) * progress))
- # chunk_mac = [iv[0], iv[1], iv[0], iv[1]]
- # for i in xrange(0, chunk_size, 16):
- # block = chunk[i:i+16]
- # if len(block) % 16:
- # block += '=' * (16 - (len(block) % 16))
- # block = array.array("I", block)
+ if checksum_activated and check_checksum:
+ chunk_mac = [iv[0], iv[1], iv[0], iv[1]]
+ for j in xrange(0, len(chunk), 16):
+ block = chunk[j:j + 16]
+ block += '\0' * (-len(block) % 16)
+ block = self.str_to_a32(block)
+ chunk_mac = [chunk_mac[0] ^ block[0], chunk_mac[1] ^ block[1], chunk_mac[2] ^ block[2],
+ chunk_mac[3] ^ block[3]]
- # chunk_mac = [chunk_mac[0] ^ a_[0], chunk_mac[1] ^ block[1], chunk_mac[2] ^ block[2], chunk_mac[3] ^ block[3]]
- # chunk_mac = aes_cbc_encrypt_a32(chunk_mac, k)
+ cbc = Crypto.Cipher.AES.new(self.a32_to_str(k), Crypto.Cipher.AES.MODE_CBC, "\0" * 16)
+ chunk_mac = self.str_to_a32(cbc.encrypt(self.a32_to_str(chunk_mac)))
- # file_mac = [file_mac[0] ^ chunk_mac[0], file_mac[1] ^ chunk_mac[1], file_mac[2] ^ chunk_mac[2], file_mac[3] ^ chunk_mac[3]]
- # file_mac = aes_cbc_encrypt_a32(file_mac, k)
+ file_mac = [file_mac[0] ^ chunk_mac[0], file_mac[1] ^ chunk_mac[1], file_mac[2] ^ chunk_mac[2],
+ file_mac[3] ^ chunk_mac[3]]
+ cbc = Crypto.Cipher.AES.new(self.a32_to_str(k), Crypto.Cipher.AES.MODE_CBC, "\0" * 16)
+ file_mac = self.str_to_a32(cbc.encrypt(self.a32_to_str(file_mac)))
self.pyfile.setProgress(100)
f.close()
df.close()
- # if file_mac[0] ^ file_mac[1], file_mac[2] ^ file_mac[3] is not meta_mac:
- # self.remove(file_decrypted, trash=False)
- # self.fail(_("Checksum mismatch"))
-
+ self.log_info(_("File decrypted"))
self.remove(file_crypted, trash=False)
+
+ file_mac = (file_mac[0] ^ file_mac[1], file_mac[2] ^ file_mac[3])
+ if checksum_activated and check_checksum:
+ if file_mac == meta_mac:
+ self.log_info(_('File integrity of "%s" verified by CBC-MAC checksum (%s)') %
+ (file_decrypted, meta_mac))
+ else:
+ self.log_warning(_('CBC-MAC checksum for file "%s" does not match (%s != %s)') %
+ (self.pyfile.name, file_mac, meta_mac))
+ self.checksum_failed(file_decrypted, _("Checksums do not match"))
+
self.last_download = decode(file_decrypted)
+ def checksum_failed(self, local_file, msg):
+ check_action = self.config.get("check_action", default="retry", plugin="Checksum")
+ if check_action == "retry":
+ max_tries = self.config.get("max_tries", default=2, plugin="Checksum")
+ retry_action = self.config.get("retry_action", default="fail", plugin="Checksum")
+ if all(_r < max_tries for _id, _r in self.retries.items()):
+ self.remove(local_file, trash=False)
+ wait_time = self.config.get("wait_time", default=1, plugin="Checksum")
+ self.retry(max_tries, wait_time, msg)
+
+ elif retry_action == "nothing":
+ return
+
+ elif check_action == "nothing":
+ return
+
+ self.fail(msg)
+
+
def check_error(self, code):
ecode = abs(code)
@@ -187,12 +256,18 @@ class MegaCoNz(Hoster):
def process(self, pyfile):
- pattern = re.match(self.__pattern__, pyfile.url).groupdict()
- id = pattern['ID']
- key = pattern['KEY']
- public = pattern['TYPE'] == ""
+ id = self.info['pattern']['ID']
+ key = self.info['pattern']['KEY']
+ public = self.info['pattern']['TYPE'] == ""
+ owner = self.info['pattern']['OWNER']
+
+ if not public and not owner:
+ self.log_error(_("Missing owner in URL"))
+ self.fail(_("Missing owner in URL"))
+
+ self.log_debug("ID: %s" % id, "Key: %s" % key, "Type: %s" % ("public" if public else "node"), "Owner: %s" % owner)
- self.log_debug("ID: %s" % id, "Key: %s" % key, "Type: %s" % ("public" if public else "node"))
+ key = self.base64_to_a32(key)
#: G is for requesting a download url
#: This is similar to the calls in the mega js app, documentation is very bad