Reverts rapid7#4989, support for file: is handled in the options again

Author: HD Moore

lib/msf/core/opt_address_range.rb

@@ -14,18 +14,21 @@ def type
 
   def normalize(value)
     return nil unless value.kind_of?(String)
-    if value =~ /^rand:(.*)/
+    if (value =~ /^file:(.*)/)
+      path = $1
+      return false if not File.exists?(path) or File.directory?(path)
+      return File.readlines(path).map{ |s| s.strip}.join(" ")
+    elsif (value =~ /^rand:(.*)/)
       count = $1.to_i
       return false if count < 1
       ret = ''
-      count.times do
-        ret << ' ' if not ret.empty?
-        ret << [ rand(0x100000000) ].pack('N').unpack('C*').map{|x| x.to_s }.join('.')
-      end
+      count.times {
+        ret << " " if not ret.empty?
+        ret << [ rand(0x100000000) ].pack("N").unpack("C*").map{|x| x.to_s }.join(".")
+      }
       return ret
     end
-
-    value
+    return value
   end
 
   def valid?(value)

lib/msf/core/opt_raw.rb

@@ -13,6 +13,14 @@ def type
   end
 
   def normalize(value)
+    if (value =~ /^file:(.*)/)
+      path = $1
+      begin
+        value = File.read(path)
+      rescue ::Errno::ENOENT, ::Errno::EISDIR
+        value = nil
+      end
+    end
     value
   end
 

lib/msf/core/opt_string.rb

@@ -13,6 +13,14 @@ def type
   end
 
   def normalize(value)
+    if (value =~ /^file:(.*)/)
+      path = $1
+      begin
+        value = File.read(path)
+      rescue ::Errno::ENOENT, ::Errno::EISDIR
+        value = nil
+      end
+    end
     value
   end