Merge branch 'upstream/master' into android-java-transport-refactor

Author: OJ

lib/msf/core/auxiliary/fuzzer.rb

@@ -8,9 +8,7 @@ module Msf
 ###
 module Auxiliary::Fuzzer
 
-  #
-  # Creates an instance of a fuzzer module
-  #
+
   def initialize(info = {})
     super
     register_advanced_options([
@@ -20,9 +18,12 @@ def initialize(info = {})
   end
 
 
+  # Will return or yield numbers based on the presence of a block.
   #
-  # Self-reflective iterators
-  #
+  # @return [Array<Array>] Returns an array of arrays of numbers if there is no block given
+  # @yield [Array<Fixnum>] Yields an array of numbers if there is a block given
+  # @see #fuzzer_number_power2
+
   def fuzz_numbers
     res = []
     self.methods.sort.grep(/^fuzzer_number/).each do |m|
@@ -32,6 +33,12 @@ def fuzz_numbers
     res
   end
 
+
+  # Will return or yield a string based on the presense of a block
+  #
+  # @return [Array] Returns and array of arrays of strings if there is no block given
+  # @yield [Array] Yields array of strings if there is a block given
+
   def fuzz_strings
     res = []
     self.methods.sort.grep(/^fuzzer_string/).each do |m|
@@ -41,11 +48,11 @@ def fuzz_strings
     res
   end
 
-  #
-  # General input mangling routines
-  #
+ # Modifies each byte of the string from beginning to end, packing each element as an 8 bit character.
+ #
+ # @returns [Array] Returns an array of an array of strings
+ # @see #fuzzer_string_format
 
-  # Modify each byte of the string moving forward
   def fuzz_string_corrupt_byte(str,max=nil)
     res = []
     0.upto(max ? [max,str.length-1].min : (str.length - 1)) do |offset|
@@ -59,7 +66,12 @@ def fuzz_string_corrupt_byte(str,max=nil)
     res
   end
 
-  # Modify each byte of the string moving backward
+  # Modifies each byte of the string from beginning to end, packing each element as an 8 bit character.
+  #
+  #
+  # @returns [Array] Returns an array of an array of strings
+  # @see fuzzer_string_format
+
   def fuzz_string_corrupt_byte_reverse(str,max=nil)
     res = []
     (max ? [max,str.length-1].min : (str.length - 1)).downto(0) do |offset|
@@ -73,20 +85,29 @@ def fuzz_string_corrupt_byte_reverse(str,max=nil)
     res
   end
 
-  #
   # Useful generators (many derived from AxMan)
   #
+  # @returns [Array] Returns and array of strings.
 
   def fuzzer_string_format
     res = %W{ %s %p %n %x %@ %.257d %.65537d %.2147483648d %.257f %.65537f %.2147483648f}
     block_given? ? res.each { |n| yield(n) } : res
   end
 
+  # Reserved filename array
+  # Useful generators (many derived from AxMan)
+  #
+  # @returns [Array] Returns and array of reserved filenames in Windows.
+
   def fuzzer_string_filepath_dos
     res = %W{ aux con nul com1 com2 com3 com4 lpt1 lpt2 lp3 lpt4 prn }
     block_given? ? res.each { |n| yield(n) } : res
   end
 
+  # Fuzzer Numbers by Powers of Two
+  #
+  # @returns [Array] Returns an array with pre-set values
+
   def fuzzer_number_power2
     res = [
       0x100000000,
@@ -105,6 +126,10 @@ def fuzzer_number_power2
     block_given? ? res.each { |n| yield(n) } : res
   end
 
+  # Powers of two by some fuzzing factor.
+  #
+  # @returns [Array] Returns and array of integers.
+
   def fuzzer_number_power2_plus
     res = []
     fuzzer_number_power2 do |num|
@@ -119,6 +144,11 @@ def fuzzer_number_power2_plus
     block_given? ? res.each { |n| yield(n) } : res
   end
 
+  # Generates a fuzz string
+  # If no block set, will retrive characters from the FuzzChar datastore option
+  #
+  # @return [String] Returns a string of size 1024 * 512 specified by the user
+
   def fuzzer_gen_string(len)
     @gen_string_block ||= datastore['FuzzChar'][0,1] * (1024 * 512)
     res = ''
@@ -128,6 +158,9 @@ def fuzzer_gen_string(len)
     res[0,len]
   end
 
+  # Creates a smaller fuzz string starting from length 16 -> 512 bytes long
+  #
+  # @return [Array] Returns an array of characters
   def fuzzer_string_small
     res = []
     16.step(512,16) do |len|
@@ -137,6 +170,9 @@ def fuzzer_string_small
     res
   end
 
+  # Creates a longer fuzz string from length 64 -> 8192 bytes long
+  #
+  # @return [Array] Returns an array of characters
   def fuzzer_string_long
     res = []
     64.step(8192,64) do |len|
@@ -147,6 +183,9 @@ def fuzzer_string_long
     res
   end
 
+  # Creates a giant fuzz string from length 512 -> 131,064 bytes long
+  #
+  # @return [Array] Returns an array of characters
   def fuzzer_string_giant
     res = []
     512.step(65532 * 2, 512) do |len|
@@ -157,6 +196,9 @@ def fuzzer_string_giant
     res
   end
 
+  # Various URI types
+  #
+  # @returns [Array] Returns an array of strings
   def fuzzer_string_uri_types
     res = %W{
       aaa  aaas  about  acap  adiumxtra  afp  aim  apt  aw  bolo  callto  cap  chrome  cid
@@ -174,16 +216,28 @@ def fuzzer_string_uri_types
     block_given? ? res.each { |n| yield(n) } : res
   end
 
+# Generator for common URI dividers
+#
+# @return [Array] Returns an array of strings
+
   def fuzzer_string_uri_dividers
     res = %W{ : :// }
     block_given? ? res.each { |n| yield(n) } : res
   end
 
+# Generator for common path prefixes
+#
+# @return [Array] Returns an array of strings
+
   def fuzzer_string_path_prefixes
     res = %W{ C:\\ \\\\localhost\\ / }
     block_given? ? res.each { |n| yield(n) } : res
   end
 
+# Generates various small URI string types
+#
+# @return [Array] Returns an array of stings
+
   def fuzzer_string_uris_small
     res = []
     fuzzer_string_uri_types do |proto|
@@ -197,6 +251,10 @@ def fuzzer_string_uris_small
     res
   end
 
+# Generates various long URI string types
+#
+# @return [Array] Returns an array of stings
+
   def fuzzer_string_uris_long
     res = []
     fuzzer_string_uri_types do |proto|
@@ -210,6 +268,10 @@ def fuzzer_string_uris_long
     res
   end
 
+# Generates various giant URI string types
+#
+# @return [Array] Returns an array of stings
+
   def fuzzer_string_uris_giant
     res = []
     fuzzer_string_uri_types do |proto|
@@ -223,6 +285,10 @@ def fuzzer_string_uris_giant
     res
   end
 
+# Format for the URI string generator
+#
+# @return [Array] Returns an array of stings
+
   def fuzzer_string_uris_format
     res = []
     fuzzer_string_uri_types do |proto|
@@ -236,6 +302,11 @@ def fuzzer_string_uris_format
     res
   end
 
+
+# Generates various small strings
+#
+# @return [Array] Returns an array of stings
+
   def fuzzer_string_uris_dos
     res = []
     fuzzer_string_uri_types do |proto|
@@ -249,6 +320,11 @@ def fuzzer_string_uris_dos
     res
   end
 
+
+# Generates various small strings
+#
+# @return [Array] Returns an array of stings
+
   def fuzzer_string_paths_small
     res = []
     fuzzer_string_path_prefixes do |pre|
@@ -260,6 +336,11 @@ def fuzzer_string_paths_small
     res
   end
 
+
+# Generates various small strings
+#
+# @return [Array] Returns an array of stings
+
   def fuzzer_string_paths_long
     res = []
     fuzzer_string_path_prefixes do |pre|
@@ -271,6 +352,11 @@ def fuzzer_string_paths_long
     res
   end
 
+
+# Generates various giant strings
+#
+# @return [Array] Returns an array of stings
+
   def fuzzer_string_paths_giant
     res = []
     fuzzer_string_path_prefixes do |pre|
@@ -282,6 +368,11 @@ def fuzzer_string_paths_giant
     res
   end
 
+
+# Format for the path generator
+#
+# @return [Array] Returns an array of stings
+
   def fuzzer_string_paths_format
     res = []
     fuzzer_string_path_prefixes do |pre|
@@ -293,6 +384,11 @@ def fuzzer_string_paths_format
     res
   end
 
+
+# Generates fuzzer strings using path prefixes
+#
+# @return [Array] Returns an array of stings
+
   def fuzzer_string_paths_dos
     res = []
     fuzzer_string_path_prefixes do |pre|

lib/msf/core/post/windows/file_info.rb

@@ -13,6 +13,11 @@ def loword(num)
     num & 0xffff
   end
 
+# File Version
+# @param [String]  filepath The path of the file you are targeting
+#
+# @return [String] Returns the file version of target
+
   def file_version(filepath)
     file_version_info_size = client.railgun.version.GetFileVersionInfoSizeA(
       filepath,

lib/rex/post/meterpreter/client_core.rb

@@ -320,9 +320,10 @@ def machine_id(timeout=nil)
 
     # Normalise the format of the incoming machine id so that it's consistent
     # regardless of case and leading/trailing spaces. This means that the
-    # individual meterpreters don't have to care
-    mid.downcase!.strip! if mid
-    return Rex::Text.md5(mid)
+    # individual meterpreters don't have to care.
+
+    # Note that the machine ID may be blank or nil and that is OK
+    Rex::Text.md5(mid.to_s.downcase.strip)
   end
 
   def transport_remove(opts={})