librex 0.0.65 → 0.0.66

data/lib/rex/poly.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module Poly
 
@@ -56,7 +57,7 @@ class State
 	def consume_regnum(regnum)
 		raise RuntimeError, "Register #{regnum} is already consumed." if (consumed_regnum?(regnum))
 
-		@regnums[regnum] = true	
+		@regnums[regnum] = true
 
 		regnum
 	end

data/lib/rex/poly/block.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module Poly
 
@@ -51,7 +52,7 @@ end
 # of code that may have one or more functionally equivalent implementations.
 # A logical block should serve a very specific purpose, and any permutations
 # beyond the first should result in exactly the same functionality without any
-# adverse side effects to other blocks.  
+# adverse side effects to other blocks.
 #
 # Like blocks of code, LogicalBlock's can depend on one another in terms of
 # ordering and precedence.  By marking blocks as dependent on another, a
@@ -183,7 +184,7 @@ class LogicalBlock
 			p = @perms[(idx + off) % @perms.length]
 
 			if (p.kind_of?(Proc) or
-			    @state.badchars.nil? or 
+			    @state.badchars.nil? or
 			    Rex::Text.badchar_index(p, @state.badchars).nil?)
 				return Permutation.new(p, self)
 			end
@@ -249,7 +250,7 @@ class LogicalBlock
 		begin
 			buf = do_generate(save_registers, state, badchars)
 
-			if (buf and 
+			if (buf and
 			    (badchars.nil? or Rex::Text.badchar_index(buf, badchars).nil?))
 				break
 			end
@@ -260,15 +261,15 @@ class LogicalBlock
 
 		buf
 	end
-	
+
 	#
 	# Returns the offset of a block.  If the active state for this instance is
 	# operating in the first phase, then zero is always returned.  Otherwise,
 	# the correct offset for the supplied block is returned.
 	#
 	def offset_of(lblock)
-		if (@state.first_phase) 
-			0 
+		if (@state.first_phase)
+			0
 		else
 			if (lblock.kind_of?(SymbolicBlock::End))
 				@state.curr_offset
@@ -312,7 +313,7 @@ class LogicalBlock
 	attr_accessor :generated
 
 protected
-	
+
 	#
 	# Performs the actual polymorphic buffer generation.  Called from generate
 	#
@@ -342,11 +343,11 @@ protected
 
 		# Now that every block has been assigned an offset, generate the
 		# buffer block by block, assigning registers as necessary.
-		block_list.each { |b| 
+		block_list.each { |b|
 
 			# Generate the next permutation and append it to the buffer.
 			begin
-				state.buffer += b[1].to_s 
+				state.buffer += b[1].to_s
 			# If an invalid register exception is raised, try to consume a random
 			# register from the register's associated architecture register
 			# number set.
@@ -354,7 +355,7 @@ protected
 				e.reg.regnum = state.consume_regnum_from_set(e.reg.class.regnum_set)
 				retry
 			end
-	
+
 			# Remove any of the registers that have been clobbered by this block
 			# from the list of consumed register numbers so that they can be used
 			# in the future.
@@ -366,7 +367,7 @@ protected
 				rescue InvalidRegisterError
 				end
 			}
-				
+
 		}
 
 		# Finally, return the buffer that has been created.
@@ -386,11 +387,11 @@ protected
 		end
 
 		@depends.length.times { |cidx|
-		
+
 			pass = false
-		
+
 			while (not pass)
-			
+
 				if (@depends[cidx].generated)
 					break
 
@@ -417,7 +418,7 @@ protected
 					next
 				end
 			end
-				
+
 			next
 		}
 

data/lib/rex/poly/register.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module Poly
 
@@ -97,4 +98,4 @@ class InvalidRegisterError < RuntimeError
 end
 
 end
-end
+end

data/lib/rex/poly/register/x86.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/arch/x86'
 
 module Rex
@@ -37,4 +38,4 @@ class LogicalRegister::X86 < LogicalRegister
 end
 
 end
-end
+end

data/lib/rex/post.rb

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 # General independent containers
 require 'rex/post/permission'
 
 # Post-exploitation clients
-require 'rex/post/dispatch_ninja'
-require 'rex/post/meterpreter'
+require 'rex/post/meterpreter'

data/lib/rex/post/dir.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 module Rex
 module Post
@@ -48,4 +49,4 @@ class Dir
 	end
 end
 
-end; end # Post/Rex
+end; end # Post/Rex

data/lib/rex/post/file.rb

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

data/lib/rex/post/file_stat.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 #
 # This is just a container class basically, that acts like File::Struct

data/lib/rex/post/io.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 module Rex
 module Post
@@ -179,4 +180,4 @@ class IO
 
 end
 
-end; end # Post/Rex
+end; end # Post/Rex

data/lib/rex/post/meterpreter.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/post/meterpreter/client'
-require 'rex/post/meterpreter/ui/console'
+require 'rex/post/meterpreter/ui/console'

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

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

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

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

data/lib/rex/post/meterpreter/channels/pool.rb

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

data/lib/rex/post/meterpreter/channels/pools/file.rb

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

data/lib/rex/post/meterpreter/channels/pools/stream_pool.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/post/meterpreter/channels/pool'
 require 'rex/post/meterpreter/extensions/stdapi/tlv'
@@ -49,14 +50,14 @@ class StreamPool < Rex::Post::Meterpreter::Channels::Pool
 	# This method returns the current offset into the pool.
 	#
 	def tell
-		throw NotImplementedError
+		raise NotImplementedError
 	end
 
 	#
 	# This method seeks to an offset in the pool.
 	#
 	def seek
-		throw NotImplementedError
+		raise NotImplementedError
 	end
 
 	#

data/lib/rex/post/meterpreter/channels/stream.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/io/stream_abstraction'
 require 'rex/post/meterpreter/channel'

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'socket'
 require 'openssl'
@@ -104,6 +105,7 @@ class Client
 		self.alive        = true
 		self.target_id    = opts[:target_id]
 		self.capabilities = opts[:capabilities] || {}
+		self.commands     = []
 
 
 		self.conn_id      = opts[:conn_id]
@@ -281,6 +283,7 @@ class Client
 	# if a matching extension alias exists for the supplied symbol.
 	#
 	def method_missing(symbol, *args)
+		#$stdout.puts("method_missing: #{symbol}")
 		self.ext_aliases.aliases[symbol.to_s]
 	end
 
@@ -294,7 +297,9 @@ class Client
 	# Loads the client half of the supplied extension and initializes it as a
 	# registered extension that can be reached through client.ext.[extension].
 	#
-	def add_extension(name)
+	def add_extension(name, commands=[])
+		self.commands |= commands
+
 		# Check to see if this extension has already been loaded.
 		if ((klass = self.class.check_ext_hash(name.downcase)) == nil)
 			old = Rex::Post::Meterpreter::Extensions.constants
@@ -341,6 +346,18 @@ class Client
 	#
 	def register_extension_alias(name, ext)
 		self.ext_aliases.aliases[name] = ext
+		# Whee!  Syntactic sugar, where art thou?
+		#
+		# Create an instance method on this object called +name+ that returns
+		# +ext+.  We have to do it this way instead of simply
+		# self.class.class_eval so that other meterpreter sessions don't get
+		# extension methods when this one does
+		(class << self; self; end).class_eval do
+			define_method(name.to_sym) do
+				ext
+			end
+		end
+		ext
 	end
 
 	#
@@ -445,10 +462,15 @@ class Client
 	# Flag indicating whether to hex-encode UTF-8 file names and other strings
 	#
 	attr_accessor :encode_unicode
+	#
+	# A list of the commands
+	#
+	attr_reader :commands
 
 protected
 	attr_accessor :parser, :ext_aliases # :nodoc:
 	attr_writer   :ext, :sock # :nodoc:
+	attr_writer   :commands # :nodoc:
 end
 
 end; end; end

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/post/meterpreter/packet'
 require 'rex/post/meterpreter/extension'
@@ -121,7 +122,12 @@ class ClientCore < Extension
 			raise RuntimeError, "The core_loadlib request failed with result: #{response.result}.", caller
 		end
 
-		return true
+		commands = []
+		response.each(TLV_TYPE_METHOD) { |c|
+			commands << c.value
+		}
+
+		return commands
 	end
 
 	#
@@ -150,13 +156,12 @@ class ClientCore < Extension
 		path = ::File.expand_path(path)
 
 		# Load the extension DLL
-		if (load_library(
+		commands = load_library(
 				'LibraryFilePath' => path,
 				'UploadLibrary'   => true,
 				'Extension'       => true,
-				'SaveToDisk'      => opts['LoadFromDisk']))
-			client.add_extension(mod)
-		end
+				'SaveToDisk'      => opts['LoadFromDisk'])
+		client.add_extension(mod, commands)
 
 		return true
 	end

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

@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
-require 'rex/post/permission'
+require 'rex/post/permission'

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 module Rex
 module Post
@@ -29,4 +30,4 @@ protected
 	attr_accessor :client # :nodoc:
 end
 
-end; end; end
+end; end; end

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/post/meterpreter/extensions/espia/tlv'
 
@@ -22,7 +23,7 @@ class Espia < Extension
 
 		client.register_extension_aliases(
 			[
-				{ 
+				{
 					'name' => 'espia',
 					'ext'  => self
 				},
@@ -32,20 +33,20 @@ class Espia < Extension
 	def espia_video_get_dev_image()
 		request = Packet.create_request('espia_video_get_dev_image')
 		response = client.send_request(request)
-		
+
 		return true
 	end
-	
+
 	def espia_audio_get_dev_audio(rsecs)
 		request = Packet.create_request('espia_audio_get_dev_audio')
 		request.add_tlv(TLV_TYPE_DEV_RECTIME, rsecs)
 		response = client.send_request(request)
-	
+
 		return true
 	end
-	
+
 	def espia_image_get_dev_screen
-		request  = Packet.create_request( 'espia_image_get_dev_screen' )    
+		request  = Packet.create_request( 'espia_image_get_dev_screen' )
 		response = client.send_request( request )
 		if( response.result == 0 )
 			return response.get_tlv_value( TLV_TYPE_DEV_SCREEN )

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

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

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/post/meterpreter/extensions/incognito/tlv'
 
@@ -23,7 +24,7 @@ class Incognito < Extension
 
 		client.register_extension_aliases(
 			[
-				{ 
+				{
 					'name' => 'incognito',
 					'ext'  => self
 				},
@@ -36,10 +37,10 @@ class Incognito < Extension
 		request.add_tlv(TLV_TYPE_INCOGNITO_LIST_TOKENS_ORDER, token_order)
 
 		response = client.send_request(request)
-		
+
 		return {
 			'delegation' => response.get_tlv_value(TLV_TYPE_INCOGNITO_LIST_TOKENS_DELEGATION),
-			'impersonation' => response.get_tlv_value(TLV_TYPE_INCOGNITO_LIST_TOKENS_IMPERSONATION) 
+			'impersonation' => response.get_tlv_value(TLV_TYPE_INCOGNITO_LIST_TOKENS_IMPERSONATION)
 		}
 	end
 
@@ -91,4 +92,4 @@ class Incognito < Extension
 
 end
 
-end; end; end; end; end
+end; end; end; end; end