librex 0.0.39 → 0.0.40

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: 13058
+SVN Revision: 13097
 
 # Credits
 The Metasploit development team <http://www.metasploit.com>

data/lib/rex/exploitation/javascriptosdetect.rb

@@ -73,6 +73,7 @@ function getVersion(){
 				case "344":   // opera-9.0-20060616.1-static-qt.i386-en-344
 				case "2091":  // opera-9.52-2091.gcc3-shared-qt3.i386.rpm
 				case "2444":  // opera-9.60.gcc4-shared-qt3.i386.rpm
+				case "6386":  // 10.61
 					os_name = "#{oses::LINUX}";
 					break;
 				case "8502":  // "Opera 9 Eng Setup.exe"
@@ -82,8 +83,12 @@ function getVersion(){
 				case "8801":  // "Opera_9.22_Eng_Setup.exe"
 				case "10108": // "Opera_952_10108_en.exe"
 				case "10467": // "Opera_962_en_Setup.exe"
+				case "3445":  // 10.61
 					os_name = "#{oses::WINDOWS}";
 					break;
+				case "6386":  // 10.61
+					os_name = "#{oses::MAC_OSX}";
+					break;
 				//default:
 				//	document.write(opera.buildNumber('inconspicuous'));
 				//	break;
@@ -133,7 +138,7 @@ function getVersion(){
 			if (platform.match(/x86_64/)) {
 				arch = "#{ARCH_X86_64}";
 			} else if (platform.match(/arm/)) {
-				// Android
+				// Android and maemo
 				arch = "#{ARCH_ARMLE}";
 			}
 		} else if (platform.match(/windows/)) {

data/lib/rex/io/stream_abstraction.rb

@@ -185,7 +185,10 @@ protected
 				end
 
 				if( closed )
-					self.close_write if self.respond_to?('close_write')
+					begin
+						self.close_write if self.respond_to?('close_write')
+					rescue IOError
+					end
 					break
 				end
 			end

data/lib/rex/post/meterpreter/client_core.rb

@@ -311,7 +311,8 @@ class ClientCore < Extension
 	#
 	def shutdown
 		request  = Packet.create_request('core_shutdown')
-		response = self.client.send_packet_wait_response(request, 15)
+		# Don't wait for the response since the server will be dead
+		self.client.send_packet(request)
 		true
 	end
 

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

@@ -90,6 +90,47 @@ Separator = "\\"
 		return response.get_tlv_value(TLV_TYPE_FILE_PATH)
 	end
 
+
+	#
+	# Calculates the MD5 (16-bytes raw) of a remote file
+	#
+	def File.md5(path)
+		request = Packet.create_request('stdapi_fs_md5')
+
+		request.add_tlv(TLV_TYPE_FILE_PATH, path)
+
+		response = client.send_request(request)
+
+		return response.get_tlv_value(TLV_TYPE_FILE_NAME)
+	end
+
+	#
+	# Calculates the SHA1 (20-bytes raw) of a remote file
+	#
+	def File.sha1(path)
+		request = Packet.create_request('stdapi_fs_sha1')
+
+		request.add_tlv(TLV_TYPE_FILE_PATH, path)
+
+		response = client.send_request(request)
+
+		return response.get_tlv_value(TLV_TYPE_FILE_NAME)
+	end
+
+	#
+	# Expands a file path, substituting all environment variables, such as
+	# %TEMP%.
+	#
+	def File.expand_path(path)
+		request = Packet.create_request('stdapi_fs_file_expand_path')
+
+		request.add_tlv(TLV_TYPE_FILE_PATH, path)
+
+		response = client.send_request(request)
+
+		return response.get_tlv_value(TLV_TYPE_FILE_PATH)
+	end
+
 	#
 	# Performs a stat on a file and returns a FileStat instance.
 	#

data/lib/rex/post/meterpreter/extensions/stdapi/sys/registry.rb

@@ -39,6 +39,26 @@ class Registry
 	# the supplied permissions.  Right now this is merely a wrapper around
 	# create_key.
 	#
+
+	def Registry.load_key(root_key,base_key,hive_file)
+		request = Packet.create_request('stdapi_registry_load_key')
+		request.add_tlv(TLV_TYPE_ROOT_KEY, root_key)
+		request.add_tlv(TLV_TYPE_BASE_KEY, base_key)
+		request.add_tlv(TLV_TYPE_FILE_PATH,hive_file)
+		
+		response = client.send_request(request)
+		return response.get_tlv(TLV_TYPE_RESULT).value
+	end
+
+	def Registry.unload_key(root_key,base_key)
+		request = Packet.create_request('stdapi_registry_unload_key')
+		request.add_tlv(TLV_TYPE_ROOT_KEY, root_key)
+		request.add_tlv(TLV_TYPE_BASE_KEY, base_key)
+		response = client.send_request(request)
+		return response.get_tlv(TLV_TYPE_RESULT).value
+	end
+
+
 	def Registry.open_key(root_key, base_key, perm = KEY_READ)
 		# If no base key was provided, just return the root_key.
 		if (base_key == nil or base_key.length == 0)

data/lib/rex/text.rb

@@ -704,6 +704,30 @@ module Text
 		Digest::MD5.hexdigest(str)
 	end
 
+	#
+	# Convert hex-encoded characters to literals.
+	# Example: "AA\\x42CC" becomes "AABCC"
+	#
+	def self.dehex(str)
+		return str unless str.respond_to? :match
+		return str unless str.respond_to? :gsub
+		regex = /\x5cx[0-9a-f]{2}/mi
+		if str.match(regex)
+			str.gsub(regex) { |x| x[2,2].to_i(16).chr }
+		else
+			str
+		end
+	end
+
+	#
+	# Convert and replace hex-encoded characters to literals.
+	#
+	def self.dehex!(str)
+		return str unless str.respond_to? :match
+		return str unless str.respond_to? :gsub
+		regex = /\x5cx[0-9a-f]{2}/mi
+		str.gsub!(regex) { |x| x[2,2].to_i(16).chr }
+	end
 
 	##
 	#

metadata

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