Land rapid7#19731, new feature for recognizing broken SMB session and…

… managing them

lib/msf/base/sessions/smb.rb

@@ -23,7 +23,7 @@ class Msf::Sessions::SMB
   # @option opts [RubySMB::Client] :client
   def initialize(rstream, opts = {})
     @client = opts.fetch(:client)
-    @simple_client = ::Rex::Proto::SMB::SimpleClient.new(client.dispatcher.tcp_socket, client: client)
+    @simple_client = ::Rex::Proto::SMB::SimpleClient.new(client.dispatcher.tcp_socket, client: client, msf_session: self)
     self.console = Rex::Post::SMB::Ui::Console.new(self)
     super(rstream, opts)
   end
@@ -53,6 +53,13 @@ def process_autoruns(datastore)
     end
   end
 
+  def verify_connectivity
+    @client.dispatcher.tcp_socket.peerinfo
+  rescue Errno::ENOTCONN
+    self.kill
+    raise
+  end
+
   def type
     self.class.type
   end
@@ -140,5 +147,4 @@ def _interact_stream
     # the EOFError so we can drop this handle like a bad habit.
     raise EOFError if (console.stopped? == true)
   end
-
 end