Merge pull request #36 from LedgerHQ/codeql-fixes

Fix defects found by CodeQL

ledgerwallet/transport/device.py

@@ -17,11 +17,11 @@ def write(self, data: bytes):
         raise NotImplementedError
 
     @abstractmethod
-    def read(self) -> bytes:
+    def read(self, timeout: int = 0) -> bytes:
         raise NotImplementedError
 
     @abstractmethod
-    def exchange(self, data: bytes) -> bytes:
+    def exchange(self, data: bytes, timeout: int = 0) -> bytes:
         raise NotImplementedError
 
     @abstractmethod

ledgerwallet/transport/hid.py

@@ -1,8 +1,4 @@
-import os
-if os.getenv("LEDGERWALLET_HIDRAW", "").lower() in ["1", "true"]:
-    import hidraw as hid
-else:
-    import hid
+import hid
 
 from .device import Device
 
@@ -72,14 +68,11 @@ def read(self, timeout: int = 1000) -> bytes:
 
     def exchange(self, data: bytes, timeout: int = 1000):
         self.write(data)
-        return self.read(timeout)
+        return self.read(timeout=timeout)
 
     def close(self):
         if self.opened:
-            try:
-                self.device.close()
-            except:
-                pass
+            self.device.close()
         self.opened = False
 
 

ledgerwallet/transport/tcp.py

@@ -36,11 +36,11 @@ def write(self, data: bytes):
         data_to_send = int.to_bytes(len(data), 4, "big") + data
         self.socket.send(data_to_send)
 
-    def read(self) -> bytes:
+    def read(self, timeout: int = 0) -> bytes:
         packet_len = int.from_bytes(self.socket.recv(4), "big")
         return self.socket.recv(packet_len + 2)
 
-    def exchange(self, data: bytes):
+    def exchange(self, data: bytes, timeout: int = 0):
         self.write(data)
         return self.read()
 

setup.py

@@ -5,16 +5,16 @@
 
 def read(rel_path):
     here = path.abspath(path.dirname(__file__))
-    with codecs.open(path.join(here, rel_path), 'r') as fp:
+    with codecs.open(path.join(here, rel_path), "r") as fp:
         return fp.read()
 
+
 def get_version(rel_path):
     for line in read(rel_path).splitlines():
-        if line.startswith('__version__'):
-            delim = '"' if '"' in line else "'"
-            return line.split(delim)[1]
-    else:
-        raise RuntimeError("Unable to find version string.")
+        if line.startswith("__version__"):
+            delimiter = '"' if '"' in line else "'"
+            return line.split(delimiter)[1]
+    raise RuntimeError("Unable to find version string.")
 
 
 this_dir = path.abspath(path.dirname(__file__))

tests/unit/test_params.py

@@ -40,7 +40,7 @@ def test_parse(self):
             self.assertEquals(Bip32Path.parse(v), k)
 
     def test_parse_empty(self):
-        # not in sample as not the parse/build behavior is not symetrical
+        # not in sample as not the parse/build behavior is not symmetrical
         self.assertEqual(Bip32Path.parse(bytes.fromhex("00")), str())
 
     def test_build(self):