Merge branch 'fix/add-exception' into 'develop'

Fix/add exception

See merge request ProtonVPN/linux/proton-python-client!40

Author: Alexandru Cheltuitor

arch/PKGBUILD

@@ -1,6 +1,6 @@
 # Maintainer: Proton Technologies AG <[email protected]>
 pkgname=python-proton-client
-pkgver=0.5.0
+pkgver=0.5.1
 pkgrel=1
 pkgdesc="Safely login with ProtonVPN credentials to connect to Proton."
 arch=("any")

debian/changelog

@@ -1,30 +1,36 @@
+proton-python-client (0.5.1-1) unstable; urgency=medium
+
+  * Add new exceptions for improved case handling
+
+ -- Proton Technologies AG <[email protected]>  Mon, 24 May 2021 11:30:00 +0100
+
 proton-python-client (0.5.0-1) unstable; urgency=medium
 
   * Add new exceptions
   * Throw custom exceptions in case of network errors, abstracting from the package that is being used for requests
 
  -- Proton Technologies AG <[email protected]>  Fri, 30 Apr 2021 18:15:00 +0100
 
- proton-python-client (0.4.1-1) unstable; urgency=medium
+proton-python-client (0.4.1-1) unstable; urgency=medium
 
   * Add long description to setup.py
 
  -- Proton Technologies AG <[email protected]>  Wed, 21 Apr 2021 13:45:00 +0100
 
- proton-python-client (0.4.0-1) unstable; urgency=medium
+proton-python-client (0.4.0-1) unstable; urgency=medium
 
   * Add proxy support
   * Verify fingerprint of signer key
 
  -- Proton Technologies AG <[email protected]>  Mon, 19 Apr 2021 10:50:00 +0100
 
- proton-python-client (0.3.0-1) unstable; urgency=medium
+proton-python-client (0.3.0-1) unstable; urgency=medium
 
   * Set flags to BNs in the openssl implementation using BN_set_flags and BN_FLAG_CONSTTIME
 
  -- Proton Technologies AG <[email protected]>  Wed, 27 Jan 2021 12:12:23 +0000
 
- proton-python-client (0.2.0-3) unstable; urgency=medium
+proton-python-client (0.2.0-3) unstable; urgency=medium
 
   * Bugfix: Invalid modulus
   * Bugfix: Invalid salt

proton/api.py

@@ -1,12 +1,15 @@
 import base64
 import json
+
 import gnupg
 import requests
 
 from .cert_pinning import TLSPinningAdapter
+from .constants import (DEFAULT_TIMEOUT, SRP_MODULUS_KEY,
+                        SRP_MODULUS_KEY_FINGERPRINT)
+from .exceptions import (ConnectionTimeOutError, NewConnectionError,
+                         ProtonError, TLSPinningError, UnknownConnectionError)
 from .srp import User as PmsrpUser
-from .constants import DEFAULT_TIMEOUT, SRP_MODULUS_KEY, SRP_MODULUS_KEY_FINGERPRINT
-from .exceptions import ProtonError, TLSPinningError, NewConnectionError, UnknownConnectionError
 
 
 class Session:
@@ -101,6 +104,8 @@ def api_request(
             )
         except requests.exceptions.ConnectionError as e:
             raise NewConnectionError(e)
+        except requests.exceptions.Timeout as e:
+            raise ConnectionTimeOutError(e)
         except TLSPinningError as e:
             raise TLSPinningError(e)
         except (Exception, requests.exceptions.BaseHTTPError) as e:

proton/cert_pinning.py

@@ -154,9 +154,9 @@ def _new_pool(self, scheme, host, port, request_context):
         kwargs = self.connection_pool_kw
 
         pool = TLSPinningHTTPSConnectionPool(
-                    host=host, port=port,
-                    hash_dict=self.hash_dict, **kwargs
-                )
+            host=host, port=port,
+            hash_dict=self.hash_dict, **kwargs
+        )
 
         return pool
 

proton/constants.py

@@ -1,5 +1,5 @@
 
-VERSION = "0.5.0"
+VERSION = "0.5.1"
 DEFAULT_TIMEOUT = (10, 30)
 PUBKEY_HASH_DICT = {
     "api.protonvpn.ch": [

proton/exceptions.py

@@ -25,5 +25,9 @@ class NewConnectionError(ProtonNetworkError):
     """Network Error"""
 
 
+class ConnectionTimeOutError(ProtonNetworkError):
+    """Connection Time Out Error"""
+
+
 class UnknownConnectionError(ProtonNetworkError):
     """UnknownConnectionError"""

rpmbuild/SPECS/python3-proton-client.spec

@@ -1,5 +1,5 @@
 %define unmangled_name proton-client
-%define version 0.5.0
+%define version 0.5.1
 %define release 1
 
 Prefix: %{_prefix}
@@ -48,7 +48,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 
 %changelog
-* Wed Apr 21 2021 Proton Technologies AG <[email protected]> 0.5.0-1
+* Mon May 24 2021 Proton Technologies AG <[email protected]> 0.5.1-1
+- Add new exceptions for improved case handling
+
+* Fri Apr 30 2021 Proton Technologies AG <[email protected]> 0.5.0-1
 - Add new exceptions
 - Throw custom exceptions in case of network errors, abstracting from the package that is being used for requests