Converted all marketplace and module listing to searching.

Created a private method for smart searching modules.

Replaced module string searching with regex.

Author: lanmaster53

recon-cli

@@ -41,7 +41,7 @@ def recon_cli(args):
         return
     # if requested, show modules and exit
     if args.show_modules:
-        x._do_module_list('')
+        x._do_module_search('')
         return
     # exit if module not specified
     if not args.module:

recon/core/base.py

@@ -520,13 +520,13 @@ def do_marketplace(self, params):
             self.help_marketplace()
             return
         arg, params = self._parse_params(params)
-        if arg in ['list', 'info', 'install', 'remove']:
+        if arg in ['search', 'info', 'install', 'remove']:
             return getattr(self, '_do_marketplace_'+arg)(params)
         else:
             self.help_marketplace()
 
-    def _do_marketplace_list(self, params):
-        '''Lists all available modules in the marketplace'''
+    def _do_marketplace_search(self, params):
+        '''Searches marketplace modules'''
         modules = [m for m in self._module_index]
         if params:
             self.output(f"Searching module index for '{params}'...")
@@ -546,7 +546,7 @@ def _do_marketplace_list(self, params):
             print(f"{self.spacer}K = Requires keys. See info for details.{os.linesep}")
         else:
             self.error('No modules found.')
-            self._help_marketplace_list()
+            self._help_marketplace_search()
 
     def _do_marketplace_info(self, params):
         '''Shows detailed information about available modules'''
@@ -602,7 +602,7 @@ def do_workspaces(self, params):
             self.help_workspaces()
 
     def _do_workspaces_list(self, params):
-        '''Lists all existing workspaces'''
+        '''Lists existing workspaces'''
         self.table([[x] for x in self._get_workspaces()], header=['Workspaces'])
 
     def _do_workspaces_create(self, params):
@@ -641,7 +641,7 @@ def do_snapshots(self, params):
             self.help_snapshots()
 
     def _do_snapshots_list(self, params):
-        '''Lists all existing database snapshots'''
+        '''Lists existing database snapshots'''
         snapshots = self._get_snapshots()
         if snapshots:
             self.table([[x] for x in snapshots], header=['Snapshots'])
@@ -693,7 +693,7 @@ def _do_module_load(self, params):
             self._help_module_load()
             return
         # finds any modules that contain params
-        modules = [params] if params in self._loaded_modules else [x for x in self._loaded_modules if params in x]
+        modules = self._match_modules(params)
         # notify the user if none or multiple modules are found
         if len(modules) != 1:
             if not modules:
@@ -746,11 +746,11 @@ def help_index(self):
 
     def help_marketplace(self):
         print(getattr(self, 'do_marketplace').__doc__)
-        print(f"{os.linesep}Usage: marketplace <list|info|install|remove> [...]{os.linesep}")
+        print(f"{os.linesep}Usage: marketplace <search|info|install|remove> [...]{os.linesep}")
 
-    def _help_marketplace_list(self):
-        print(getattr(self, '_do_marketplace_list').__doc__)
-        print(f"{os.linesep}Usage: marketplace list [<regex>]{os.linesep}")
+    def _help_marketplace_search(self):
+        print(getattr(self, '_do_marketplace_search').__doc__)
+        print(f"{os.linesep}Usage: marketplace search [<regex>]{os.linesep}")
 
     def _help_marketplace_info(self):
         print(getattr(self, '_do_marketplace_info').__doc__)
@@ -803,12 +803,12 @@ def complete_index(self, text, line, *ignored):
 
     def complete_marketplace(self, text, line, *ignored):
         arg, params = self._parse_params(line.split(' ', 1)[1])
-        subs = ['list', 'info', 'install', 'remove']
+        subs = ['search', 'info', 'install', 'remove']
         if arg in subs:
             return getattr(self, '_complete_marketplace_'+arg)(text, params)
         return [sub for sub in subs if sub.startswith(text)]
 
-    def _complete_marketplace_list(self, text, *ignored):
+    def _complete_marketplace_search(self, text, *ignored):
         return []
 
     def _complete_marketplace_info(self, text, *ignored):

recon/core/framework.py

@@ -777,6 +777,13 @@ def request(self, url, method='GET', timeout=None, payload={}, headers={}, agent
     # MODULES METHODS
     #==================================================
 
+    def _match_modules(self, params):
+        # return an exact match
+        if params in Framework._loaded_modules:
+            return [params]
+        # use the provided name as a keyword search and return the results
+        return [x for x in Framework._loaded_modules if params in x]
+
     def _list_modules(self, modules):
         if modules:
             key_len = len(max(modules, key=len)) + len(self.spacer)
@@ -906,22 +913,22 @@ def do_module(self, params):
             self.help_module()
             return
         arg, params = self._parse_params(params)
-        if arg in ['list', 'load', 'reload']:
+        if arg in ['search', 'load', 'reload']:
             return getattr(self, '_do_module_'+arg)(params)
         else:
             self.help_module()
 
-    def _do_module_list(self, params):
-        '''Lists installed modules'''
+    def _do_module_search(self, params):
+        '''Searches installed modules'''
         modules = [x for x in Framework._loaded_modules]
         if params:
             self.output(f"Searching installed modules for '{params}'...")
-            modules = [x for x in Framework._loaded_modules if params in x]
+            modules = [x for x in Framework._loaded_modules if re.search(params, x)]
         if modules:
             self._list_modules(modules)
         else:
             self.error('No modules found.')
-            self._help_module_list()
+            self._help_module_search()
 
     def _do_module_load(self, params):
         raise NotImplementedError
@@ -1216,11 +1223,11 @@ def _help_keys_remove(self):
 
     def help_module(self):
         print(getattr(self, 'do_module').__doc__)
-        print(f"{os.linesep}Usage: module <list|load|reload> [...]{os.linesep}")
+        print(f"{os.linesep}Usage: module <search|load|reload> [...]{os.linesep}")
 
-    def _help_module_list(self):
-        print(getattr(self, '_do_module_list').__doc__)
-        print(f"{os.linesep}Usage: module list [<string>]{os.linesep}")
+    def _help_module_search(self):
+        print(getattr(self, '_do_module_search').__doc__)
+        print(f"{os.linesep}Usage: module search [<regex>]{os.linesep}")
 
     def _help_module_load(self):
         print(getattr(self, '_do_module_load').__doc__)
@@ -1307,14 +1314,14 @@ def _complete_keys_add(self, text, *ignored):
 
     def complete_module(self, text, line, *ignored):
         arg, params = self._parse_params(line.split(' ', 1)[1])
-        subs = ['list', 'load', 'reload']
+        subs = ['search', 'load', 'reload']
         if arg in subs:
             return getattr(self, '_complete_module_'+arg)(text, params)
         return [sub for sub in subs if sub.startswith(text)]
 
-    def _complete_module_list(self, text, *ignored):
+    def _complete_module_search(self, text, *ignored):
         return []
-    _complete_module_reload = _complete_module_list
+    _complete_module_reload = _complete_module_search
 
     def _complete_module_load(self, text, *ignored):
         return [x for x in Framework._loaded_modules if x.startswith(text)]

recon/core/module.py

@@ -531,7 +531,7 @@ def _do_module_load(self, params):
             self._help_module_load()
             return
         # finds any modules that contain params
-        modules = [params] if params in framework.Framework._loaded_modules else [x for x in framework.Framework._loaded_modules if params in x]
+        modules = self._match_modules(params)
         # notify the user if none or multiple modules are found
         if len(modules) != 1:
             if not modules: