librex 0.0.65 → 0.0.66

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

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/post/meterpreter'
 
 module Rex
@@ -20,11 +21,29 @@ class Console::CommandDispatcher::Stdapi::Webcam
 	# List of supported commands.
 	#
 	def commands
-		{
+		all = {
 			"webcam_list"   => "List webcams",
 			"webcam_snap"   => "Take a snapshot from the specified webcam",
 			"record_mic"    => "Record audio from the default microphone for X seconds"
 		}
+		reqs = {
+			"webcam_list"   => [ "webcam_list" ],
+			"webcam_snap"   => [ "webcam_start", "webcam_get_frame", "webcam_stop" ],
+			"record_mic"    => [ "webcam_record_audio" ],
+		}
+
+		all.delete_if do |cmd, desc|
+			del = false
+			reqs[cmd].each do |req|
+				next if client.commands.include? req
+				del = true
+				break
+			end
+
+			del
+		end
+
+		all
 	end
 
 	#
@@ -36,7 +55,7 @@ class Console::CommandDispatcher::Stdapi::Webcam
 
 	def cmd_webcam_list
 		begin
-			client.webcam.webcam_list.each_with_index { |name, indx| 
+			client.webcam.webcam_list.each_with_index { |name, indx|
 				print_line("#{indx + 1}: #{name}")
 			}
 			return true
@@ -51,7 +70,7 @@ class Console::CommandDispatcher::Stdapi::Webcam
 		quality = 50
 		view    = true
 		index   = 1
-		wc_list = []		
+		wc_list = []
 
 		webcam_snap_opts = Rex::Parser::Arguments.new(
 			"-h" => [ false, "Help Banner" ],
@@ -78,7 +97,7 @@ class Console::CommandDispatcher::Stdapi::Webcam
 					view = false if ( val =~ /^(f|n|0)/i )
 			end
 		}
-		begin 
+		begin
 			wc_list << client.webcam.webcam_list
 		rescue
 		end
@@ -108,7 +127,7 @@ class Console::CommandDispatcher::Stdapi::Webcam
 	def cmd_record_mic(*args)
 		path    = Rex::Text.rand_text_alpha(8) + ".wav"
 		play    = true
-		duration   = 1	
+		duration   = 1
 
 		record_mic_opts = Rex::Parser::Arguments.new(
 			"-h" => [ false, "Help Banner" ],

data/lib/rex/post/meterpreter/ui/console/interactive_channel.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module Post
 module Meterpreter
@@ -35,7 +36,7 @@ module Console::InteractiveChannel
 	# Called when an interrupt is sent.
 	#
 	def _interrupt
-		prompt_yesno("Terminate channel #{self.cid}?")	
+		prompt_yesno("Terminate channel #{self.cid}?")
 	end
 
 	#

data/lib/rex/post/permission.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 # Generic page protection flags
 PROT_NONE         =        0
@@ -23,4 +24,4 @@ PROCESS_ALL       = 0xffffffff
 THREAD_READ       = (1 <<  0)
 THREAD_WRITE      = (1 <<  1)
 THREAD_EXECUTE    = (1 <<  2)
-THREAD_ALL        = 0xffffffff
+THREAD_ALL        = 0xffffffff

data/lib/rex/post/process.rb

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

data/lib/rex/post/thread.rb

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

data/lib/rex/post/ui.rb

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

data/lib/rex/proto.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/proto/http'
 require 'rex/proto/smb'
 require 'rex/proto/ntlm'

data/lib/rex/proto.rb.ts.rb

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..'))
 
 require 'test/unit'
 require 'rex/proto/smb.rb.ts'
 require 'rex/proto/dcerpc.rb.ts'
-require 'rex/proto/http.rb.ts'
+require 'rex/proto/http.rb.ts'

data/lib/rex/proto/dcerpc.rb

@@ -1,6 +1,7 @@
+# -*- coding: binary -*-
 require 'rex/proto/dcerpc/uuid'
 require 'rex/proto/dcerpc/response'
 require 'rex/proto/dcerpc/client'
 require 'rex/proto/dcerpc/packet'
 require 'rex/proto/dcerpc/handle'
-require 'rex/proto/dcerpc/ndr'
+require 'rex/proto/dcerpc/ndr'

data/lib/rex/proto/dcerpc.rb.ts.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/test'
 require 'rex/proto/dcerpc/uuid.rb.ut'
@@ -6,4 +7,4 @@ require 'rex/proto/dcerpc/response.rb.ut'
 require 'rex/proto/dcerpc/packet.rb.ut'
 # require 'rex/proto/dcerpc/ndr.rb.ut'
 require 'rex/proto/dcerpc/handle.rb.ut'
-require 'rex/proto/dcerpc/client.rb.ut'
+require 'rex/proto/dcerpc/client.rb.ut'

data/lib/rex/proto/dcerpc/client.rb

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

data/lib/rex/proto/dcerpc/client.rb.ut.rb

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

data/lib/rex/proto/dcerpc/exceptions.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module Proto
 module DCERPC
@@ -147,4 +148,4 @@ end
 end
 end
 end
-end
+end

data/lib/rex/proto/dcerpc/handle.rb

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

data/lib/rex/proto/dcerpc/handle.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 
@@ -82,4 +83,4 @@ class Rex::Proto::DCERPC::Handle::UnitTest < Test::Unit::TestCase
 		handle = '6bffd098-a112-3610-9833-46c3f87e345a:1.0@ncacn_ip_tcp:10.4.10.10[80'
 		assert_raise(Rex::ArgumentError, 'invalid handle (parser)') { Klass.parse(handle) }
 	end
-end
+end

data/lib/rex/proto/dcerpc/ndr.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require "rex/text"
 
 module Rex
@@ -69,4 +70,4 @@ class NDR
 end
 end
 end
-end
+end

data/lib/rex/proto/dcerpc/ndr.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 
@@ -38,4 +39,4 @@ class Rex::Proto::DCERPC::NDR::UnitTest < Test::Unit::TestCase
 		assert_equal(16, Klass.UnicodeConformantVaryingStringPreBuilt('aa' + "\x00\x00").length, 'UniConformantVaryingStringPreBuilt length')
 	end
 
-end
+end

data/lib/rex/proto/dcerpc/packet.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module Proto
 module DCERPC
@@ -6,18 +7,18 @@ class Packet
 require 'rex/proto/dcerpc/uuid'
 require 'rex/proto/dcerpc/response'
 require 'rex/text'
-		
+
 	UUID = Rex::Proto::DCERPC::UUID
 
 	# Create a standard DCERPC BIND request packet
-	def self.make_bind(uuid, vers)	
-		
+	def self.make_bind(uuid, vers)
+
 		# Process the version strings ("1.0", 1.0, "1", 1)
 		bind_vers_maj, bind_vers_min = UUID.vers_to_nums(vers)
 		xfer_vers_maj, xfer_vers_min = UUID.vers_to_nums(UUID.xfer_syntax_vers)
 
 		# Create the bind request packet
-		buff = 
+		buff =
 		[
 			5,      # major version 5
 			0,      # minor version 0
@@ -38,30 +39,32 @@ require 'rex/text'
 			bind_vers_min,       # interface minor version
 			UUID.xfer_syntax_uuid,  # transfer syntax
 			xfer_vers_maj,       # syntax major version
-			xfer_vers_min,       # syntax minor version 
+			xfer_vers_min,       # syntax minor version
 		].pack('CCCCNvvVvvVVvvA16vvA16vv')
-		
+
 		return buff, 0
 	end
 
 	# Create an obfuscated DCERPC BIND request packet
 	def self.make_bind_fake_multi(uuid, vers, bind_head=0, bind_tail=0)
 
+		bind_head = bind_head.to_i
+		bind_tail = bind_tail.to_i
 		bind_head = rand(6)+10 if bind_head == 0
 		bind_tail = rand(4)+1 if bind_head == 0
 
 		u = Rex::Proto::DCERPC::UUID
-		
+
 		# Process the version strings ("1.0", 1.0, "1", 1)
 		bind_vers_maj, bind_vers_min = UUID.vers_to_nums(vers)
 		xfer_vers_maj, xfer_vers_min = UUID.vers_to_nums(UUID.xfer_syntax_vers)
-		
+
 		bind_total = bind_head + bind_tail + 1
 		bind_size  = (bind_total * 44) + 28
 		real_ctx, ctx = 0, 0
 
 		# Create the header of the bind request
-		data = 
+		data =
 		[
 			5,      # major version 5
 			0,      # minor version 0
@@ -76,61 +79,61 @@ require 'rex/text'
 			0,      # assoc group
 			bind_total,  # num ctx items
 		].pack('CCCCNvvVvvVV')
-		
+
 		# Generate the fake UUIDs prior to the real one
 		1.upto(bind_head) do ||
 			# Generate some random UUID and versions
 			rand_uuid = Rex::Text.rand_text(16)
-			rand_imaj = rand(6)			
+			rand_imaj = rand(6)
 			rand_imin = rand(4)
-			
-			data += 
+
+			data +=
 			[
 				ctx,        # context id
-				1,          # num trans items		
+				1,          # num trans items
 				rand_uuid,  # interface uuid
 				rand_imaj,  # interface major version
 				rand_imin,  # interface minor version
 				UUID.xfer_syntax_uuid,  # transfer syntax
 				xfer_vers_maj,       # syntax major version
-				xfer_vers_min,       # syntax minor version 
+				xfer_vers_min,       # syntax minor version
 			].pack('vvA16vvA16vv')
 			ctx += 1
 		end
-		
+
 		# Stuff the real UUID onto the end of the buffer
 		real_ctx = ctx;
-		data += 
+		data +=
 		[
 			ctx,      # context id
-			1,        # num trans items		
+			1,        # num trans items
 			UUID.uuid_pack(uuid),   # interface uuid
 			bind_vers_maj,       # interface major version
 			bind_vers_min,       # interface minor version
 			UUID.xfer_syntax_uuid,  # transfer syntax
 			xfer_vers_maj,       # syntax major version
-			xfer_vers_min,       # syntax minor version 
+			xfer_vers_min,       # syntax minor version
 		].pack('vvA16vvA16vv')
 		ctx += 1
-		
-	
+
+
 		# Generate the fake UUIDs after the real one
 		1.upto(bind_tail) do ||
 			# Generate some random UUID and versions
 			rand_uuid = Rex::Text.rand_text(16)
-			rand_imaj = rand(6)			
+			rand_imaj = rand(6)
 			rand_imin = rand(4)
-			
-			data += 
+
+			data +=
 			[
 				ctx,        # context id
-				1,          # num trans items		
+				1,          # num trans items
 				rand_uuid,  # interface uuid
 				rand_imaj,  # interface major version
 				rand_imin,  # interface minor version
 				UUID.xfer_syntax_uuid,  # transfer syntax
 				xfer_vers_maj,       # syntax major version
-				xfer_vers_min,       # syntax minor version 
+				xfer_vers_min,       # syntax minor version
 			].pack('vvA16vvA16vv')
 			ctx += 1
 		end
@@ -138,16 +141,16 @@ require 'rex/text'
 		# Return both the bind packet and the real context_id
 		return data, real_ctx
 	end
-	
+
 	# Create a standard DCERPC ALTER_CONTEXT request packet
-	def self.make_alter_context(uuid, vers)	
+	def self.make_alter_context(uuid, vers)
 		u = Rex::Proto::DCERPC::UUID
-		
+
 		# Process the version strings ("1.0", 1.0, "1", 1)
 		bind_vers_maj, bind_vers_min = UUID.vers_to_nums(vers)
 		xfer_vers_maj, xfer_vers_min = UUID.vers_to_nums(UUID.xfer_syntax_vers)
 
-		buff = 
+		buff =
 		[
 			5,      # major version 5
 			0,      # minor version 0
@@ -168,14 +171,18 @@ require 'rex/text'
 			bind_vers_min,       # interface minor version
 			UUID.xfer_syntax_uuid,  # transfer syntax
 			xfer_vers_maj,       # syntax major version
-			xfer_vers_min,       # syntax minor version 
+			xfer_vers_min,       # syntax minor version
 		].pack('CCCCNvvVvvVVvvA16vvA16vv')
 	end
-	
+
 
 	# Used to create a piece of a DCERPC REQUEST packet
 	def self.make_request_chunk(flags=3, opnum=0, data="", ctx=0, object_id = '')
 
+		flags = flags.to_i
+		opnum = opnum.to_i
+		ctx   = ctx.to_i
+
 		dlen = data.length
 		flen = dlen + 24
 
@@ -189,7 +196,7 @@ require 'rex/text'
 			object_str = UUID.uuid_pack(object_id)
 		end
 
-		buff = 
+		buff =
 		[
 			5,      # major version 5
 			0,      # minor version 0
@@ -203,30 +210,30 @@ require 'rex/text'
 			ctx,    # context id
 			opnum,  # operation number
 		].pack('CCCCNvvVVvv') + object_str + data
-	end	
+	end
 
 	# Used to create standard DCERPC REQUEST packet(s)
 	def self.make_request(opnum=0, data="", size=data.length, ctx=0, object_id = '')
 
-		if size > 4000
-			size = 4000
-		end
+		opnum = opnum.to_i
+		size  = [4000, size.to_i].min
+		ctx   = ctx.to_i
 
 		chunks, frags = [], []
 		ptr = 0
-		
+
 		# Break the request into fragments of 'size' bytes
 		while ptr < data.length
 			chunks.push( data[ ptr, size ] )
 			ptr += size
 		end
-		
+
 		# Process requests with no stub data
 		if chunks.length == 0
 			frags.push( make_request_chunk(3, opnum, '', ctx, object_id) )
 			return frags
 		end
-		
+
 		# Process requests with only one fragment
 		if chunks.length == 1
 			frags.push( make_request_chunk(3, opnum, chunks[0], ctx, object_id) )
@@ -235,19 +242,19 @@ require 'rex/text'
 
 		# Create the first fragment of the request
 		frags.push( make_request_chunk(1, opnum, chunks.shift, ctx, object_id) )
-		
+
 		# Create all of the middle fragments
 		while chunks.length != 1
 			frags.push( make_request_chunk(0, opnum, chunks.shift, ctx, object_id) )
 		end
-		
+
 		# Create the last fragment of the request
 		frags.push( make_request_chunk(2, opnum, chunks.shift, ctx, object_id) )
 
 		return frags
-	end		
-	
+	end
+
+end
 end
 end
 end
-end