Response to feedback, changing C formatter from using %i to %d for in…

…teger values
cisagov · Sep 30, 2021 · aa93585 · aa93585
1 parent 3ee4230
commit aa93585
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/src/tools/gophish_export.py b/src/tools/gophish_export.py
@@ -99,7 +99,7 @@ def export_targets(api, assessment_id):
             targets.append(target)
 
     logging.info(
-        "%i email targets found for assessment %s.", len(targets), assessment_id
+        "%d email targets found for assessment %s.", len(targets), assessment_id
     )
 
     return targets
@@ -134,7 +134,7 @@ def export_campaigns(api, assessment_id):
     for campaign_id in campaignIDs:
         campaigns.append(get_campaign_data(api, campaign_id))
 
-    logging.info("%i campaigns found for assessment %s.", len(campaigns), assessment_id)
+    logging.info("%d campaigns found for assessment %s.", len(campaigns), assessment_id)
 
     return campaigns
 
@@ -317,8 +317,8 @@ def write_campaign_summary(api, assessment_id):
         file_out.write("\nStart Date: %s" % campaign_data[level]["start_date"])
         file_out.write("\nEnd Date: %s" % campaign_data[level]["end_date"])
         file_out.write("\nRedirect: %s" % campaign_data[level]["redirect"])
-        file_out.write("\nClicks: %i" % campaign_data[level]["clicks"])
-        file_out.write("\nUnique Clicks: %i" % campaign_data[level]["unique_clicks"])
+        file_out.write("\nClicks: %d" % campaign_data[level]["clicks"])
+        file_out.write("\nUnique Clicks: %d" % campaign_data[level]["unique_clicks"])
         file_out.write(
             "\nPercentage Clicks: %f" % campaign_data[level]["percent_clicks"]
         )

diff --git a/src/tools/gophish_import.py b/src/tools/gophish_import.py
@@ -55,7 +55,7 @@ def load_landings(api, assessment):
         # Debug page information
 
         logging.debug("Page Name: %s", new_page.name)
-        logging.debug("Redirect ULR: %s", new_page.redirect_url)
+        logging.debug("Redirect URL: %s", new_page.redirect_url)
 
         """
          Catches when a page has already been loaded into GoPhish.
@@ -72,7 +72,7 @@ def load_landings(api, assessment):
                     old_pages = api.pages.get()
                     for old_page in old_pages:
                         if old_page.name == new_page.name:
-                            logging.debug("Deleting Page with ID %i", old_page.id)
+                            logging.debug("Deleting Page with ID %d", old_page.id)
                             api.pages.delete(old_page.id)
                             logging.info("Re-Loading new page.")
                 else:
@@ -119,12 +119,12 @@ def load_groups(api, assessment):
                     logging.warning("%s. Finding previously loaded group to delete.", e)
                     groups = api.groups.get()
                     logging.debug(
-                        "Checking %i for previously imported group to get ID",
+                        "Checking %d for previously imported group to get ID",
                         len(groups),
                     )
                     for old_group in groups:
                         if old_group.name == new_group.name:
-                            logging.debug("Deleting Group with ID %i", old_group.id)
+                            logging.debug("Deleting Group with ID %d", old_group.id)
                             api.groups.delete(old_group.id)
                             logging.info("Re-Loading new group.")
                 else:
@@ -170,13 +170,13 @@ def build_campaigns(api, assessment):
                     )
                     templates = api.templates.get()
                     logging.debug(
-                        "Checking %i for previously imported template to get ID",
+                        "Checking %d for previously imported template to get ID",
                         len(templates),
                     )
                     for old_template in templates:
                         if old_template.name == new_template.name:
                             logging.debug(
-                                "Deleting Template with ID %i", old_template.id
+                                "Deleting Template with ID %d", old_template.id
                             )
                             api.templates.delete(old_template.id)
                             logging.info("Re-Loading new template.")
@@ -211,12 +211,12 @@ def build_campaigns(api, assessment):
                     logging.warning("%s. Finding previously loaded smtp to delete.", e)
                     smtps = api.smtp.get()
                     logging.debug(
-                        "Checking %i for previously imported smtp profiles to get ID",
+                        "Checking %d for previously imported smtp profiles to get ID",
                         len(smtps),
                     )
                     for old_smtp in smtps:
                         if old_smtp.name == new_smtp.name:
-                            logging.debug("Deleting SMTP with ID %i", old_smtp.id)
+                            logging.debug("Deleting SMTP with ID %d", old_smtp.id)
                             api.smtp.delete(old_smtp.id)
                             logging.info("Re-Loading new SMTP.")
                 else:
@@ -234,7 +234,7 @@ def build_campaigns(api, assessment):
                     "Previous Campaign found with name %s.", campaign["name"]
                 )
                 logging.warning(
-                    "Previous Campaign with id %i being deleted.", old_campaign.id
+                    "Previous Campaign with id %d being deleted.", old_campaign.id
                 )
                 api.campaigns.delete(old_campaign.id)
 

diff --git a/src/tools/gophish_test.py b/src/tools/gophish_test.py
@@ -54,7 +54,7 @@ def get_campaigns(api, assessment_id):
             assessmentCampaigns.append(campaign)
 
     # Sets err to true if assessmentCampaigns has 0 length.
-    logging.debug("Num Campaigns: %i", len(assessmentCampaigns))
+    logging.debug("Num Campaigns: %d", len(assessmentCampaigns))
     if not len(assessmentCampaigns):
         logging.warning("No Campaigns found for %s", assessment_id)