Refactoring

EntySec · May 18, 2024 · 2aa6c35 · 2aa6c35
1 parent 4df6af0
commit 2aa6c35
Show file tree

Hide file tree

Showing 26 changed files with 476 additions and 489 deletions.
diff --git a/hatsploit/__main__.py b/hatsploit/__main__.py
@@ -46,6 +46,7 @@
 from hatsploit.lib.jobs import Jobs
 from hatsploit.lib.runtime import Runtime
 from hatsploit.lib.payloads import Payloads
+from hatsploit.lib.encoders import Encoders
 from hatsploit.lib.show import Show
 
 
@@ -326,6 +327,7 @@ def __init__(self) -> None:
 
         self.hatasm = HatAsm()
         self.payloads = Payloads()
+        self.encoders = Encoders()
 
         self.show = Show()
 
@@ -462,9 +464,11 @@ def cli(self) -> None:
                 query += '/' + args.arch
 
             if args.payloads:
-                self.show.show_search_payloads(query)
+                self.show.show_search_payloads(
+                    self.payloads.get_payloads(), query)
             elif args.encoders:
-                self.show.show_search_encoders(query)
+                self.show.show_search_encoders(
+                    self.encoders.get_encoders(), query)
 
         elif args.formats:
             if not args.platform:

diff --git a/hatsploit/commands/advanced.py b/hatsploit/commands/advanced.py
@@ -30,4 +30,4 @@ def rpc(self, *args):
         return self.modules.get_current_advanced()
 
     def run(self, argc, argv):
-        self.show.show_advanced()
+        self.show.show_advanced(self.modules.get_current_module())
diff --git a/hatsploit/commands/encoder_db.py b/hatsploit/commands/encoder_db.py
@@ -60,10 +60,14 @@ def run(self, argc, argv):
         choice = argv[1]
 
         if choice == '-l':
-            self.show.show_encoder_databases()
+            self.show.show_encoder_databases(
+                self.db.get_encoder_databases())
+
         elif choice == '-d':
             self.db.disconnect_encoder_database(argv[2])
+
         elif choice == '-b':
             self.builder.build_encoder_database(argv[2], argv[3])
+
         elif choice == '-c':
             self.db.connect_encoder_database(argv[2], argv[3])
diff --git a/hatsploit/commands/encoders.py b/hatsploit/commands/encoders.py
@@ -30,4 +30,4 @@ def rpc(self, *args):
         return self.encoders.get_encoders()
 
     def run(self, argc, argv):
-        self.show.show_encoders()
+        self.show.show_encoders(self.encoders.get_encoders())
diff --git a/hatsploit/commands/jobs.py b/hatsploit/commands/jobs.py
@@ -34,7 +34,7 @@ def run(self, argc, argv):
         choice = argv[1]
 
         if choice == '-l':
-            self.show.show_jobs()
+            self.show.show_jobs(self.jobs.get_jobs())
 
         elif choice == '-k':
             self.jobs.delete_job(argv[2])
diff --git a/hatsploit/commands/loot.py b/hatsploit/commands/loot.py
@@ -34,7 +34,7 @@ def run(self, argc, argv):
         choice = argv[1]
 
         if choice == '-l':
-            self.show.show_loot()
+            self.show.show_loot(self.loot.list_loot())
 
         elif choice == '-r':
             self.loot.remove_loot(argv[2])
diff --git a/hatsploit/commands/module_db.py b/hatsploit/commands/module_db.py
@@ -57,10 +57,14 @@ def run(self, argc, argv):
         choice = argv[1]
 
         if choice == '-l':
-            self.show.show_module_databases()
+            self.show.show_module_databases(
+                self.db.get_module_databases())
+
         elif choice == '-d':
             self.db.disconnect_module_database(argv[2])
+
         elif choice == '-b':
             self.builder.build_module_database(argv[2], argv[3])
+
         elif choice == '-c':
             self.db.connect_module_database(argv[2], argv[3])
diff --git a/hatsploit/commands/modules.py b/hatsploit/commands/modules.py
@@ -48,9 +48,9 @@ def run(self, argc, argv):
 
         if argc > 1:
             if argv[1] in categories:
-                self.show.show_modules(argv[1])
+                self.show.show_modules(self.modules.get_modules(), argv[1])
             else:
                 self.print_error("Invalid module category!")
                 self.print_information(f"Available categories: {str(categories)}")
         else:
-            self.show.show_modules()
+            self.show.show_modules(self.modules.get_modules())
diff --git a/hatsploit/commands/options.py b/hatsploit/commands/options.py
@@ -30,4 +30,4 @@ def rpc(self, *args):
         return self.modules.get_current_options()
 
     def run(self, argc, argv):
-        self.show.show_options()
+        self.show.show_options(self.modules.get_current_module())
diff --git a/hatsploit/commands/payload_db.py b/hatsploit/commands/payload_db.py
@@ -60,10 +60,14 @@ def run(self, argc, argv):
         choice = argv[1]
 
         if choice == '-l':
-            self.show.show_payload_databases()
+            self.show.show_payload_databases(
+                self.db.get_payload_databases())
+
         elif choice == '-d':
             self.db.disconnect_payload_database(argv[2])
+
         elif choice == '-b':
             self.builder.build_payload_database(argv[2], argv[3])
+
         elif choice == '-c':
             self.db.connect_payload_database(argv[2], argv[3])
diff --git a/hatsploit/commands/payloads.py b/hatsploit/commands/payloads.py
@@ -30,4 +30,4 @@ def rpc(self, *args):
         return self.payloads.get_payloads()
 
     def run(self, argc, argv):
-        self.show.show_payloads()
+        self.show.show_payloads(self.payloads.get_payloads())
diff --git a/hatsploit/commands/plugin_db.py b/hatsploit/commands/plugin_db.py
@@ -57,10 +57,14 @@ def run(self, argc, argv):
         choice = argv[1]
 
         if choice == '-l':
-            self.show.show_plugin_databases()
+            self.show.show_plugin_databases(
+                self.db.get_plugin_databases())
+
         elif choice == '-d':
             self.db.disconnect_plugin_database(argv[2])
+
         elif choice == '-b':
             self.builder.build_plugin_database(argv[2], argv[3])
+
         elif choice == '-c':
             self.db.connect_plugin_database(argv[2], argv[3])
diff --git a/hatsploit/commands/plugins.py b/hatsploit/commands/plugins.py
@@ -13,7 +13,7 @@ def __init__(self):
         super().__init__()
 
         self.show = Show()
-        self.plguins = Plugins()
+        self.plugins = Plugins()
 
         self.details.update({
             'Category': "plugins",
@@ -30,4 +30,4 @@ def rpc(self, *args):
         return self.plugins.get_plugins()
 
     def run(self, argc, argv):
-        self.show.show_plugins()
+        self.show.show_plugins(self.plugins.get_plugins())
diff --git a/hatsploit/commands/search.py b/hatsploit/commands/search.py
@@ -6,12 +6,21 @@
 from hatsploit.lib.command import Command
 from hatsploit.lib.show import Show
 
+from hatsploit.lib.modules import Modules
+from hatsploit.lib.payloads import Payloads
+from hatsploit.lib.encoders import Encoders
+from hatsploit.lib.plugins import Plugins
+
 
 class HatSploitCommand(Command):
     def __init__(self):
         super().__init__()
 
         self.show = Show()
+        self.modules = Modules()
+        self.payloads = Payloads()
+        self.encoders = Encoders()
+        self.plugins = Plugins()
 
         self.details.update({
             'Category': "core",
@@ -20,26 +29,34 @@ def __init__(self):
                 'Ivan Nikolskiy (enty8080) - command developer',
             ],
             'Description': "Search payloads, modules and plugins.",
-            'Usage': "search <option> <keyword>",
-            'MinArgs': 2,
-            'Options': {
-                '-w': ['[payloads|encoders|modules|plugins]', "Select where to search."],
-                '-e': ['', "Search everywhere."],
-            },
+            'Usage': "search [where] <keyword>",
+            'MinArgs': 1,
         })
 
     def run(self, argc, argv):
-        if argv[1] not in ['-w', '--where']:
-            self.show.show_search_modules(argv[2])
-            self.show.show_search_payloads(argv[2])
-            self.show.show_search_encoders(argv[2])
-            self.show.show_search_plugins(argv[2])
-        else:
-            if argv[2] == 'modules':
-                self.show.show_search_modules(argv[3])
-            elif argv[2] == 'payloads':
-                self.show.show_search_payloads(argv[3])
-            elif argv[2] == 'encoders':
-                self.show.show_search_encoders(argv[3])
-            elif argv[2] == 'plugins':
-                self.show.show_search_plugins(argv[3])
+        if argc > 2:
+            if argv[1] == 'modules':
+                self.show.show_search_modules(
+                    self.modules.get_modules(), argv[2])
+
+            elif argv[1] == 'payloads':
+                self.show.show_search_payloads(
+                    self.payloads.get_payloads(), argv[2])
+
+            elif argv[1] == 'encoders':
+                self.show.show_search_encoders(
+                    self.encoders.get_encoders(), argv[2])
+
+            elif argv[1] == 'plugins':
+                self.show.show_search_plugins(
+                    self.plugins.get_plugins(), argv[2])
+            return
+
+        self.show.show_search_modules(
+            self.modules.get_modules(), argv[1])
+        self.show.show_search_payloads(
+            self.payloads.get_payloads(), argv[1])
+        self.show.show_search_encoders(
+            self.encoders.get_encoders(), argv[1])
+        self.show.show_search_plugins(
+            self.plugins.get_plugins(), argv[1])
diff --git a/hatsploit/commands/sessions.py b/hatsploit/commands/sessions.py
@@ -36,17 +36,23 @@ def __init__(self):
 
     def run(self, argc, argv):
         if argv[1] == '-l':
-            self.show.show_sessions()
+            self.show.show_sessions(self.sessions.get_sessions())
+
         elif argv[1] == '-c':
             self.sessions.close_session(argv[2])
+
         elif argv[1] == '-i':
             self.sessions.interact_with_session(argv[2])
+
         elif argv[1] == '-d':
             self.sessions.session_download(argv[2], argv[3], argv[4])
+
         elif argv[1] == '-u':
             self.sessions.session_upload(argv[2], argv[3], argv[4])
+
         elif argv[1] == '--auto-interaction':
             if argv[2] == 'on':
                 self.sessions.enable_auto_interaction()
+
             elif argv[2] == 'off':
                 self.sessions.disable_auto_interaction()
diff --git a/hatsploit/core/base/console.py b/hatsploit/core/base/console.py
@@ -27,11 +27,10 @@
 import sys
 
 from badges import Badges
+from pex.string import String
 
 from hatsploit.core.base.execute import Execute
 
-from hatsploit.core.cli.fmt import FMT
-
 from hatsploit.core.utils.ui.banner import Banner
 from hatsploit.core.utils.ui.completer import Completer
 from hatsploit.core.utils.ui.tip import Tip
@@ -54,7 +53,7 @@ def __init__(self) -> None:
 
         self.execute = Execute()
 
-        self.fmt = FMT()
+        self.string = String()
         self.badges = Badges()
 
         self.completer = Completer()
@@ -91,7 +90,8 @@ def shell_execute(self) -> None:
         commands = self.badges.input_empty(prompt)
 
         self.runtime.update()
-        self.execute.execute_command(self.fmt.format_commands(commands))
+        self.badges.print_function(self.execute.execute_command,
+                                   self.string.split_args(commands))
         self.runtime.update()
 
         if self.local_storage.get("history"):
@@ -211,7 +211,7 @@ def script(self, input_files: list, shell: bool = True) -> None:
                 file.close()
 
                 for line in file_text:
-                    commands = self.fmt.format_commands(line)
+                    commands = self.string.split_args(line)
 
                     self.runtime.update()
                     self.runtime.catch(

diff --git a/hatsploit/core/base/execute.py b/hatsploit/core/base/execute.py
@@ -29,8 +29,6 @@
 from typing import Any, Tuple, Union
 from badges import Badges, Tables
 
-from hatsploit.core.cli.fmt import FMT
-
 from hatsploit.lib.jobs import Jobs
 from hatsploit.lib.modules import Modules
 from hatsploit.lib.show import Show
@@ -48,7 +46,6 @@ def __init__(self) -> None:
         super().__init__()
 
         self.jobs = Jobs()
-        self.fmt = FMT()
         self.badges = Badges()
         self.tables = Tables()
         self.local_storage = LocalStorage()

diff --git a/hatsploit/core/cli/__init__.py b/hatsploit/core/cli/__init__.py