librex 0.0.65 → 0.0.66

data/lib/rex/time.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 
 ###
@@ -13,7 +14,7 @@ module ExtTime
 	#
 	def self.sec_to_s(seconds)
 		parts = [ 31536000, 86400, 3600, 60, 1 ].map { |d|
-			if ((c = seconds / d) > 0) 
+			if ((c = seconds / d) > 0)
 				seconds -= c.truncate * d
 				c.truncate
 			else

data/lib/rex/transformer.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 
 ###

data/lib/rex/transformer.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..'))
 
@@ -35,4 +36,4 @@ class Rex::Transformer::UnitTest < Test::Unit::TestCase
 
 		assert_equal('onetwo', a[0], "invalid from_a conversion")
 	end
-end
+end

data/lib/rex/ui.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 #
 # This file includes everything needed to interact with the user interface
 # wrappers of the rex library.
@@ -18,4 +19,4 @@ require 'rex/ui/text/table'
 
 # Ui subscriber
 require 'rex/ui/subscriber'
-require 'rex/ui/interactive'
+require 'rex/ui/interactive'

data/lib/rex/ui/interactive.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module Ui
 
@@ -209,25 +210,25 @@ protected
 	# Interacts between a local stream and a remote ring buffer. This has to use
 	# a secondary thread to prevent the select on the local stream from blocking
 	#
-	def interact_ring(ring)	
+	def interact_ring(ring)
 		begin
-		
+
 		rdr = Rex::ThreadFactory.spawn("RingMonitor", false) do
 			seq = nil
 			while self.interacting
 
 				# Look for any pending data from the remote ring
 				nseq,data = ring.read_data(seq)
-			
+
 				# Update the sequence number if necessary
 				seq = nseq || seq
-			
+
 				# Write output to the local stream if successful
 				user_output.print(data) if data
-				
+
 				# Wait for new data to arrive on this session
 				ring.wait(seq)
-			end	
+			end
 		end
 
 		while self.interacting
@@ -235,18 +236,18 @@ protected
 			# Look for any pending input from the local stream
 			sd = Rex::ThreadSafe.select([ _local_fd ], nil, [_local_fd], 5.0)
 
-			# Write input to the ring's input mechanism			
+			# Write input to the ring's input mechanism
 			if sd
 				data = user_input.gets
 				ring.put(data)
 			end
 		end
-		
+
 		ensure
 			rdr.kill
 		end
 	end
-	
+
 
 	#
 	# Installs a signal handler to monitor suspend signal notifications.

data/lib/rex/ui/output.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/ui'
 
 module Rex

data/lib/rex/ui/output/none.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/ui'
 
 module Rex
@@ -15,4 +16,4 @@ class Output::None < Rex::Ui::Output
 end
 
 end
-end
+end

data/lib/rex/ui/progress_tracker.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module Ui
 
@@ -93,4 +94,4 @@ class ProgressTracker
 end
 
 end
-end
+end

data/lib/rex/ui/subscriber.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module Ui
 
@@ -21,7 +22,7 @@ module Subscriber
 		def print_line(msg='')
 			if (user_output)
 				print_blank_line if user_output.prompting?
-				user_output.print_line(msg) 
+				user_output.print_line(msg)
 			end
 		end
 
@@ -31,7 +32,7 @@ module Subscriber
 		def print_status(msg='')
 			if (user_output)
 				print_blank_line if user_output.prompting?
-				user_output.print_status(msg) 
+				user_output.print_status(msg)
 			end
 		end
 
@@ -41,17 +42,17 @@ module Subscriber
 		def print_error(msg='')
 			if (user_output)
 				print_blank_line if user_output.prompting?
-				user_output.print_error(msg) 
+				user_output.print_error(msg)
 			end
 		end
-		
+
 		#
 		# Wraps user_output.print_good
 		#
 		def print_good(msg='')
 			if (user_output)
 				print_blank_line if user_output.prompting?
-				user_output.print_good(msg) 
+				user_output.print_good(msg)
 			end
 		end
 
@@ -83,10 +84,10 @@ module Subscriber
 		# The user output handle.
 		#
 		attr_accessor :user_output
-	
+
 	protected
 
-		# 
+		#
 		# Prints a blank line.  Used when the input is prompting.
 		#
 		def print_blank_line
@@ -109,7 +110,7 @@ module Subscriber
 		def gets
 			user_input.gets if (user_input)
 		end
-	
+
 		#
 		# The user intput handle.
 		#

data/lib/rex/ui/text/color.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module Ui
 module Text

data/lib/rex/ui/text/color.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 

data/lib/rex/ui/text/dispatcher_shell.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/ui'
 require 'pp'
 
@@ -35,11 +36,23 @@ module DispatcherShell
 		#
 		# Returns nil for an empty set of commands.
 		#
-		# This method should be overridden
+		# This method should be overridden to return a Hash with command
+		# names for keys and brief help text for values.
 		#
 		def commands
 		end
-	
+
+		#
+		# Returns an empty set of commands.
+		#
+		# This method should be overridden if the dispatcher has commands that
+		# should be treated as deprecated. Deprecated commands will not show up in
+		# help and will not tab-complete, but will still be callable.
+		#
+		def deprecated_commands
+			[]
+		end
+
 		#
 		# Wraps shell.print_error
 		#
@@ -75,6 +88,33 @@ module DispatcherShell
 			shell.print(msg)
 		end
 
+		#
+		# Print a warning that the called command is deprecated and optionally
+		# forward to the replacement +method+ (useful for when commands are
+		# renamed).
+		#
+		def deprecated_cmd(method=nil, *args)
+			cmd = caller[0].match(/`cmd_(.*)'/)[1]
+			print_error "The #{cmd} command is DEPRECATED"
+			if cmd == "db_autopwn"
+				print_error "See http://r-7.co/xY65Zr instead"
+			elsif method and self.respond_to?("cmd_#{method}")
+				print_error "Use #{method} instead"
+				self.send("cmd_#{method}", *args)
+			end
+		end
+
+		def deprecated_help(method=nil)
+			cmd = caller[0].match(/`cmd_(.*)_help'/)[1]
+			print_error "The #{cmd} command is DEPRECATED"
+			if cmd == "db_autopwn"
+				print_error "See http://r-7.co/xY65Zr instead"
+			elsif method and self.respond_to?("cmd_#{method}_help")
+				print_error "Use 'help #{method}' instead"
+				self.send("cmd_#{method}_help")
+			end
+		end
+
 		#
 		# Wraps shell.update_prompt
 		#
@@ -157,7 +197,7 @@ module DispatcherShell
 			tbl = Table.new(
 				'Header'  => "#{self.name} Commands",
 				'Indent'  => opts['Indent'] || 4,
-				'Columns' => 
+				'Columns' =>
 					[
 						'Command',
 						'Description'
@@ -193,7 +233,7 @@ module DispatcherShell
 			if matches and matches.length == 1 and File.directory?(matches[0])
 				dir = matches[0]
 				dir += File::SEPARATOR if dir[-1,1] != File::SEPARATOR
-				matches = ::Readline::FILENAME_COMPLETION_PROC.call(dir) 
+				matches = ::Readline::FILENAME_COMPLETION_PROC.call(dir)
 			end
 			matches
 		end
@@ -213,9 +253,9 @@ module DispatcherShell
 
 		# Initialze the dispatcher array
 		self.dispatcher_stack = []
-		
+
 		# Initialize the tab completion array
-		self.tab_words = []		
+		self.tab_words = []
 		self.on_command_proc = nil
 	end
 
@@ -230,34 +270,34 @@ module DispatcherShell
 		# Check trailing whitespace so we can tell 'x' from 'x '
 		str_match = str.match(/\s+$/)
 		str_trail = (str_match.nil?) ? '' : str_match[0]
-		
+
 		# Split the line up by whitespace into words
 		str_words = str.split(/[\s\t\n]+/)
-		
+
 		# Append an empty word if we had trailing whitespace
 		str_words << '' if str_trail.length > 0
-		
+
 		# Place the word list into an instance variable
 		self.tab_words = str_words
-		
+
 		# Pop the last word and pass it to the real method
 		tab_complete_stub(self.tab_words.pop)
 	end
 
-	# Performs tab completion of a command, if supported	
+	# Performs tab completion of a command, if supported
 	# Current words can be found in self.tab_words
 	#
 	def tab_complete_stub(str)
 		items = []
-		
+
 		return nil if not str
-	
+
 		# puts "Words(#{tab_words.join(", ")}) Partial='#{str}'"
-		
+
 		# Next, try to match internal command or value completion
 		# Enumerate each entry in the dispatcher stack
 		dispatcher_stack.each { |dispatcher|
-		
+
 			# If no command is set and it supports commands, add them all
 			if (tab_words.empty? and dispatcher.respond_to?('commands'))
 				items.concat(dispatcher.commands.keys)
@@ -285,15 +325,15 @@ module DispatcherShell
 		rescue RegexpError
 			str = Regexp.escape(str)
 		end
-		
+
 		# XXX - This still doesn't fix some Regexp warnings:
 		# ./lib/rex/ui/text/dispatcher_shell.rb:171: warning: regexp has `]' without escape
 
 		# Match based on the partial word
-		items.find_all { |e| 
+		items.find_all { |e|
 			e =~ /^#{str}/
 		# Prepend the rest of the command (or it gets replaced!)
-		}.map { |e| 
+		}.map { |e|
 			tab_words.dup.push(e).join(' ')
 		}
 	end
@@ -337,12 +377,12 @@ module DispatcherShell
 				next if not dispatcher.respond_to?('commands')
 
 				begin
-					if (dispatcher.commands.has_key?(method))
+					if (dispatcher.commands.has_key?(method) or dispatcher.deprecated_commands.include?(method))
 						self.on_command_proc.call(line.strip) if self.on_command_proc
 						run_command(dispatcher, method, arguments)
 						found = true
 					end
-				rescue 
+				rescue
 					error = $!
 
 					print_error(
@@ -373,7 +413,7 @@ module DispatcherShell
 	#
 	def run_command(dispatcher, method, arguments)
 		self.busy = true
-		
+
 		if(blocked_command?(method))
 			print_error("The #{method} command has been disabled.")
 		else
@@ -440,7 +480,7 @@ module DispatcherShell
 	#
 	# Return a readable version of a help banner for all of the enstacked
 	# dispatchers.
-	# 
+	#
 	# See +CommandDispatcher#help_to_s+
 	#
 	def help_to_s(opts = {})
@@ -477,7 +517,7 @@ module DispatcherShell
 		self.blocked || return
 		self.blocked.delete(cmd)
 	end
-	
+
 
 	attr_accessor :dispatcher_stack # :nodoc:
 	attr_accessor :tab_words # :nodoc:

data/lib/rex/ui/text/input.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/ui'
 
 module Rex

data/lib/rex/ui/text/input/buffer.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/ui'
 
 module Rex
@@ -14,7 +15,7 @@ require 'rex/io/stream_abstraction'
 class Input::Buffer < Rex::Ui::Text::Input
 
 	class BufferSock
-		include Rex::IO::StreamAbstraction	
+		include Rex::IO::StreamAbstraction
 		def write(buf, opts={})
 			syswrite(buf)
 		end
@@ -36,25 +37,25 @@ class Input::Buffer < Rex::Ui::Text::Input
 	def put(msg, opts={})
 		@sock.lsock.write(msg)
 	end
-	
+
 	#
 	# Wait for a line of input to be read from a socket.
 	#
 	def gets
 		# Initialize the line buffer
 		line = ''
-		
+
 		# Read data one byte at a time until we see a LF
 		while (true)
 			break if line.include?("\n")
-			
+
 			# Read another character of input
 			char = @sock.rsock.getc
-			
+
 			# Append this character to the string
 			line << char
 		end
-		
+
 		return line
 	end