Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/accounts/MegaRapidCz.py
	module/plugins/accounts/ShareRapidCom.py
	module/plugins/crypter/HotfileComFolder.py
	module/plugins/crypter/HotfileFolderCom.py
	module/plugins/hoster/Keep2shareCC.py
	module/plugins/hoster/Keep2shareCc.py
	module/plugins/hoster/MegaCoNz.py
	module/plugins/hoster/MegaNz.py
	module/plugins/hoster/MegaRapidCz.py
	module/plugins/hoster/ShareRapidCom.py
	module/plugins/internal/CaptchaService.py
	pyload/api/__init__.py
	pyload/manager/AccountManager.py
	pyload/manager/PluginManager.py
	pyload/manager/thread/PluginThread.py
	pyload/network/HTTPRequest.py
	pyload/network/XDCCRequest.py
	pyload/plugins/Plugin.py
	pyload/plugins/account/BillionuploadsCom.py
	pyload/plugins/account/CramitIn.py
	pyload/plugins/account/EasybytezCom.py
	pyload/plugins/account/FastshareCz.py
	pyload/plugins/account/File4safeCom.py
	pyload/plugins/account/FileParadoxIn.py
	pyload/plugins/account/FileomCom.py
	pyload/plugins/account/FilerNet.py
	pyload/plugins/account/FilerioCom.py
	pyload/plugins/account/FourSharedCom.py
	pyload/plugins/account/Ftp.py
	pyload/plugins/account/Http.py
	pyload/plugins/account/HugefilesNet.py
	pyload/plugins/account/HundredEightyUploadCom.py
	pyload/plugins/account/LomafileCom.py
	pyload/plugins/account/MovReelCom.py
	pyload/plugins/account/MultishareCz.py
	pyload/plugins/account/MyfastfileCom.py
	pyload/plugins/account/NosuploadCom.py
	pyload/plugins/account/NovafileCom.py
	pyload/plugins/account/QuickshareCz.py
	pyload/plugins/account/RarefileNet.py
	pyload/plugins/account/RyushareCom.py
	pyload/plugins/account/SecureUploadEu.py
	pyload/plugins/account/SendmywayCom.py
	pyload/plugins/account/ShareRapidCom.py
	pyload/plugins/account/StahnuTo.py
	pyload/plugins/account/StreamcloudEu.py
	pyload/plugins/account/TusfilesNet.py
	pyload/plugins/account/UploadingCom.py
	pyload/plugins/account/UptoboxCom.py
	pyload/plugins/account/VidPlayNet.py
	pyload/plugins/addon/Checksum.py
	pyload/plugins/addon/ClickAndLoad.py
	pyload/plugins/addon/DeleteFinished.py
	pyload/plugins/addon/DownloadScheduler.py
	pyload/plugins/addon/ExternalScripts.py
	pyload/plugins/addon/ExtractArchive.py
	pyload/plugins/addon/HotFolder.py
	pyload/plugins/addon/IRCInterface.py
	pyload/plugins/addon/MergeFiles.py
	pyload/plugins/addon/MultiHome.py
	pyload/plugins/addon/RestartFailed.py
	pyload/plugins/addon/UnSkipOnFail.py
	pyload/plugins/addon/WindowsPhoneToastNotify.py
	pyload/plugins/addon/XMPPInterface.py
	pyload/plugins/base/Container.py
	pyload/plugins/base/Crypter.py
	pyload/plugins/base/Hook.py
	pyload/plugins/base/OCR.py
	pyload/plugins/container/RSDF.py
	pyload/plugins/crypter/DuploadOrgFolder.py
	pyload/plugins/crypter/EasybytezComFolder.py
	pyload/plugins/crypter/FiredriveComFolder.py
	pyload/plugins/crypter/HotfileFolderCom.py
	pyload/plugins/crypter/LinkSaveIn.py
	pyload/plugins/crypter/MultiuploadCom.py
	pyload/plugins/crypter/ShareRapidComFolder.py
	pyload/plugins/crypter/TusfilesNetFolder.py
	pyload/plugins/crypter/UploadableChFolder.py
	pyload/plugins/crypter/UploadedToFolder.py
	pyload/plugins/hook/Captcha9kw.py
	pyload/plugins/hook/MyfastfileCom.py
	pyload/plugins/hoster/BillionuploadsCom.py
	pyload/plugins/hoster/CramitIn.py
	pyload/plugins/hoster/EasybytezCom.py
	pyload/plugins/hoster/File4safeCom.py
	pyload/plugins/hoster/FileParadoxIn.py
	pyload/plugins/hoster/FilefactoryCom.py
	pyload/plugins/hoster/FileomCom.py
	pyload/plugins/hoster/FilerioCom.py
	pyload/plugins/hoster/FileshareInUa.py
	pyload/plugins/hoster/FiredriveCom.py
	pyload/plugins/hoster/Ftp.py
	pyload/plugins/hoster/HugefilesNet.py
	pyload/plugins/hoster/HundredEightyUploadCom.py
	pyload/plugins/hoster/Keep2shareCC.py
	pyload/plugins/hoster/LoadTo.py
	pyload/plugins/hoster/LomafileCom.py
	pyload/plugins/hoster/MegaNz.py
	pyload/plugins/hoster/MegacrypterCom.py
	pyload/plugins/hoster/MovReelCom.py
	pyload/plugins/hoster/MyvideoDe.py
	pyload/plugins/hoster/NosuploadCom.py
	pyload/plugins/hoster/NovafileCom.py
	pyload/plugins/hoster/PandaPlaNet.py
	pyload/plugins/hoster/PremiumTo.py
	pyload/plugins/hoster/RarefileNet.py
	pyload/plugins/hoster/RyushareCom.py
	pyload/plugins/hoster/SecureUploadEu.py
	pyload/plugins/hoster/SendmywayCom.py
	pyload/plugins/hoster/ShareRapidCom.py
	pyload/plugins/hoster/SockshareCom.py
	pyload/plugins/hoster/StreamcloudEu.py
	pyload/plugins/hoster/TurbobitNet.py
	pyload/plugins/hoster/TusfilesNet.py
	pyload/plugins/hoster/UptoboxCom.py
	pyload/plugins/hoster/VidPlayNet.py
	pyload/plugins/hoster/WebshareCz.py
	pyload/plugins/internal/DeadCrypter.py
	pyload/plugins/internal/DeadHoster.py
	pyload/plugins/internal/MultiHoster.py
	pyload/plugins/internal/SimpleCrypter.py
	pyload/plugins/internal/SimpleHoster.py
	pyload/plugins/internal/UpdateManager.py
	pyload/plugins/internal/XFSPAccount.py
	pyload/plugins/internal/XFSPHoster.py
	pyload/utils/__init__.py
	pyload/utils/packagetools.py
	pyload/webui/app/cnl.py

1 files changed, 144 insertions, 0 deletions

diff --git a/module/plugins/hoster/MegaCoNz.py b/module/plugins/hoster/MegaCoNz.py
new file mode 100644
index 000000000..2129fbfc8
--- /dev/null
+++ b/module/plugins/hoster/MegaCoNz.py
@@ -0,0 +1,144 @@
+# -*- coding: utf-8 -*-
+
+import random
+import re
+
+from array import array
+from base64 import standard_b64decode
+from os import remove
+
+from Crypto.Cipher import AES
+from Crypto.Util import Counter
+from pycurl import SSL_CIPHER_LIST
+
+from module.common.json_layer import json_loads, json_dumps
+from module.plugins.Hoster import Hoster
+
+
+class MegaCoNz(Hoster):
+    __name__    = "MegaCoNz"
+    __type__    = "hoster"
+    __version__ = "0.16"
+
+    __pattern__ = r'https?://(\w+\.)?mega\.co\.nz/#!([\w!-]+)'
+
+    __description__ = """Mega.co.nz hoster plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("RaNaN", "ranan@pyload.org")]
+
+
+    API_URL = "https://g.api.mega.co.nz/cs?id=%d"
+    FILE_SUFFIX = ".crypted"
+
+
+    def b64_decode(self, data):
+        data = data.replace("-", "+").replace("_", "/")
+        return standard_b64decode(data + '=' * (-len(data) % 4))
+
+
+    def getCipherKey(self, key):
+        """ Construct the cipher key from the given data """
+        a = array("I", key)
+        key_array = array("I", [a[0] ^ a[4], a[1] ^ a[5], a[2] ^ a[6], a[3] ^ a[7]])
+        return key_array
+
+
+    def callApi(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)
+
+        res = self.load(self.API_URL % uid, post=json_dumps([kwargs]))
+        self.logDebug("Api Response: " + res)
+        return json_loads(res)
+
+
+    def decryptAttr(self, data, key):
+        cbc = AES.new(self.getCipherKey(key), AES.MODE_CBC, "\0" * 16)
+        attr = cbc.decrypt(self.b64_decode(data))
+        self.logDebug("Decrypted Attr: " + attr)
+        if not attr.startswith("MEGA"):
+            self.fail(_("Decryption failed"))
+
+        # Data is padded, 0-bytes must be stripped
+        return json_loads(re.search(r'{.+?}', attr).group(0))
+
+
+    def decryptFile(self, key):
+        """  Decrypts the file at lastDownload` """
+
+        # upper 64 bit of counter start
+        n = key[16:24]
+
+        # convert counter to long and shift bytes
+        ctr = Counter.new(128, initial_value=long(n.encode("hex"), 16) << 64)
+        cipher = AES.new(self.getCipherKey(key), AES.MODE_CTR, counter=ctr)
+
+        self.pyfile.setStatus("decrypting")
+
+        file_crypted = self.lastDownload
+        file_decrypted = file_crypted.rsplit(self.FILE_SUFFIX)[0]
+
+        try:
+            f = open(file_crypted, "rb")
+            df = open(file_decrypted, "wb")
+        except IOError, e:
+            self.fail(str(e))
+
+        # TODO: calculate CBC-MAC for checksum
+
+        size = 2 ** 15  # buffer size, 32k
+        while True:
+            buf = f.read(size)
+            if not buf:
+                break
+
+            df.write(cipher.decrypt(buf))
+
+        f.close()
+        df.close()
+        remove(file_crypted)
+
+        self.lastDownload = file_decrypted
+
+
+    def process(self, pyfile):
+        key = None
+
+        # match is guaranteed because plugin was chosen to handle url
+        node = re.match(self.__pattern__, pyfile.url).group(2)
+        if "!" in node:
+            node, key = node.split("!")
+
+        self.logDebug("File id: %s | Key: %s" % (node, key))
+
+        if not key:
+            self.fail(_("No file key provided in the URL"))
+
+        # g is for requesting a download url
+        # this is similar to the calls in the mega js app, documentation is very bad
+        dl = self.callApi(a="g", g=1, p=node, ssl=1)[0]
+
+        if "e" in dl:
+            e = dl['e']
+            # ETEMPUNAVAIL (-18): Resource temporarily not available, please try again later
+            if e == -18:
+                self.retry()
+            else:
+                self.fail(_("Error code:") + e)
+
+        # TODO: map other error codes, e.g
+        # EACCESS (-11): Access violation (e.g., trying to write to a read-only share)
+
+        key = self.b64_decode(key)
+        attr = self.decryptAttr(dl['at'], key)
+
+        pyfile.name = attr['n'] + self.FILE_SUFFIX
+
+        self.req.http.c.setopt(SSL_CIPHER_LIST, "RC4-MD5:DEFAULT")
+
+        self.download(dl['g'])
+        self.decryptFile(key)
+
+        # Everything is finished and final name can be set
+        pyfile.name = attr['n']