Merge pull request #7 from SendSafely/v1.0.2

v1.0.2

Author: SendSafely-GitHub

.gitignore

@@ -1,3 +1,4 @@
 dist
 build.sh
 MANIFEST
+sendsafely.egg-info

LICENSE.txt

@@ -1 +1,2 @@
 include README
+include requirements.txt

MANIFEST.in

@@ -0,0 +1,15 @@
+Copyright 2022 SendSafely Inc.
+
+The purpose of this NOTICE.txt file is to contain notices that are
+required by the copyright owners of the incorporated third party components
+noted and the respective licenses.
+Some of the accompanying products have an attribution requirement
+and are set forth below. Other accompanying products do not require
+attribution, so are not listed. See also the LICENSE.txt file.
+
+
+Requests
+-----------------
+Copyright 2019 Kenneth Reitz
+This product includes software developed by Kenneth Reitz
+

NOTICE.txt

@@ -1,2 +1,2 @@
 requests~=2.24.0
-PGPy~=0.5.3
+PGPy~=0.6

requirements.txt

@@ -2,8 +2,10 @@
 import math
 import os
 import requests
+from cryptography import CryptographyDeprecationWarning
 from pgpy import PGPMessage
 from sendsafely.Progress import Progress
+import warnings
 
 from sendsafely.exceptions import CreatePackageFailedException, FinalizePackageFailedException, DownloadFileException, \
     UploadFileException, DeletePackageException, KeycodeRequiredException, GetPackageInformationFailedException, \
@@ -27,6 +29,7 @@ def __init__(self, sendsafely_instance, package_variables=None):
         :param package_variables:
         """
         super().__init__()
+        warnings.filterwarnings('ignore', category=CryptographyDeprecationWarning)
         self.initialized_via_keycode = True
         if package_variables is None:
             self.client_secret = _generate_keycode()
@@ -283,11 +286,14 @@ def delete_file_from_package(self, file_id):
             raise DeleteFileException(details=response["message"])
         return response
 
-    def get_file_information(self, file_id):
+    def get_file_information(self, file_id, directory_id=None):
         """
         Return the file information for a specified fileId
         """
-        endpoint = "/package/" + self.package_id + "/file/" + file_id
+        if directory_id:
+            endpoint = "/package/" + self.package_id + "/directory/" + directory_id + "/file/" + file_id
+        else:
+            endpoint = "/package/" + self.package_id + "/file/" + file_id
         url = self.sendsafely.BASE_URL + endpoint
         headers = make_headers(self.sendsafely.API_SECRET, self.sendsafely.API_KEY, endpoint)
         response = requests.get(url=url, headers=headers).json()
@@ -300,7 +306,7 @@ def download_and_decrypt_file(self, file_id, directory_id=None, download_directo
         Downloads & decrypts the specified file to the path specified
         """
         self._block_operation_without_keycode()
-        file_info = self.get_file_information(file_id)
+        file_info = self.get_file_information(file_id, directory_id)
         if not file_name:
             file_name = file_info["fileName"]
         total = file_info["fileParts"]

sendsafely/Package.py

@@ -1,7 +1,10 @@
 import json
 import re
+import warnings
+
 import requests
 import pgpy
+from cryptography import CryptographyDeprecationWarning
 from pgpy import PGPMessage
 from pgpy.constants import KeyFlags, HashAlgorithm, SymmetricKeyAlgorithm, CompressionAlgorithm
 from sendsafely.Package import Package
@@ -24,6 +27,7 @@ class SendSafely:
 
     def __init__(self, url, api_key, api_secret):
         super().__init__()
+        warnings.filterwarnings('ignore', category=CryptographyDeprecationWarning)
         self.BASE_URL = url + self.API_URL
         self.API_KEY = api_key
         self.API_SECRET = api_secret
@@ -124,7 +128,11 @@ def get_package_keycode(self, package_id, public_key_id=None, private_key=None):
         url = self.BASE_URL + endpoint
         headers = make_headers(self.API_SECRET, self.API_KEY, endpoint)
         try:
-            keycode = requests.get(url, headers=headers).json()["message"]
+            keycode_json = requests.get(url, headers=headers).json();
+            keycode = keycode_json['message'];
+            if keycode_json['response'] == 'FAIL':
+                raise GetKeycodeFailedException(details=str(keycode))
+
             key_pair = pgpy.PGPKey.from_blob(str(private_key))[0]
             keycode_message = PGPMessage.from_blob(keycode)
             decrypted_keycode = key_pair.decrypt(keycode_message).message

sendsafely/SendSafely.py

@@ -1,2 +1,3 @@
 [metadata]
-description-file = README.md
+long_description = file: README.md
+license_files = LICENSE.txt, NOTICE.txt

setup.cfg

@@ -1,10 +1,11 @@
-from distutils.core import setup
+from setuptools import setup
 
 setup(
 	name='sendsafely',
-	version='1.0.1',
+	version='1.0.2',
 	packages=['sendsafely'],
 	description='The SendSafely Client API allows programmatic access to SendSafely and provides a layer of abstraction from our REST API, which requires developers to perform several complex tasks in a correct manner.',
+	long_description_content_type="text/markdown",
 	author='SendSafely',
 	author_email='[email protected]',
 	url='https://github.com/SendSafely/Python-Client-API',
@@ -13,10 +14,12 @@
 		'PGPy'
 	],
 	python_requires='>=3',
+	license='Apache License Version 2.0',
 	classifiers=[
 		'Development Status :: 5 - Production/Stable',
 		'Intended Audience :: Developers',
 		'Topic :: Software Development :: Libraries :: Application Frameworks',
-		'Programming Language :: Python :: 3'
+		'Programming Language :: Python :: 3',
+		'License :: OSI Approved :: Apache Software License'
 	],
 )