PE scan logging readability improvements

cisagov · Jan 3, 2025 · 8b095b0 · 8b095b0
1 parent 3d6e9dc
commit 8b095b0
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/pe_source/pe_scripts.py b/src/pe_source/pe_scripts.py
@@ -55,6 +55,11 @@ def run_pe_script(source, orgs_list, cybersix_methods, soc_med_included):
     # If not "all", separate orgs string into a list of orgs
     if orgs_list != "all" and orgs_list != "DEMO":
         orgs_list = orgs_list.split(",")
+        orgs_list_logging = f"{orgs_list[0]} - {orgs_list[-1]}"
+    else:
+        orgs_list_logging = "all P&E Report orgs"
+
+
     # If not "all", separate Cybersixgill methods string into a list
     sixgill_scan_name = cybersix_methods.title()
     if cybersix_methods == "all":
@@ -63,8 +68,6 @@ def run_pe_script(source, orgs_list, cybersix_methods, soc_med_included):
         cybersix_methods = cybersix_methods.split(",")
 
     # LOGGER.info("Running %s on these orgs: %s", source, orgs_list)
-    first_org = orgs_list[0]
-    final_org = orgs_list[-1]
 
     if source == "cybersixgill":
         if sixgill_scan_name == "Topcves":
@@ -75,7 +78,7 @@ def run_pe_script(source, orgs_list, cybersix_methods, soc_med_included):
         cybersix = Cybersixgill(orgs_list, cybersix_methods, soc_med_included)
         cybersix.run_cybersixgill()
         sixgill_end_time = time.time()
-        LOGGER.info(f"Execution time for Cybersixgill {sixgill_scan_name} scan ({first_org} - {final_org}): {str(timedelta(seconds=(sixgill_end_time - sixgill_start_time)))} (H:M:S)")
+        LOGGER.info(f"Execution time for Cybersixgill {sixgill_scan_name} scan ({orgs_list_logging}): {str(timedelta(seconds=(sixgill_end_time - sixgill_start_time)))} (H:M:S)")
         LOGGER.info(f"--- Cybersixgill {sixgill_scan_name} Scan Complete ---")
     elif source == "shodan":
         LOGGER.info("--- Shodan Scan Starting ---")
@@ -110,7 +113,7 @@ def run_pe_script(source, orgs_list, cybersix_methods, soc_med_included):
         intelx = IntelX(orgs_list)
         intelx.run_intelx()
         intelx_end_time = time.time()
-        LOGGER.info(f"Execution time for IntelX scan ({first_org} - {final_org}): {str(timedelta(seconds=(intelx_end_time - intelx_start_time)))} (H:M:S)")
+        LOGGER.info(f"Execution time for IntelX scan ({orgs_list_logging}): {str(timedelta(seconds=(intelx_end_time - intelx_start_time)))} (H:M:S)")
         LOGGER.info("--- IntelX Scan Complete ---")
     elif source == "pshtt":
         launch_pe_pshtt()