Land rapid7#6702, fix datastore option 'stickiness', fix OptPort validation

Author: Brent Cook

lib/msf/core/data_store.rb

@@ -75,8 +75,7 @@ def update_value(k, v)
   #
   def import_options(options, imported_by = nil, overwrite = false)
     options.each_option do |name, opt|
-      # Skip options without a default or if is already a value defined
-      if !opt.default.nil? && (!self.has_key?(name) || overwrite)
+      if self[name].nil? || overwrite
         import_option(name, opt.default, true, imported_by, opt)
       end
     end

lib/msf/core/opt_port.rb

@@ -7,24 +7,17 @@ module Msf
 # Network port option.
 #
 ###
-class OptPort < OptBase
+class OptPort < OptInt
   def type
     return 'port'
   end
 
-  def normalize(value)
-    value.to_i
-  end
-
   def valid?(value)
-    return false if empty_required_value?(value)
-
-    if ((value != nil and value.to_s.empty? == false) and
-        ((value.to_s.match(/^\d+$/) == nil or value.to_i < 0 or value.to_i > 65535)))
-      return false
+    if !required? and value.to_s.empty?
+      super
+    else
+      super && normalize(value) <= 65535 && normalize(value) >= 0
     end
-
-    return super
   end
 end