Show detailed errors in Python 2 & 3 libraries

Author: artemlos

cryptolens_python2.py

@@ -19,6 +19,7 @@
 import urllib
 import hashlib
 from subprocess import Popen, PIPE
+from urllib2 import URLError, HTTPError
 
 class HelperMethods:
 
@@ -230,8 +231,12 @@ def activate(token, rsa_pub_key, product_id, key, machine_code, fields_to_return
                                                   "MaxOverdraft": max_overdraft,\
                                                   "Sign":"True",\
                                                   "SignMethod":1}))
+        except HTTPError as e:
+            response = Response.from_string(e.read())
+        except URLError as e:
+            return (None, "Could not contact the server. Error message: " + e.reason)
         except Exception:
-            return (None, "Could not contact the server.")
+            return (None, "Could not contact the server. Error message: " + e.reason)
 
         pubkey = RSAPublicKey.from_string(rsa_pub_key)
 
@@ -269,8 +274,12 @@ def get_key(token, rsa_pub_key, product_id, key, fields_to_return = 0,\
                                                   "FloatingTimeInterval": floating_time_interval,\
                                                   "Sign":"True",\
                                                   "SignMethod":1}))
+        except HTTPError as e:
+            response = Response.from_string(e.read())
+        except URLError as e:
+            return (None, "Could not contact the server. Error message: " + e.reason)
         except Exception:
-            return (None, "Could not contact the server.")
+            return (None, "Could not contact the server. Error message: " + e.reason)
 
         pubkey = RSAPublicKey.from_string(rsa_pub_key)
 
@@ -301,8 +310,12 @@ def create_trial_key(token, product_id, machine_code):
             response = HelperMethods.send_request("key/createtrialkey", {"token":token,\
                                                   "ProductId":product_id,\
                                                   "MachineCode":machine_code})
+        except HTTPError as e:
+            response = Response.from_string(e.read())
+        except URLError as e:
+            return (None, "Could not contact the server. Error message: " + e.reason)
         except Exception:
-            return (None, "Could not contact the server.")
+            return (None, "Could not contact the server. Error message: " + e.reason)
 
         jobj = json.loads(response)
 
@@ -335,8 +348,12 @@ def deactivate(token, product_id, key, machine_code, floating = False):
                                                   "Key" : key,\
                                                   "Floating" : floating,\
                                                   "MachineCode":machine_code})
+        except HTTPError as e:
+            response = Response.from_string(e.read())
+        except URLError as e:
+            return (None, "Could not contact the server. Error message: " + e.reason)
         except Exception:
-            return (False, "Could not contact the server.")
+            return (None, "Could not contact the server. Error message: " + e.reason)
 
         jobj = json.loads(response)
 

licensing/methods.py

@@ -11,6 +11,7 @@
 from licensing.internal import HelperMethods
 from licensing.models import *
 import json
+from urllib.error import URLError, HTTPError
 
 class Key:
 
@@ -44,8 +45,12 @@ def activate(token, rsa_pub_key, product_id, key, machine_code, fields_to_return
                                                   "MaxOverdraft": max_overdraft,\
                                                   "Sign":"True",\
                                                   "SignMethod":1}))
+        except HTTPError as e:
+            response = Response.from_string(e.read())
+        except URLError as e:
+            return (None, "Could not contact the server. Error message: " + e.reason)
         except Exception:
-            return (None, "Could not contact the server.")
+            return (None, "Could not contact the server. Error message: " + e.reason)
 
         pubkey = RSAPublicKey.from_string(rsa_pub_key)
 
@@ -83,8 +88,12 @@ def get_key(token, rsa_pub_key, product_id, key, fields_to_return = 0,\
                                                   "FloatingTimeInterval": floating_time_interval,\
                                                   "Sign":"True",\
                                                   "SignMethod":1}))
+        except HTTPError as e:
+            response = Response.from_string(e.read())
+        except URLError as e:
+            return (None, "Could not contact the server. Error message: " + e.reason)
         except Exception:
-            return (None, "Could not contact the server.")
+            return (None, "Could not contact the server. Error message: " + e.reason)
 
         pubkey = RSAPublicKey.from_string(rsa_pub_key)
 
@@ -115,8 +124,12 @@ def create_trial_key(token, product_id, machine_code):
             response = HelperMethods.send_request("key/createtrialkey", {"token":token,\
                                                   "ProductId":product_id,\
                                                   "MachineCode":machine_code})
+        except HTTPError as e:
+            response = Response.from_string(e.read())
+        except URLError as e:
+            return (None, "Could not contact the server. Error message: " + e.reason)
         except Exception:
-            return (None, "Could not contact the server.")
+            return (None, "Could not contact the server. Error message: " + e.reason)
 
         jobj = json.loads(response)
 
@@ -146,8 +159,12 @@ def deactivate(token, product_id, key, machine_code, floating = False):
                                                   "Key" : key,\
                                                   "Floating" : floating,\
                                                   "MachineCode":machine_code})
+        except HTTPError as e:
+            response = Response.from_string(e.read())
+        except URLError as e:
+            return (None, "Could not contact the server. Error message: " + e.reason)
         except Exception:
-            return (False, "Could not contact the server.")
+            return (None, "Could not contact the server. Error message: " + e.reason)
 
         jobj = json.loads(response)