Land rapid7#7246 Rex::Socket Gemification

MS-1715

Author: dmohanty-r7

Gemfile.lock

@@ -35,12 +35,14 @@ PATH
       redcarpet
       rex-arch
       rex-bin_tools
+      rex-core
       rex-java
       rex-mime
       rex-ole
       rex-powershell
       rex-random_identifier
       rex-registry
+      rex-socket
       rex-struct2
       rex-text
       rex-zip
@@ -85,7 +87,7 @@ GEM
     arel (6.0.3)
     arel-helpers (2.3.0)
       activerecord (>= 3.1.0, < 6)
-    aruba (0.14.1)
+    aruba (0.14.2)
       childprocess (~> 0.5.6)
       contracts (~> 0.9)
       cucumber (>= 1.3.19)
@@ -95,7 +97,7 @@ GEM
     bcrypt (3.1.11)
     bit-struct (0.15.0)
     builder (3.2.2)
-    capybara (2.7.1)
+    capybara (2.8.1)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -237,7 +239,7 @@ GEM
       rex-core
       rex-struct2
       rex-text
-    rex-core (0.1.1)
+    rex-core (0.1.2)
     rex-java (0.1.2)
     rex-mime (0.1.1)
       rex-text
@@ -249,6 +251,8 @@ GEM
     rex-random_identifier (0.1.0)
       rex-text
     rex-registry (0.1.0)
+    rex-socket (0.1.0)
+      rex-core
     rex-struct2 (0.1.0)
     rex-text (0.2.1)
     rex-zip (0.1.0)
@@ -263,7 +267,7 @@ GEM
     rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
-    rspec-rails (3.5.1)
+    rspec-rails (3.5.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)

lib/msf/core/handler/reverse_http.rb

@@ -3,7 +3,7 @@
 require 'rex/sync/ref'
 require 'rex/payloads/meterpreter/uri_checksum'
 require 'rex/post/meterpreter'
-require 'rex/parser/x509_certificate'
+require 'rex/socket/x509_certificate'
 require 'msf/core/payload/windows/verify_ssl'
 require 'rex/user_agent'
 

lib/msf/core/payload/windows/verify_ssl.rb

@@ -1,7 +1,7 @@
 # -*- coding: binary -*-
 
 require 'msf/core'
-require 'rex/parser/x509_certificate'
+require 'rex/socket/x509_certificate'
 
 module Msf
 
@@ -25,7 +25,7 @@ def get_ssl_cert_hash(verify_cert, handler_cert)
       raise ArgumentError, "Verifying SSL cert is enabled but no handler cert is configured"
     end
 
-    hash = Rex::Parser::X509Certificate.get_cert_file_hash(handler_cert)
+    hash = Rex::Socket::X509Certificate.get_cert_file_hash(handler_cert)
     print_status("Meterpreter will verify SSL Certificate with SHA1 hash #{hash.unpack("H*").first}")
     hash
   end

lib/msf/ui/web/comm.rb

@@ -1,4 +1,5 @@
 # -*- coding: binary -*-
+require 'rex/ui/text/bidirectional_pipe'
 module Msf
 module Ui
 module Web
@@ -83,7 +84,7 @@ def self.create_session_channel(session_id)
   end
 
   def self.create_session_pipe(session)
-    pipe = Rex::IO::BidirectionalPipe.new
+    pipe = Rex::Ui::BidirectionalPipe.new
 
     @session_pipes[session.id] = pipe
 

lib/msf/ui/web/console.rb

@@ -1,4 +1,5 @@
 # -*- coding: binary -*-
+require 'rex/ui/text/bidirectional_pipe'
 module Msf
 module Ui
 module Web
@@ -18,7 +19,7 @@ class WebConsole
   attr_accessor :thread
 
   # Wrapper class in case we need to extend the pipe
-  class WebConsolePipe < Rex::IO::BidirectionalPipe
+  class WebConsolePipe < Rex::Ui::Text::BidirectionalPipe
     def prompting?
       false
     end

lib/msf/ui/web/driver.rb

@@ -8,7 +8,7 @@ module Msf
 module Ui
 module Web
 
-require 'rex/io/bidirectional_pipe'
+require 'rex/ui/text/bidirectional_pipe'
 require 'msf/ui/web/console'