deps: make socks and serial optional

pwn/toplevel.py

@@ -6,7 +6,6 @@
 import os
 import platform
 import re
-import socks
 import signal
 import string
 import struct
@@ -84,12 +83,18 @@
 debug   = log.debug
 success = log.success
 
+# optional deps
 try:
     import colored_traceback
 except ImportError:
     pass
 else:
     colored_traceback.add_hook()
 
+try:
+    import socks
+except ImportError:
+    pass
+
 # Equivalence with the default behavior of "from import *"
 # __all__ = [x for x in tuple(globals()) if not x.startswith('_')]

pwnlib/context/__init__.py

@@ -23,8 +23,6 @@
 import threading
 import time
 
-import socks
-
 from pwnlib.config import register_config
 from pwnlib.device import Device
 from pwnlib.timeout import Timeout
@@ -1191,6 +1189,8 @@ def proxy(self, proxy):
             socket.socket = _original_socket
             return None
 
+        import socks  # keep dependency optional
+
         if isinstance(proxy, str):
             proxy = (socks.SOCKS5, proxy)
 

pwnlib/protocols/adb/__init__.py

@@ -23,7 +23,6 @@
 from pwnlib.util.lists import group
 from pwnlib.util.misc import size
 from pwnlib.util.packing import p32
-from pwnlib.util.proc import pidof
 from pwnlib.util.sh_string import sh_string
 
 log = getLogger(__name__)

pwnlib/tubes/remote.py

@@ -2,7 +2,6 @@
 from __future__ import division
 
 import socket
-import socks
 
 from pwnlib.log import getLogger
 from pwnlib.timeout import Timeout
@@ -97,11 +96,12 @@ def __init__(self, host, port,
                 self.sock = ssl_context.wrap_socket(self.sock,**ssl_args)
 
     def _connect(self, fam, typ):
-        sock    = None
+        err = None
+        sock = None
         timeout = self.timeout
 
         with self.waitfor('Opening connection to %s on port %s' % (self.rhost, self.rport)) as h:
-            for res in socket.getaddrinfo(self.rhost, self.rport, fam, typ, 0, socket.AI_PASSIVE):
+            for res in socket.getaddrinfo(self.rhost, self.rport, fam, typ):
                 self.family, self.type, self.proto, _canonname, sockaddr = res
 
                 if self.type not in [socket.SOCK_STREAM, socket.SOCK_DGRAM]:
@@ -119,11 +119,12 @@ def _connect(self, fam, typ):
 
                 try:
                     sock.connect(sockaddr)
+                    err = None  # break ref cycle
                     return sock
-                except socks.ProxyError:
-                    raise
-                except socket.error:
-                    pass
+                except IOError as e:
+                    err = e
+            if err is not None:
+                raise err
             self.error("Could not connect to %s on port %s", self.rhost, self.rport)
 
     @classmethod

pwnlib/tubes/serialtube.py

@@ -6,8 +6,6 @@
 import sys
 import time
 
-import serial
-
 from pwnlib.log import getLogger
 from pwnlib.tubes import tube
 
@@ -30,6 +28,9 @@ def __init__(
         self.convert_newlines = convert_newlines
         # serial.Serial might throw an exception, which must be handled
         # and propagated accordingly using self.exception
+
+        import serial
+
         try:
             self.conn = serial.Serial(
                 port = port,