Merge pull request rapid7#20013 from sjanusz-r7/test-if-aux-modules-get-executed

Fix check_simple arg & searching by port integer

Author: adfoster-r7

lib/msf/base/simple/auxiliary.rb

@@ -158,7 +158,7 @@ def self.check_simple(mod, opts, job_listener: Msf::Simple::NoopJobListener.inst
   #
   # Calls the class method.
   #
-  def check_simple(opts)
+  def check_simple(opts = {})
     Msf::Simple::Auxiliary.check_simple(self, opts)
   end
 

lib/msf/base/simple/evasion.rb

@@ -103,7 +103,7 @@ def self.run_simple(oevasion, opts, &block)
     nil
   end
 
-  def run_simple(opts, &block)
+  def run_simple(opts = {}, &block)
     Msf::Simple::Evasion.run_simple(self, opts, &block)
   end
 

lib/msf/base/simple/exploit.rb

@@ -222,7 +222,7 @@ def self.check_simple(mod, opts, job_listener: Msf::Simple::NoopJobListener.inst
   #
   # Calls the class method.
   #
-  def check_simple(opts)
+  def check_simple(opts = {})
     Msf::Simple::Exploit.check_simple(self, opts)
   end
 

lib/msf/core/modules/metadata/search.rb

@@ -282,7 +282,7 @@ def is_match(params, module_metadata, regex_cache)
 
   def as_regex(search_term)
     # Convert into a case-insensitive regex
-    utf8_buf = search_term.dup.force_encoding('UTF-8')
+    utf8_buf = search_term.to_s.dup.force_encoding('UTF-8')
     if utf8_buf.valid_encoding?
        Regexp.new(Regexp.escape(utf8_buf), Regexp::IGNORECASE)
     else