AWS Sec Hub compliance.py not importing FindingId correctly - bug

dojo/tools/awssecurityhub/compliance.py

@@ -14,6 +14,9 @@ def get_item(self, finding: dict, test):
         epss_score = None
         mitigation = finding.get("Remediation", {}).get("Recommendation", {}).get("Text", "")
         description = "This is a Security Hub Finding \n" + finding.get("Description", "")
+        description += f"\n**AWS Finding ARN:** {finding_id}\n"
+        description += f"AwsAccountId: {finding.get('AwsAccountId', '')}\n"
+        description += f"Region: {finding.get('Region', '')}\n"
         if finding.get("Compliance", {}).get("Status", "PASSED") == "PASSED":
             is_Mitigated = True
             active = False

dojo/tools/awssecurityhub/guardduty.py

@@ -30,6 +30,7 @@ def get_item(self, finding: dict, test):
             else:
                 mitigated = datetime.utcnow()
         description = f"This is a GuardDuty Finding\n{finding.get('Description', '')}"
+        description += f"\n**AWS Finding ARN: ** {finding_id}\n"
         description += f"SourceURL: {finding.get('SourceUrl', '')}\n"
         description += f"AwsAccountId: {finding.get('AwsAccountId', '')}\n"
         description += f"Region: {finding.get('Region', '')}\n"

dojo/tools/awssecurityhub/inspector.py

@@ -13,6 +13,9 @@ def get_item(self, finding: dict, test):
         unsaved_vulnerability_ids = []
         epss_score = None
         description = f"This is an Inspector Finding\n{finding.get('Description', '')}"
+        description += f"\n**AWS Finding ARN: ** {finding_id}\n"
+        description += f"AwsAccountId: {finding.get('AwsAccountId', '')}\n"
+        description += f"Region: {finding.get('Region', '')}\n"
         vulnerabilities = finding.get("Vulnerabilities", [])
         for vulnerability in vulnerabilities:
             # Save the CVE if it is present