Fixes crash when searching modules by target

Author: cgranleese-r7

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

@@ -179,17 +179,17 @@ def is_match(params, module_metadata, regex_cache)
             when 'aka'
               match = [keyword, search_term] if (module_metadata.notes['AKA'] || []).any? { |aka| aka =~ regex }
             when 'author', 'authors'
-              match = [keyword, search_term] if module_metadata.author.any? { |author| author =~ regex }
+              match = [keyword, search_term] if module_metadata.author && module_metadata.author.any? { |author| author =~ regex }
             when 'arch'
               match = [keyword, search_term] if module_metadata.arch =~ regex
             when 'cve'
-              match = [keyword, search_term] if module_metadata.references.any? { |ref| ref =~ /^cve\-/i and ref =~ regex }
+              match = [keyword, search_term] if module_metadata.references && module_metadata.references.any? { |ref| ref =~ /^cve\-/i and ref =~ regex }
             when 'osvdb'
-              match = [keyword, search_term] if module_metadata.references.any? { |ref| ref =~ /^osvdb\-/i and ref =~ regex }
+              match = [keyword, search_term] if module_metadata.references && module_metadata.references.any? { |ref| ref =~ /^osvdb\-/i and ref =~ regex }
             when 'bid'
-              match = [keyword, search_term] if module_metadata.references.any? { |ref| ref =~ /^bid\-/i and ref =~ regex }
+              match = [keyword, search_term] if module_metadata.references && module_metadata.references.any? { |ref| ref =~ /^bid\-/i and ref =~ regex }
             when 'edb'
-              match = [keyword, search_term] if module_metadata.references.any? { |ref| ref =~ /^edb\-/i and ref =~ regex }
+              match = [keyword, search_term] if module_metadata.references && module_metadata.references.any? { |ref| ref =~ /^edb\-/i and ref =~ regex }
             when 'check'
               if module_metadata.check
                 matches_check = %w(true yes).any? { |val| val =~ regex}
@@ -255,9 +255,9 @@ def is_match(params, module_metadata, regex_cache)
             when 'ref', 'ref_name'
               match = [keyword, search_term] if module_metadata.ref_name =~ regex
             when 'reference', 'references'
-              match = [keyword, search_term] if module_metadata.references.any? { |ref| ref =~ regex }
+              match = [keyword, search_term] if module_metadata.references && module_metadata.references.any? { |ref| ref =~ regex }
             when 'target', 'targets'
-              match = [keyword, search_term] if module_metadata.targets.any? { |target| target =~ regex }
+              match = [keyword, search_term] if module_metadata.targets && module_metadata.targets.any? { |target| target =~ regex }
             when 'type'
               match = [keyword, search_term] if Msf::MODULE_TYPES.any? { |module_type| search_term == module_type and module_metadata.type == module_type }
           else

lib/msf/ui/console/command_dispatcher/modules.rb

@@ -380,7 +380,7 @@ def cmd_search_help
             print_line
             print_line "Keywords:"
             {
-              'adapter'     => 'Modules with a matching adater reference name',
+              'adapter'     => 'Modules with a matching adapter reference name',
               'aka'         => 'Modules with a matching AKA (also-known-as) name',
               'author'      => 'Modules written by this author',
               'arch'        => 'Modules affecting this architecture',

spec/lib/msf/core/modules/metadata/search_spec.rb

@@ -57,6 +57,9 @@ def get_metadata
     it { expect(described_class.parse_search_string("session_type:Meterpreter ")).to eq({"session_type"=>[["meterpreter"], []]}) }
     it { expect(described_class.parse_search_string("session_type:shell ")).to eq({"session_type"=>[["shell"], []]}) }
     it { expect(described_class.parse_search_string("action:forge_golden ")).to eq({"action"=>[["forge_golden"], []]}) }
+    it { expect(described_class.parse_search_string("targets:windows ")).to eq({"targets"=>[["windows"], []]}) }
+    it { expect(described_class.parse_search_string("targets:osx ")).to eq({"targets"=>[["osx"], []]}) }
+    it { expect(described_class.parse_search_string("targets:ubuntu ")).to eq({"targets"=>[["ubuntu"], []]}) }
   end
 
   describe '#find' do
@@ -233,6 +236,30 @@ def inverse_query_terms(search_string)
       it_should_behave_like 'search_filter', accept: accept, reject: reject
     end
 
+    context 'on a module with a #targets of ["windows"]' do
+      let(:opts) { { 'targets' => ['windows'] } }
+      accept = %w[targets:windows]
+      reject = %w[targets:unrelated]
+
+      it_should_behave_like 'search_filter', accept: accept, reject: reject
+    end
+
+    context 'on a module with a #targets of ["osx"]' do
+      let(:opts) { { 'targets' => ['osx'] } }
+      accept = %w[targets:osx]
+      reject = %w[targets:unrelated]
+
+      it_should_behave_like 'search_filter', accept: accept, reject: reject
+    end
+
+    context 'on a module with a #targets of ["ubuntu"]' do
+      let(:opts) { { 'targets' => ['ubuntu'] } }
+      accept = %w[targets:ubuntu]
+      reject = %w[targets:unrelated]
+
+      it_should_behave_like 'search_filter', accept: accept, reject: reject
+    end
+
     context 'on a module that supports the osx platform' do
       let(:opts) { ({ 'platform' => 'osx' }) }
       accept = %w(platform:osx os:osx)