Land rapid7#7018, unvendor net-ssh

Author: egypt

Gemfile.lock

@@ -18,6 +18,7 @@ PATH
       metasploit_data_models
       metasploit_payloads-mettle
       msgpack
+      net-ssh
       network_interface
       nokogiri
       octokit
@@ -174,6 +175,7 @@ GEM
     multi_json (1.12.1)
     multi_test (0.1.2)
     multipart-post (2.0.0)
+    net-ssh (3.2.0)
     network_interface (0.0.1)
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)

lib/metasploit/framework/login_scanner/ssh.rb

@@ -1,5 +1,6 @@
 require 'net/ssh'
 require 'metasploit/framework/login_scanner/base'
+require 'rex/socket/ssh_factory'
 
 module Metasploit
   module Framework
@@ -47,12 +48,14 @@ class SSH
         # @note The caller *must* close {#ssh_socket}
         def attempt_login(credential)
           self.ssh_socket = nil
+          factory = Rex::Socket::SSHFactory.new(framework,framework_module, proxies)
           opt_hash = {
-            :port          => port,
-            :disable_agent => true,
-            :config        => false,
-            :verbose       => verbosity,
-            :proxies       => proxies
+            :port            => port,
+            :use_agent       => false,
+            :config          => false,
+            :verbose         => verbosity,
+            :proxy           => factory,
+            :non_interactive => true
           }
           case credential.private_type
           when :password, nil

lib/msf/core/exploit/mixins.rb

@@ -42,6 +42,7 @@
 require 'msf/core/exploit/http/client'
 require 'msf/core/exploit/http/server'
 require 'msf/core/exploit/smtp'
+require 'msf/core/exploit/ssh'
 require 'msf/core/exploit/sunrpc'
 require 'msf/core/exploit/mssql'
 require 'msf/core/exploit/mssql_commands'

lib/msf/core/exploit/ssh.rb

@@ -0,0 +1,8 @@
+module Msf
+  module Exploit::Remote::SSH
+
+    def ssh_socket_factory
+      Rex::Socket::SSHFactory.new(framework,self, datastore['Proxies'])
+    end
+  end
+end

lib/msf/core/handler/reverse_tcp_double.rb

@@ -207,7 +207,7 @@ def initialize(framework, inp, out)
       initialize_abstraction
 
       self.lsock.extend(TcpReverseDoubleChannelExt)
-      self.lsock.peerinfo  = @sock_inp.getpeername[1,2].map{|x| x.to_s}.join(":")
+      self.lsock.peerinfo  = @sock_inp.getpeername_as_array[1,2].map{|x| x.to_s}.join(":")
       self.lsock.localinfo = @sock_inp.getsockname[1,2].map{|x| x.to_s}.join(":")
 
       monitor_shell_stdout

lib/msf/core/handler/reverse_tcp_double_ssl.rb

@@ -256,7 +256,7 @@ def initialize(framework, inp, out)
       initialize_abstraction
 
       self.lsock.extend(TcpReverseDoubleSSLChannelExt)
-      self.lsock.peerinfo  = @sock_inp.getpeername[1,2].map{|x| x.to_s}.join(":")
+      self.lsock.peerinfo  = @sock_inp.getpeername_as_array[1,2].map{|x| x.to_s}.join(":")
       self.lsock.localinfo = @sock_inp.getsockname[1,2].map{|x| x.to_s}.join(":")
 
       monitor_shell_stdout