Allowing tubes buffer size to be variable defaulted

pwnlib/tubes/process.py

@@ -138,8 +138,9 @@ def __init__(self, argv,
                  stdout = PTY,
                  stderr = STDOUT,
                  close_fds = True,
-                 preexec_fn = lambda: None):
-        super(process, self).__init__(timeout)
+                 preexec_fn = lambda: None,
+                 bufSize = 4096):
+        super(process, self).__init__(timeout,bufSize = bufSize)
 
         if not shell:
             executable, argv, env = self._validate(cwd, executable, argv, env)

pwnlib/tubes/remote.py

@@ -45,8 +45,8 @@ class remote(sock):
 
     def __init__(self, host, port,
                  fam = "any", typ = "tcp",
-                 timeout = Timeout.default, ssl=False, sock=None):
-        super(remote, self).__init__(timeout)
+                 timeout = Timeout.default, ssl=False, sock=None, bufSize = 4096):
+        super(remote, self).__init__(timeout, bufSize = bufSize)
 
         self.rport  = int(port)
         self.rhost  = host

pwnlib/tubes/sock.py

@@ -10,8 +10,8 @@
 class sock(tube):
     """Methods available exclusively to sockets."""
 
-    def __init__(self, timeout):
-        super(sock, self).__init__(timeout)
+    def __init__(self, timeout, bufSize = 4096):
+        super(sock, self).__init__(timeout, bufSize = bufSize)
         self.closed = {"recv": False, "send": False}
 
     # Overwritten for better usability

pwnlib/tubes/tube.py

@@ -33,13 +33,14 @@ class tube(Timeout):
     #: and related functions.
     newline = '\n'
 
-    def __init__(self, timeout = default):
+    def __init__(self, timeout = default, bufSize = 4096):
         super(tube, self).__init__(timeout)
         self.buffer          = Buffer()
+        self.bufSize         = bufSize
         atexit.register(self.close)
 
     # Functions based on functions from subclasses
-    def recv(self, numb = 4096, timeout = default):
+    def recv(self, numb = None, timeout = default):
         r"""recv(numb = 4096, timeout = default) -> str
 
         Receives up to `numb` bytes of data from the tube, and returns
@@ -70,6 +71,7 @@ def recv(self, numb = 4096, timeout = default):
             [...] Received 0xc bytes:
                 'Hello, world'
         """
+        numb = self.bufSize if numb is None else numb
         return self._recv(numb, timeout) or ''
 
     def unrecv(self, data):
@@ -120,7 +122,7 @@ def _fillbuffer(self, timeout = default):
         data = ''
 
         with self.local(timeout):
-            data = self.recv_raw(4096)
+            data = self.recv_raw(self.bufSize)
 
         if data and dumplog.isEnabledFor(logging.DEBUG):
             dumplog.debug('Received %#x bytes:' % len(data))
@@ -139,13 +141,14 @@ def _fillbuffer(self, timeout = default):
         return data
 
 
-    def _recv(self, numb = 4096, timeout = default):
+    def _recv(self, numb = None, timeout = default):
         """_recv(numb = 4096, timeout = default) -> str
 
         Receives one chunk of from the internal buffer or from the OS if the
         buffer is empty.
         """
         data = ''
+        numb = self.bufSize if numb is None else numb
 
         # No buffered data, could not put anything in the buffer
         # before timeout.