Merge pull request #1083 from GitGuardian/salomevoltz/scrt-5438-ggshield-for-each-detected-secret-add-a-link-towards-our

feat: Add extra scan results information

Author: salome-voltz

changelog.d/20250423_102414_salome.voltz_scrt_5438_ggshield_for_each_detected_secret_add_a_link_towards_our.md

@@ -0,0 +1,41 @@
+<!--
+A new scriv changelog fragment.
+
+Uncomment the section that is right (remove the HTML comment wrapper).
+-->
+
+<!--
+### Removed
+
+- A bullet item for the Removed category.
+
+-->
+
+### Added
+
+- `ggshield secret scan` output now contains a link to the detector documentation for each secret found.
+
+<!--
+### Changed
+
+- A bullet item for the Changed category.
+
+-->
+<!--
+### Deprecated
+
+- A bullet item for the Deprecated category.
+
+-->
+<!--
+### Fixed
+
+- A bullet item for the Fixed category.
+
+-->
+<!--
+### Security
+
+- A bullet item for the Security category.
+
+-->

ggshield/verticals/secret/output/schemas.py

@@ -14,6 +14,7 @@ class FlattenedPolicyBreak(BaseSchema):
     policy = fields.String(required=True)
     occurrences = fields.List(fields.Nested(ExtendedMatchSchema), required=True)
     detector = fields.String(data_key="type", required=True)
+    detector_documentation = fields.String(required=False, allow_none=True)
     validity = fields.String(required=False, allow_none=True)
     ignore_sha = fields.String(required=True)
     total_occurrences = fields.Integer(required=True)

ggshield/verticals/secret/output/secret_gitlab_webui_output_handler.py

@@ -17,7 +17,7 @@ def format_secret(secret: Secret) -> str:
         f'{x.match_type}: "{censor_match(x)}"' for x in secret.matches
     )
     validity = translate_validity(secret.validity)
-    return f"{secret.detector} (Validity: {validity}, {match_str})"
+    return f"{secret.detector_display_name} (Validity: {validity}, {match_str})"
 
 
 class SecretGitLabWebUIOutputHandler(SecretOutputHandler):

ggshield/verticals/secret/output/secret_json_output_handler.py

@@ -118,10 +118,13 @@ def serialized_secret(
             "occurrences": [],
             "ignore_sha": ignore_sha,
             "policy": secrets[0].policy,
-            "detector": secrets[0].detector,
+            "detector": secrets[0].detector_display_name,
             "total_occurrences": len(secrets),
         }
 
+        if secrets[0].documentation_url:
+            flattened_dict["detector_documentation"] = secrets[0].documentation_url
+
         if secrets[0].validity:
             flattened_dict["validity"] = secrets[0].validity
 

ggshield/verticals/secret/output/secret_sarif_output_handler.py

@@ -76,12 +76,18 @@ def _create_sarif_result_dict(
         f"- [{m.match_type}]({id})" for id, m in enumerate(secret.matches)
     )
     extended_matches = cast(List[ExtendedMatch], secret.matches)
-    message = f"Secret detected: {secret.detector}.\nMatches: {matches_str}"
-    markdown_message = f"Secret detected: {secret.detector}\nMatches:\n{matches_li}"
+    message = (
+        f"Secret detected: {secret.detector_display_name}.\nMatches: {matches_str}"
+    )
+    if secret.documentation_url:
+        markdown_message = f"Secret detected: [{secret.detector_display_name}]({secret.documentation_url})"
+    else:
+        markdown_message = f"Secret detected: {secret.detector_display_name}"
+    markdown_message += f"\nMatches:\n{matches_li}"
 
     # Create dict
     dct = {
-        "ruleId": secret.detector,
+        "ruleId": secret.detector_display_name,
         "level": "error",
         "message": {
             "text": message,

ggshield/verticals/secret/output/secret_text_output_handler.py

@@ -297,7 +297,7 @@ def secret_header(
     )
 
     start_line = format_text(">>", STYLE["detector_line_start"])
-    secret_type = format_text(secret.detector, STYLE["secret_type"])
+    secret_type = format_text(secret.detector_display_name, STYLE["secret_type"])
     number_occurrences = format_text(str(len(secrets)), STYLE["occurrence_count"])
     ignore_sha = format_text(ignore_sha, STYLE["ignore_sha"])
 
@@ -308,6 +308,8 @@ def secret_header(
 {indent}Incident URL: {secrets[0].incident_url if known_secret and secret.incident_url else "N/A"}
 {indent}Secret SHA: {ignore_sha}
 """
+    if secret.documentation_url is not None:
+        message += f"{indent}Detector documentation: {secret.documentation_url}\n"
     if secret.ignore_reason is not None:
         message += f"{indent}Ignored: {secret.ignore_reason.to_human_readable()}\n"
 

ggshield/verticals/secret/secret_scan_collection.py

@@ -83,7 +83,10 @@ class Secret:
     Named Secret since we are dropping other kind of policy breaks.
     """
 
-    detector: str
+    detector_display_name: str
+    detector_name: str
+    detector_group_name: str
+    documentation_url: Optional[str]
     validity: str
     known_secret: bool
     incident_url: Optional[str]
@@ -186,7 +189,10 @@ def from_scan_result(
                 validity=policy_break.validity,
                 known_secret=policy_break.known_secret,
                 incident_url=policy_break.incident_url,
-                detector=policy_break.break_type,
+                detector_display_name=policy_break.break_type,
+                detector_name=policy_break.detector_name,
+                detector_group_name=policy_break.detector_group_name,
+                documentation_url=policy_break.documentation_url,
                 matches=[
                     ExtendedMatch.from_match(match, lines, result.is_on_patch)
                     for match in policy_break.matches

ggshield/verticals/secret/secret_scanner.py

@@ -216,7 +216,7 @@ def _collect_results(
                 result = Result.from_scan_result(file, scan_result, self.secret_config)
                 for secret in result.secrets:
                     self.cache.add_found_policy_break(
-                        secret.detector,
+                        secret.detector_display_name,
                         secret.get_ignore_sha(),
                         file.filename,
                     )

pdm.lock

@@ -41,7 +41,7 @@ dependencies = [
     "marshmallow~=3.18.0",
     "marshmallow-dataclass~=8.5.8",
     "oauthlib~=3.2.1",
-    "pygitguardian~=1.20.0",
+    "pygitguardian @ git+https://github.com/GitGuardian/py-gitguardian.git@933318c6a3fc7a5cce1fdbb663b4e90a2b7992a2",
     "pyjwt~=2.6.0",
     "python-dotenv~=0.21.0",
     "pyyaml~=6.0.1",