diff --git a/HISTORY.rst b/HISTORY.rst index 499ec99..d0fff22 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -3,12 +3,20 @@ Release History =============== -1.0.3 (unreleased) +1.0.4 (unreleased) ------------------ - Increase the wait time in between failed API request retries. +1.0.3 (2019-11-12) +------------------ + +- Fixes broken ``download`` method. +- Changes ``download`` and ``download_url`` methods to return the path to the downloaded file, previously returned ``None``. +- Added LICENSE. + + 1.0.2 (2019-11-07) ------------------ diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d65719f --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2019 richardARPANET + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/src/mega/mega.py b/src/mega/mega.py index 44a79c6..16f1c35 100644 --- a/src/mega/mega.py +++ b/src/mega/mega.py @@ -568,7 +568,7 @@ class Mega: """ Download a file by it's file object """ - self._download_file( + return self._download_file( file_handle=None, file_key=None, file=file[1], @@ -646,7 +646,7 @@ class Mega: path = self._parse_url(url).split('!') file_id = path[0] file_key = path[1] - self._download_file( + return self._download_file( file_handle=file_id, file_key=file_key, dest_path=dest_path, @@ -694,7 +694,7 @@ class Mega: iv = file['iv'] meta_mac = file['meta_mac'] - # Seems to happens sometime... When this occurs, files are + # Seems to happens sometime... When this occurs, files are # inaccessible also in the official also in the official web app. # Strangely, files can come back later. if 'g' not in file_data: @@ -716,51 +716,53 @@ class Mega: else: dest_path += '/' - temp_output_file = tempfile.NamedTemporaryFile( + with tempfile.NamedTemporaryFile( mode='w+b', prefix='megapy_', delete=False - ) + ) as temp_output_file: + k_str = a32_to_str(k) + counter = Counter.new( + 128, initial_value=((iv[0] << 32) + iv[1]) << 64 + ) + aes = AES.new(k_str, AES.MODE_CTR, counter=counter) - k_str = a32_to_str(k) - counter = Counter.new(128, initial_value=((iv[0] << 32) + iv[1]) << 64) - aes = AES.new(k_str, AES.MODE_CTR, counter=counter) + mac_str = '\0' * 16 + mac_encryptor = AES.new(k_str, AES.MODE_CBC, mac_str) + iv_str = a32_to_str([iv[0], iv[1], iv[0], iv[1]]) - mac_str = '\0' * 16 - mac_encryptor = AES.new(k_str, AES.MODE_CBC, mac_str) - iv_str = a32_to_str([iv[0], iv[1], iv[0], iv[1]]) + for chunk_start, chunk_size in get_chunks(file_size): + chunk = input_file.read(chunk_size) + chunk = aes.decrypt(chunk) + temp_output_file.write(chunk) - for chunk_start, chunk_size in get_chunks(file_size): - chunk = input_file.read(chunk_size) - chunk = aes.decrypt(chunk) - temp_output_file.write(chunk) + encryptor = AES.new(k_str, AES.MODE_CBC, iv_str) + for i in range(0, len(chunk) - 16, 16): + block = chunk[i:i + 16] + encryptor.encrypt(block) + + # fix for files under 16 bytes failing + if file_size > 16: + i += 16 + else: + i = 0 - encryptor = AES.new(k_str, AES.MODE_CBC, iv_str) - for i in range(0, len(chunk) - 16, 16): block = chunk[i:i + 16] - encryptor.encrypt(block) + if len(block) % 16: + block += b'\0' * (16 - (len(block) % 16)) + mac_str = mac_encryptor.encrypt(encryptor.encrypt(block)) - # fix for files under 16 bytes failing - if file_size > 16: - i += 16 - else: - i = 0 - - block = chunk[i:i + 16] - if len(block) % 16: - block += '\0' * (16 - (len(block) % 16)) - mac_str = mac_encryptor.encrypt(encryptor.encrypt(block)) - - file_info = os.stat(temp_output_file.name) - logger.info('%s of %s downloaded', file_info.st_size, file_size) - - file_mac = str_to_a32(mac_str) - - temp_output_file.close() - - # check mac integrity - if (file_mac[0] ^ file_mac[1], file_mac[2] ^ file_mac[3]) != meta_mac: - raise ValueError('Mismatched mac') - - shutil.move(temp_output_file.name, dest_path + file_name) + file_info = os.stat(temp_output_file.name) + logger.info( + '%s of %s downloaded', file_info.st_size, file_size + ) + file_mac = str_to_a32(mac_str) + # check mac integrity + if ( + file_mac[0] ^ file_mac[1], file_mac[2] ^ file_mac[3] + ) != meta_mac: + raise ValueError('Mismatched mac') + output_path = Path(dest_path + file_name) + shutil.move(temp_output_file.name, output_path) + return output_path def upload(self, filename, dest=None, dest_filename=None): # determine storage node diff --git a/src/tests/test_mega.py b/src/tests/test_mega.py index a31f608..48ed6e7 100644 --- a/src/tests/test_mega.py +++ b/src/tests/test_mega.py @@ -28,6 +28,17 @@ def mega(folder_name): mega_.destroy(node_id) +@pytest.fixture +def uploaded_file(mega, folder_name): + folder = mega.find(folder_name) + dest_node_id = folder[1]['h'] + mega.upload( + __file__, dest=dest_node_id, dest_filename='test.py' + ) + path = f'{folder_name}/test.py' + return mega.find(path) + + def test_mega(mega): assert isinstance(mega, Mega) @@ -56,11 +67,9 @@ def test_get_files(mega): assert isinstance(files, dict) -def test_get_link(mega): - file = mega.find(TEST_FILE) - if file: - link = mega.get_link(file) - assert isinstance(link, str) +def test_get_link(mega, uploaded_file): + link = mega.get_link(uploaded_file) + assert isinstance(link, str) class TestExport: @@ -171,18 +180,31 @@ def test_delete_folder(mega, folder_name): assert isinstance(resp, int) -def test_delete(mega): - file = mega.find(TEST_FILE) - if file: - resp = mega.delete(file[0]) - assert isinstance(resp, int) +def test_delete(mega, uploaded_file): + resp = mega.delete(uploaded_file[0]) + assert isinstance(resp, int) -def test_destroy(mega): - file = mega.find(TEST_FILE) - if file: - resp = mega.destroy(file[0]) - assert isinstance(resp, int) +def test_destroy(mega, uploaded_file): + resp = mega.destroy(uploaded_file[0]) + assert isinstance(resp, int) + + +def test_download(mega, tmpdir, folder_name): + # Upload a single file into a folder + folder = mega.find(folder_name) + dest_node_id = folder[1]['h'] + mega.upload( + __file__, dest=dest_node_id, dest_filename='test.py' + ) + path = f'{folder_name}/test.py' + file = mega.find(path) + + output_path = mega.download( + file=file, dest_path=tmpdir, dest_filename='test.py' + ) + + assert output_path.exists() def test_empty_trash(mega):