Small fixes

Author: dimeko

README.md

@@ -112,4 +112,4 @@ pipenv run deltascan -a import -i raw_nmap_results.xml
 Run mkdocs server:
 ```bash
 pipenv run mkdocs serve
-```
+```

deltascan/cli/cli_output.py

@@ -97,14 +97,14 @@ def _display_scan_results(self):
         _counter = 1
         if self.suppress is True:
             _sup_table = Table(show_header=True)
-            _sup_table.add_column("Index", style=colors["col_1"], no_wrap=True, width=10)
+            _sup_table.add_column("Index", style=colors["col_1"], no_wrap=False, width=10)
             _sup_table.add_column("Uid", style=colors["col_2"], no_wrap=False)
-            _sup_table.add_column("Given Host/Subnet", style=colors["col_3"], no_wrap=True)
+            _sup_table.add_column("Given Host/Subnet", style=colors["col_3"], no_wrap=False)
             _sup_table.add_column("Scanned Host", style=colors["col_1"], no_wrap=False, width=20)
-            _sup_table.add_column("Status", style=colors["col_3"], no_wrap=True)
+            _sup_table.add_column("Status", style=colors["col_3"], no_wrap=False)
             _sup_table.add_column(
                 "Profile", style=colors["col_4"], no_wrap=False, width=20)
-            _sup_table.add_column("Date", style=colors["col_5"], no_wrap=True)
+            _sup_table.add_column("Date", style=colors["col_5"], no_wrap=False)
             _sup_table.add_column("Args", style=colors["col_5"], no_wrap=False, width=30)
 
         for scan in self.data:
@@ -125,11 +125,11 @@ def _display_scan_results(self):
                     f"Scan uid:   [/][rosy_brown]" \
                     f"{scan['uuid']}[/]"
 
-                table.add_column("Port", style=colors["col_1"], no_wrap=True)
+                table.add_column("Port", style=colors["col_1"], no_wrap=False)
                 table.add_column(
                     "Protocol",
-                    style=colors["col_2"], no_wrap=True)
-                table.add_column("State", style=colors["col_3"], no_wrap=True)
+                    style=colors["col_2"], no_wrap=False)
+                table.add_column("State", style=colors["col_3"], no_wrap=False)
                 table.add_column("Service", style=colors["col_4"])
                 table.add_column("Service Fingerprint", style=colors["col_5"])
                 table.add_column("Service product", style=colors["col_6"])

deltascan/cli/cmd.py

@@ -128,7 +128,7 @@ def __norm_value(v):
             elif conf_key == "tdate":
                 self._app.tdate = __norm_value(conf_value)
             elif conf_key == "suppress":
-                self._app.suppress = bool(__norm_value(conf_value))
+                self._app.suppress = False if __norm_value(conf_value).lower() == "false" else True
             elif conf_key == "host":
                 self._app.host = __norm_value(conf_value)
             elif conf_key == "profile":
@@ -310,9 +310,9 @@ def run():
     parser.add_argument(
         "-c", "--conf-file",
         help="path to configuration file", required=False)
-    parser.add_argument(
-        "-v", "--verbose", default=False, action='store_true',
-        help="verbose output", required=False)
+    # parser.add_argument(
+    #     "-v", "--verbose", default=False, action='store_true',
+    #     help="verbose output", required=False)
     parser.add_argument(
         "-s", "--suppress", default=False, action='store_true',
         help="suppress output", required=False)
@@ -373,7 +373,7 @@ def run():
         "action": clargs.action,
         "profile": clargs.profile,
         "conf_file": clargs.conf_file,
-        "verbose": clargs.verbose,
+        "verbose": None,
         "suppress": clargs.suppress,
         "n_scans": clargs.n_scans,
         "n_diffs": clargs.n_diffs,

deltascan/core/deltascan.py

@@ -228,6 +228,16 @@ def _remove_finished_scan_from_list(self):
             del self._scans_to_wait[_n]
 
     def _get_profile(self, _profile):
+        """
+        Retrieves the profile and its arguments based on the given profile name.
+
+        Args:
+            _profile (str): The name of the profile to retrieve.
+
+        Returns:
+            tuple: A tuple containing the profile name and its arguments.
+                   If the profile is not found in the database or file, returns (None, None).
+        """
         try:
             profile = self.store.get_profile(_profile)
             profile_arguments = profile["arguments"]
@@ -321,7 +331,7 @@ def diffs(self, uuids=None):
         """
         try:
             if datetime_validation(self._config.fdate) is False:
-                if self._config.is_interactive is True:
+                if self._config.is_interactive:
                     print("Invalid date format. Using default date range.")
                 else:
                     raise DScanInputValidationException("Invalid date format")

deltascan/core/importer.py

@@ -96,7 +96,7 @@ def _import_xml(self):
             DScanImportDataError: If the XML data fails to parse.
         """
         try:
-            _r = self.load_results_from_file(self._full_name)
+            _r = self.load_results_from_file()
             _parsed = Parser.extract_port_scan_dict_results(_r)
             _host = _r ._nmaprun["args"].split(" ")[-1]