Allow non-numeric ports with remote()

Author: Arusekk

pwnlib/tubes/listen.py

@@ -78,15 +78,13 @@ def __init__(self, port=0, bindaddr='::',
                  fam='any', typ='tcp', *args, **kwargs):
         super(listen, self).__init__(*args, **kwargs)
 
-        port = int(port)
-
         fam = self._get_family(fam)
         typ = self._get_type(typ)
 
         if fam == socket.AF_INET and bindaddr == '::':
             bindaddr = '0.0.0.0'
 
-        h = self.waitfor('Trying to bind to %s on port %d' % (bindaddr, port))
+        h = self.waitfor('Trying to bind to %s on port %s' % (bindaddr, port))
 
         for res in socket.getaddrinfo(bindaddr, port, fam, typ, 0, socket.AI_PASSIVE):
             self.family, self.type, self.proto, self.canonname, self.sockaddr = res
@@ -109,7 +107,7 @@ def __init__(self, port=0, bindaddr='::',
             break
         else:
             h.failure()
-            self.error("Could not bind to %s on port %d" % (bindaddr, port))
+            self.error("Could not bind to %s on port %s" % (bindaddr, port))
 
         h.success()
 

pwnlib/tubes/remote.py

@@ -61,7 +61,7 @@ def __init__(self, host, port,
                  *args, **kwargs):
         super(remote, self).__init__(*args, **kwargs)
 
-        self.rport  = int(port)
+        self.rport  = port
         self.rhost  = host
 
         if sock:
@@ -99,7 +99,7 @@ def _connect(self, fam, typ):
         sock    = None
         timeout = self.timeout
 
-        with self.waitfor('Opening connection to %s on port %d' % (self.rhost, self.rport)) as h:
+        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):
                 self.family, self.type, self.proto, _canonname, sockaddr = res
 
@@ -123,7 +123,7 @@ def _connect(self, fam, typ):
                     raise
                 except socket.error:
                     pass
-            self.error("Could not connect to %s on port %d", self.rhost, self.rport)
+            self.error("Could not connect to %s on port %s", self.rhost, self.rport)
 
     @classmethod
     def fromsocket(cls, socket):

pwnlib/tubes/sock.py

@@ -175,7 +175,7 @@ def close(self):
         self._close_msg()
 
     def _close_msg(self):
-        self.info('Closed connection to %s port %d', self.rhost, self.rport)
+        self.info('Closed connection to %s port %s', self.rhost, self.rport)
 
     def fileno(self):
         if not self.sock: