librex 0.0.40 → 0.0.41

data/README.markdown

@@ -3,7 +3,7 @@
 A non-official re-packaging of the Rex library as a gem for easy of usage of the Metasploit REX framework in a non Metasploit application. I received permission from HDM to create this package.
 
 Currently based on:
-SVN Revision: 13097
+SVN Revision: 13139
 
 # Credits
 The Metasploit development team <http://www.metasploit.com>

data/lib/rex/post/meterpreter/extensions/stdapi/fs/dir.rb

@@ -96,7 +96,7 @@ class Dir < Rex::Post::Dir
 
 			files <<
 				{
-					'FileName' => file_name.value, 
+					'FileName' => file_name.value,
 					'FilePath' => fpath[idx].value,
 					'StatBuf'  => st,
 				}
@@ -189,7 +189,7 @@ class Dir < Rex::Post::Dir
 	##
 
 	#
-	# Downloads the contents of a remote directory a 
+	# Downloads the contents of a remote directory a
 	# local directory, optionally in a recursive fashion.
 	#
 	def Dir.download(dst, src, recursive = false, force = true, &stat)
@@ -205,7 +205,7 @@ class Dir < Rex::Post::Dir
 
 			if (src_stat.file?)
 				stat.call('downloading', src_item, dst_item) if (stat)
-				begin 
+				begin
 					client.fs.file.download(dst_item, src_item)
 					stat.call('downloaded', src_item, dst_item) if (stat)
 				rescue ::Rex::Post::Meterpreter::RequestError => e
@@ -234,7 +234,7 @@ class Dir < Rex::Post::Dir
 	end
 
 	#
-	# Uploads the contents of a local directory to a remote 
+	# Uploads the contents of a local directory to a remote
 	# directory, optionally in a recursive fashion.
 	#
 	def Dir.upload(dst, src, recursive = false, &stat)
@@ -272,7 +272,7 @@ class Dir < Rex::Post::Dir
 	#
 	# The path of the directory that was opened.
 	#
-	attr_reader   :path 
+	attr_reader   :path
 protected
 	attr_accessor :client # :nodoc:
 	attr_writer   :path # :nodoc:

data/lib/rex/post/meterpreter/extensions/stdapi/fs/file.rb

@@ -23,8 +23,11 @@ module Fs
 ###
 class File < Rex::Post::Meterpreter::Extensions::Stdapi::Fs::IO
 
-SEPARATOR = "\\"
-Separator = "\\"
+	#
+	# This should be replaced with a platform-specific value.
+	#
+	SEPARATOR = "\\"
+	Separator = "\\"
 
 	include Rex::Post::File
 
@@ -68,12 +71,13 @@ Separator = "\\"
 	#
 	def File.basename(*a)
 		path = a[0]
-		sep  = "\\" + File::SEPARATOR
 
-		# I suck at regex.
-		path =~ /(.*)#{sep}(.*)$/
+		# Allow both kinds of dir serparators since lots and lots of code
+		# assumes one or the other so this ends up getting called with strings
+		# like: "C:\\foo/bar"
+		path =~ %r#.*[/\\](.*)$#
 
-		Rex::FileUtils.clean_path($2 || path)
+		Rex::FileUtils.clean_path($1 || path)
 	end
 
 	#
@@ -208,16 +212,16 @@ Separator = "\\"
 	# Download one or more files from the remote computer to the local
 	# directory supplied in destination.
 	#
-	def File.download(destination, *src_files, &stat)
+	def File.download(dest, *src_files, &stat)
 		src_files.each { |src|
-			dest = destination
-
-			stat.call('downloading', src, dest) if (stat)
-
-			if (::File.basename(destination) != File.basename(src))
+			if (::File.basename(dest) != File.basename(src))
+				# The destination when downloading is a local file so use this
+				# system's separator
 				dest += ::File::SEPARATOR + File.basename(src)
 			end
 
+			stat.call('downloading', src, dest) if (stat)
+
 			download_file(dest, src)
 
 			stat.call('downloaded', src, dest) if (stat)
@@ -229,7 +233,9 @@ Separator = "\\"
 	#
 	def File.download_file(dest_file, src_file)
 		src_fd = client.fs.file.new(src_file, "rb")
-		::FileUtils.mkdir_p(::File.dirname(dest_file))
+		dir = ::File.dirname(dest_file)
+		::FileUtils.mkdir_p(dir) if dir and not ::File.directory?(dir)
+
 		dst_fd = ::File.new(dest_file, "wb")
 
 		# Keep transferring until EOF is reached...

data/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/fs.rb

@@ -183,7 +183,7 @@ class Console::CommandDispatcher::Stdapi::Fs
 	alias :cmd_del :cmd_rm
 
 	def cmd_download_help
-		print_line "Usage: download [options] src1 src2 src3 ... destination" 
+		print_line "Usage: download [options] src1 src2 src3 ... destination"
 		print_line
 		print_line "Downloads remote files and directories to the local machine."
 		print_line @@download_opts.usage
@@ -206,23 +206,29 @@ class Console::CommandDispatcher::Stdapi::Fs
 
 		@@download_opts.parse(args) { |opt, idx, val|
 			case opt
-				when "-r"
-					recursive = true
-				when nil
-					if (last)
-						src_items << last
-					end
-
-					last = val
+			when "-r"
+				recursive = true
+			when nil
+				src_items << last if (last)
+				last = val
 			end
 		}
 
-		return true if not last
+		# No files given, nothing to do
+		if not last
+			cmd_download_help
+			return true
+		end
 
 		# Source and destination will be the same
-		src_items << last if src_items.empty?
-
-		dest = last
+		if src_items.empty?
+			src_items << last
+			# Use the basename of the remote filename so we don't end up with
+			# a file named c:\\boot.ini in linux
+			dest = ::Rex::Post::Meterpreter::Extensions::Stdapi::Fs::File.basename(last)
+		else
+			dest = last
+		end
 
 		# Go through each source item and download them
 		src_items.each { |src|
@@ -301,7 +307,7 @@ class Console::CommandDispatcher::Stdapi::Fs
 		path = args[0] || client.fs.dir.getwd
 		tbl  = Rex::Ui::Text::Table.new(
 			'Header'  => "Listing: #{path}",
-			'Columns' => 
+			'Columns' =>
 				[
 					'Mode',
 					'Size',
@@ -315,12 +321,12 @@ class Console::CommandDispatcher::Stdapi::Fs
 		# Enumerate each item...
 		client.fs.dir.entries_with_info(path).sort { |a,b| a['FileName'] <=> b['FileName'] }.each { |p|
 
-			tbl << 
-				[ 
+			tbl <<
+				[
 					p['StatBuf'] ? p['StatBuf'].prettymode : '',
-					p['StatBuf'] ? p['StatBuf'].size       : '', 
-					p['StatBuf'] ? p['StatBuf'].ftype[0,3] : '', 
-					p['StatBuf'] ? p['StatBuf'].mtime      : '', 
+					p['StatBuf'] ? p['StatBuf'].size       : '',
+					p['StatBuf'] ? p['StatBuf'].ftype[0,3] : '',
+					p['StatBuf'] ? p['StatBuf'].mtime      : '',
 					p['FileName'] || 'unknown'
 				]
 
@@ -368,7 +374,7 @@ class Console::CommandDispatcher::Stdapi::Fs
 	#
 	def cmd_rmdir(*args)
 		if (args.length == 0 or args.include?("-h"))
-		 	print_line("Usage: rmdir dir1 dir2 dir3 ...")
+			print_line("Usage: rmdir dir1 dir2 dir3 ...")
 			return true
 		end
 

metadata

@@ -2,7 +2,7 @@
 name: librex
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.40
+  version: 0.0.41
 platform: ruby
 authors: 
 - Metasploit Development Team
@@ -11,11 +11,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-04 00:00:00 -05:00
+date: 2011-07-09 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
-description: Rex provides a variety of classes useful for security testing and exploit development. Based on SVN Revision 13097
+description: Rex provides a variety of classes useful for security testing and exploit development. Based on SVN Revision 13139
 email: 
 - hdm@metasploit.com
 - jacob.hammack@hammackj.com