Land rapid7#6719, datastore validation fix for file:

Author: wvu

lib/msf/core/data_store.rb

@@ -29,10 +29,12 @@ def []=(k, v)
 
     opt = @options[k]
     unless opt.nil?
-      unless opt.valid?(v)
-        raise OptionValidateError.new(["Value '#{v}' is not valid for option '#{k}'#{['', ', try harder'].sample}"])
+      if opt.validate_on_assignment?
+        unless opt.valid?(v)
+          raise OptionValidateError.new(["Value '#{v}' is not valid for option '#{k}'"])
+        end
+        v = opt.normalize(v)
       end
-      v = opt.normalize(v)
     end
 
     super(k,v)

lib/msf/core/opt_address_range.rb

@@ -12,6 +12,10 @@ def type
     return 'addressrange'
   end
 
+  def validate_on_assignment?
+    false
+  end
+
   def normalize(value)
     return nil unless value.kind_of?(String)
     if (value =~ /^file:(.*)/)

lib/msf/core/opt_base.rb

@@ -75,6 +75,13 @@ def type?(in_type)
       return (type == in_type)
     end
 
+    #
+    # Returns true if this option can be validated on assignment
+    #
+    def validate_on_assignment?
+      true
+    end
+
     #
     # If it's required and the value is nil or empty, then it's not valid.
     #

lib/msf/core/opt_path.rb

@@ -12,6 +12,10 @@ def type
     return 'path'
   end
 
+  def validate_on_assignment?
+    false
+  end
+
   # Generally, 'value' should be a file that exists.
   def valid?(value)
     return false if empty_required_value?(value)

lib/msf/core/opt_raw.rb

@@ -12,6 +12,10 @@ def type
     return 'raw'
   end
 
+  def validate_on_assignment?
+    false
+  end
+
   def normalize(value)
     if (value.to_s =~ /^file:(.*)/)
       path = $1

lib/msf/core/opt_string.rb

@@ -12,6 +12,10 @@ def type
     return 'string'
   end
 
+  def validate_on_assignment?
+    false
+  end
+
   def normalize(value)
     if (value.to_s =~ /^file:(.*)/)
       path = $1