librex 0.0.65 → 0.0.66

data/lib/rex/post/meterpreter/extensions/incognito/tlv.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module Post
 module Meterpreter
@@ -18,4 +19,4 @@ end
 end
 end
 end
-end
+end

data/lib/rex/post/meterpreter/extensions/lanattacks/lanattacks.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/post/meterpreter/extensions/lanattacks/tlv'
 

data/lib/rex/post/meterpreter/extensions/lanattacks/tlv.rb

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

data/lib/rex/post/meterpreter/extensions/networkpug/networkpug.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/post/meterpreter/extensions/networkpug/tlv'
 
@@ -18,7 +19,7 @@ class NetworkPug < Extension
 
 		client.register_extension_aliases(
 			[
-				{ 
+				{
 					'name' => 'networkpug',
 					'ext'  => self
 				},
@@ -33,7 +34,7 @@ class NetworkPug < Extension
 
 		channel = nil
 		channel_id = response.get_tlv_value(TLV_TYPE_CHANNEL_ID)
-		
+
 		if(channel_id)
 			channel = Rex::Post::Meterpreter::Channels::Pools::StreamPool.new(
 				client,
@@ -42,16 +43,16 @@ class NetworkPug < Extension
 				CHANNEL_FLAG_SYNCHRONOUS
 			)
 		end
-		
+
 		return response, channel
 	end
-	
+
 	def networkpug_stop(interface)
 		request = Packet.create_request('networkpug_stop')
 		request.add_tlv(TLV_TYPE_NETWORKPUG_INTERFACE, interface)
-		response = client.send_request(request)	
+		response = client.send_request(request)
 	end
-		
+
 end
 
 end; end; end; end; end

data/lib/rex/post/meterpreter/extensions/networkpug/tlv.rb

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

data/lib/rex/post/meterpreter/extensions/priv/fs.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 module Rex
 module Post
@@ -115,4 +116,4 @@ protected
 
 end
 
-end; end; end; end; end
+end; end; end; end; end

data/lib/rex/post/meterpreter/extensions/priv/passwd.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 module Rex
 module Post
@@ -58,4 +59,4 @@ protected
 
 end
 
-end; end; end; end; end
+end; end; end; end; end

data/lib/rex/post/meterpreter/extensions/priv/priv.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/post/meterpreter/extensions/priv/tlv'
 require 'rex/post/meterpreter/extensions/priv/passwd'

data/lib/rex/post/meterpreter/extensions/priv/tlv.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module Post
 module Meterpreter
@@ -25,4 +26,4 @@ end
 end
 end
 end
-end
+end

data/lib/rex/post/meterpreter/extensions/sniffer/sniffer.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/post/meterpreter/extensions/sniffer/tlv'
 require 'rex/proto/smb/utils'
@@ -22,7 +23,7 @@ class Sniffer < Extension
 
 		client.register_extension_aliases(
 			[
-				{ 
+				{
 					'name' => 'sniffer',
 					'ext'  => self
 				},
@@ -42,26 +43,30 @@ class Sniffer < Extension
 			ikeys = %W{idx name description type mtu wireless usable dhcp}
 			ikeys.each_index { |i| iface[ikeys[i]] = vals[i] }
 			ifaces << iface
-		}		
+		}
 		return ifaces
 	end
-	
+
 	# Start a packet capture on an opened interface
 	def capture_start(intf,maxp=200000,filter="")
 		request = Packet.create_request('sniffer_capture_start')
 		request.add_tlv(TLV_TYPE_SNIFFER_INTERFACE_ID, intf.to_i)
 		request.add_tlv(TLV_TYPE_SNIFFER_PACKET_COUNT, maxp.to_i)
 		request.add_tlv(TLV_TYPE_SNIFFER_ADDITIONAL_FILTER, filter) if filter.length > 0
-		response = client.send_request(request)	
+		response = client.send_request(request)
 	end
-	
+
 	# Stop an active packet capture
 	def capture_stop(intf)
 		request = Packet.create_request('sniffer_capture_stop')
 		request.add_tlv(TLV_TYPE_SNIFFER_INTERFACE_ID, intf.to_i)
-		response = client.send_request(request)	
+		response = client.send_request(request)
+		{
+			:packets => response.get_tlv_value(TLV_TYPE_SNIFFER_PACKET_COUNT),
+			:bytes   => response.get_tlv_value(TLV_TYPE_SNIFFER_BYTE_COUNT),
+		}
 	end
-	
+
 	# Retrieve stats about a current capture
 	def capture_stats(intf)
 		request = Packet.create_request('sniffer_capture_stats')
@@ -72,7 +77,18 @@ class Sniffer < Extension
 			:bytes   => response.get_tlv_value(TLV_TYPE_SNIFFER_BYTE_COUNT),
 		}
 	end
-	
+
+	# Release packets from a current capture
+	def capture_release(intf)
+		request = Packet.create_request('sniffer_capture_release')
+		request.add_tlv(TLV_TYPE_SNIFFER_INTERFACE_ID, intf.to_i)
+		response = client.send_request(request)
+		{
+			:packets => response.get_tlv_value(TLV_TYPE_SNIFFER_PACKET_COUNT),
+			:bytes   => response.get_tlv_value(TLV_TYPE_SNIFFER_BYTE_COUNT),
+		}
+	end
+
 	# Buffer the current capture to a readable buffer
 	def capture_dump(intf)
 		request = Packet.create_request('sniffer_capture_dump')
@@ -81,21 +97,22 @@ class Sniffer < Extension
 		{
 			:packets => response.get_tlv_value(TLV_TYPE_SNIFFER_PACKET_COUNT),
 			:bytes   => response.get_tlv_value(TLV_TYPE_SNIFFER_BYTE_COUNT),
+			:linktype => response.get_tlv_value(TLV_TYPE_SNIFFER_INTERFACE_ID) || 1,
 		}
 	end
-	
+
 	# Retrieve the packet data for the specified capture
 	def capture_dump_read(intf, len=16384)
 		request = Packet.create_request('sniffer_capture_dump_read')
 		request.add_tlv(TLV_TYPE_SNIFFER_INTERFACE_ID, intf.to_i)
-		request.add_tlv(TLV_TYPE_SNIFFER_BYTE_COUNT, len.to_i)		
+		request.add_tlv(TLV_TYPE_SNIFFER_BYTE_COUNT, len.to_i)
 		response = client.send_request(request, 3600)
 		{
 			:bytes   => response.get_tlv_value(TLV_TYPE_SNIFFER_BYTE_COUNT),
 			:data    => response.get_tlv_value(TLV_TYPE_SNIFFER_PACKET)
 		}
 	end
-		
+
 end
 
 end; end; end; end; end

data/lib/rex/post/meterpreter/extensions/sniffer/tlv.rb

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

data/lib/rex/post/meterpreter/extensions/stdapi/constants.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 ###
 #
@@ -6,7 +7,7 @@
 # --------------------------
 #
 # These are put into the global namespace for now
-# so that they can be referenced globally.  
+# so that they can be referenced globally.
 #
 ###
 
@@ -81,13 +82,13 @@ KEY_NOTIFY               = 0x00000010
 KEY_CREATE_LINK          = 0x00000020
 KEY_WOW64_64KEY          = 0x00000100
 KEY_WOW64_32KEY          = 0x00000200
-KEY_READ                 = (STANDARD_RIGHTS_READ | KEY_QUERY_VALUE | 
+KEY_READ                 = (STANDARD_RIGHTS_READ | KEY_QUERY_VALUE |
                             KEY_ENUMERATE_SUB_KEYS | KEY_NOTIFY) & ~SYNCHRONIZE
-KEY_WRITE                = (STANDARD_RIGHTS_WRITE | KEY_SET_VALUE | 
+KEY_WRITE                = (STANDARD_RIGHTS_WRITE | KEY_SET_VALUE |
                             KEY_CREATE_SUB_KEY) & ~SYNCHRONIZE
 KEY_EXECUTE              = KEY_READ
 KEY_ALL_ACCESS           = (STANDARD_RIGHTS_ALL | KEY_QUERY_VALUE |
-                            KEY_SET_VALUE | KEY_CREATE_SUB_KEY | 
+                            KEY_SET_VALUE | KEY_CREATE_SUB_KEY |
                             KEY_ENUMERATE_SUB_KEYS | KEY_NOTIFY |
                             KEY_CREATE_LINK) & ~SYNCHRONIZE
 
@@ -143,7 +144,7 @@ THREAD_SUSPEND_RESUME       = 0x00000002
 THREAD_GET_CONTEXT          = 0x00000008
 THREAD_SET_CONTEXT          = 0x00000010
 THREAD_SET_INFORMATION      = 0x00000020
-THREAD_QUERY_INFORMATION    = 0x00000040  
+THREAD_QUERY_INFORMATION    = 0x00000040
 THREAD_SET_THREAD_TOKEN     = 0x00000080
 THREAD_IMPERSONATE          = 0x00000100
 THREAD_DIRECT_IMPERSONATION = 0x00000200

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/post/dir'
 require 'rex/post/meterpreter/extensions/stdapi/stdapi'

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/post/file'
 require 'rex/post/meterpreter/channel'
@@ -298,14 +299,14 @@ class File < Rex::Post::Meterpreter::Extensions::Stdapi::Fs::IO
 	#
 	# Synonym for sysseek.
 	#
-	def seek(offset, whence = SEEK_SET)
+	def seek(offset, whence = ::IO::SEEK_SET)
 		return self.sysseek(offset, whence)
 	end
 
 	#
 	# Seeks to the supplied offset based on the supplied relativity.
 	#
-	def sysseek(offset, whence = SEEK_SET)
+	def sysseek(offset, whence = ::IO::SEEK_SET)
 		return self.filed.seek(offset, whence)
 	end
 

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/post/file_stat'
 require 'rex/post/meterpreter/extensions/stdapi/stdapi'

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/post/io'
 
@@ -45,4 +46,4 @@ class IO < Rex::Post::IO
 
 end
 
-end; end; end; end; end; end
+end; end; end; end; end; end

data/lib/rex/post/meterpreter/extensions/stdapi/net/config.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/post/meterpreter/extensions/stdapi/tlv'
 require 'rex/post/meterpreter/extensions/stdapi/net/route'
@@ -58,11 +59,41 @@ class Config
 		response = client.send_request(request)
 
 		response.each(TLV_TYPE_NETWORK_INTERFACE) { |iface|
+			addrs = []
+			netmasks = []
+			scopes = []
+			while (a = iface.get_tlv_value(TLV_TYPE_IP, addrs.length))
+				# Netmasks aren't tightly associated with addresses, they're
+				# just thrown all together in the interface TLV ordered to
+				# match up. This could be done better by creating another
+				# GroupTlv type for addresses containing an address, a netmask,
+				# and possibly a scope.
+				n = iface.get_tlv_value(TLV_TYPE_NETMASK, addrs.length)
+				if (n.nil?)
+					# Some systems can't report a netmask, only a network
+					# prefix, so figure out the netmask from that.
+					n = iface.get_tlv_value(TLV_TYPE_IP_PREFIX, addrs.length)
+					if n
+						n = Rex::Socket.bit2netmask(n, !!(a.length == 16))
+					end
+				else
+					n = Rex::Socket.addr_ntoa(n)
+				end
+				s = iface.get_tlv_value(TLV_TYPE_IP6_SCOPE, addrs.length)
+				scopes[addrs.length] = s if s
+				netmasks[addrs.length] = n if n
+				addrs << Rex::Socket.addr_ntoa(a)
+			end
 			ifaces << Interface.new(
-					iface.get_tlv_value(TLV_TYPE_IP),
-					iface.get_tlv_value(TLV_TYPE_NETMASK),
-					iface.get_tlv_value(TLV_TYPE_MAC_ADDRESS),
-					iface.get_tlv_value(TLV_TYPE_MAC_NAME))
+					:index    => iface.get_tlv_value(TLV_TYPE_INTERFACE_INDEX),
+					:mac_addr => iface.get_tlv_value(TLV_TYPE_MAC_ADDRESS),
+					:mac_name => iface.get_tlv_value(TLV_TYPE_MAC_NAME),
+					:mtu      => iface.get_tlv_value(TLV_TYPE_INTERFACE_MTU),
+					:flags    => iface.get_tlv_value(TLV_TYPE_INTERFACE_FLAGS),
+					:addrs    => addrs,
+					:netmasks => netmasks,
+					:scopes   => scopes
+				)
 		}
 
 		return ifaces
@@ -93,11 +124,14 @@ class Config
 		response = client.send_request(request)
 
 		# Build out the array of routes
+		# Note: This will include both IPv4 and IPv6 routes
 		response.each(TLV_TYPE_NETWORK_ROUTE) { |route|
 			routes << Route.new(
 					route.get_tlv_value(TLV_TYPE_SUBNET),
 					route.get_tlv_value(TLV_TYPE_NETMASK),
-					route.get_tlv_value(TLV_TYPE_GATEWAY))
+					route.get_tlv_value(TLV_TYPE_GATEWAY),
+					route.get_tlv_value(TLV_TYPE_STRING),
+					route.get_tlv_value(TLV_TYPE_ROUTE_METRIC))
 		}
 
 		return routes

data/lib/rex/post/meterpreter/extensions/stdapi/net/interface.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'ipaddr'
 
@@ -27,11 +28,15 @@ class Interface
 	# Returns a logical interface and initializes it to the supplied
 	# parameters.
 	#
-	def initialize(ip, netmask, mac_addr, mac_name)
-		self.ip       = IPAddr.ntop(ip)
-		self.netmask  = IPAddr.ntop(netmask)
-		self.mac_addr = mac_addr
-		self.mac_name = mac_name
+	def initialize(opts={})
+		self.index    = opts[:index] || -1
+		self.mac_addr = opts[:mac_addr]
+		self.mac_name = opts[:mac_name]
+		self.mtu      = opts[:mtu]
+		self.flags    = opts[:flags]
+		self.addrs    = opts[:addrs]
+		self.netmasks = opts[:netmasks]
+		self.scopes   = opts[:scopes]
 	end
 
 	#
@@ -41,24 +46,61 @@ class Interface
 		macocts = []
 		mac_addr.each_byte { |o| macocts << o }
 		macocts += [0] * (6 - macocts.size) if macocts.size < 6
-		return sprintf(
-				"#{mac_name}\n" +
-				"Hardware MAC: %02x:%02x:%02x:%02x:%02x:%02x\n" +
-				"IP Address  : %s\n" +
-				"Netmask     : %s\n" +
-				"\n",
-				macocts[0], macocts[1], macocts[2], macocts[3],
-				macocts[4], macocts[5], ip, netmask)
+
+		info = [
+			["Name"         , mac_name  ],
+			["Hardware MAC" , sprintf("%02x:%02x:%02x:%02x:%02x:%02x",
+				macocts[0], macocts[1], macocts[2],
+				macocts[3], macocts[4], macocts[5])],
+			["MTU"          , mtu       ],
+			["Flags"        , flags     ],
+		]
+
+		# If all went as planned, addrs and netmasks will have the same number
+		# of elements and be properly ordered such that they match up
+		# correctly.
+		addr_masks = addrs.zip(netmasks)
+
+		addr_masks.select { |a| Rex::Socket.is_ipv4?(a[0]) }.each { |a|
+			info << [ "IPv4 Address", a[0] ]
+			info << [ "IPv4 Netmask", a[1] ]
+		}
+		addr_masks.select { |a| Rex::Socket.is_ipv6?(a[0]) }.each { |a|
+			info << [ "IPv6 Address", a[0] ]
+			info << [ "IPv6 Netmask", a[1] ]
+		}
+
+		pad = info.map{|i| i[0] }.max_by{|k|k.length}.length
+
+		ret = sprintf(
+				"Interface %2d\n" +
+				"============\n",
+				index
+			)
+
+		info.map {|k,v|
+			next if v.nil?
+			ret << k.ljust(pad) + " : #{v}\n"
+		}
+
+		ret
+	end
+
+	#
+	# The first address associated with this Interface
+	#
+	def ip
+		addrs.first
 	end
 
 	#
-	# The IP address bound to the interface.
+	# The index of the interface.
 	#
-	attr_accessor :ip
+	attr_accessor :index
 	#
-	# The subnet mask associated with the interface.
+	# An Array of IP addresses bound to the Interface.
 	#
-	attr_accessor :netmask
+	attr_accessor :addrs
 	#
 	# The physical (MAC) address of the NIC.
 	#
@@ -67,7 +109,22 @@ class Interface
 	# The name of the interface.
 	#
 	attr_accessor :mac_name
-
+	#
+	# The MTU associated with the interface.
+	#
+	attr_accessor :mtu
+	#
+	# The flags associated with the interface.
+	#
+	attr_accessor :flags
+	#
+	# An Array of netmasks. This will have the same number of elements as #addrs
+	#
+	attr_accessor :netmasks
+	#
+	# An Array of IPv6 address scopes. This will have the same number of elements as #addrs
+	#
+	attr_accessor :scopes
 end
 
 end; end; end; end; end; end