feat(sdk): replace detect-secrets library with kingfisher (#11694)

This commit is contained in:
Daniel Barranquero
2026-06-30 15:36:23 +02:00
committed by GitHub
parent ed1fec8866
commit 5dac8a0a53
60 changed files with 2969 additions and 881 deletions
+187 -63
View File
@@ -1,4 +1,5 @@
import os
import subprocess
import tempfile
from datetime import datetime
from time import mktime
@@ -7,7 +8,8 @@ import pytest
from mock import patch
from prowler.lib.utils.utils import (
detect_secrets_scan,
SecretsScanError,
detect_secrets_scan_batch,
file_exists,
get_file_permissions,
hash_sha512,
@@ -20,6 +22,95 @@ from prowler.lib.utils.utils import (
)
def _fake_kingfisher_run(output_content=None, returncode=0, stderr=""):
"""Build a ``subprocess.run`` replacement that mimics a Kingfisher call.
When ``output_content`` is given it is written to the ``--output`` path from
the command (so the reader sees realistic file content); the call returns a
CompletedProcess with the requested ``returncode``/``stderr``.
"""
def _run(command, *_args, **_kwargs):
if output_content is not None:
output_path = command[command.index("--output") + 1]
with open(output_path, "w") as output_file:
output_file.write(output_content)
return subprocess.CompletedProcess(
command, returncode, stdout="", stderr=stderr
)
return _run
def _fake_kingfisher_run_with_findings(findings):
"""Build a ``subprocess.run`` replacement that emits crafted findings.
Each entry in ``findings`` is a ``(payload_index, line)`` pair: the finding
is mapped back to the temp file named ``str(payload_index)`` (the basename
``_scan_batch_chunk`` writes per payload) and given the requested ``line``
value (omitted entirely when ``line`` is the sentinel ``_OMIT``). Returns a
success exit code so only the finding shape is under test.
"""
def _run(command, *_args, **_kwargs):
output_path = command[command.index("--output") + 1]
entries = []
for payload_index, line in findings:
finding = {"path": str(payload_index), "snippet": "secret"}
if line is not _OMIT:
finding["line"] = line
entries.append({"finding": finding, "rule": {"name": "Generic Secret"}})
import json as _json
with open(output_path, "w") as output_file:
output_file.write(_json.dumps({"findings": entries}))
return subprocess.CompletedProcess(command, 200, stdout="", stderr="")
return _run
_OMIT = object()
class Test_detect_secrets_scan_batch_invalid_line:
"""Kingfisher's ``line`` is consumed as a trusted 1-based index by checks
(e.g. CloudWatch ``events[line_number - 1]``). A malformed line must fail
closed as SecretsScanError, never return a finding with a bad index."""
@pytest.mark.parametrize(
"line",
[_OMIT, None, "2", 0, -1, 5, True],
ids=["missing", "none", "string", "zero", "negative", "out_of_range", "bool"],
)
def test_invalid_line_raises(self, line):
# Payload "data" is a single line, so any line other than 1 is invalid.
with patch(
"prowler.lib.utils.utils.subprocess.run",
side_effect=_fake_kingfisher_run_with_findings([(0, line)]),
):
with pytest.raises(SecretsScanError) as exc:
detect_secrets_scan_batch({"a": "data"})
assert "invalid line number" in str(exc.value)
def test_valid_line_is_returned(self):
# A valid in-range line must still pass through to the caller.
with patch(
"prowler.lib.utils.utils.subprocess.run",
side_effect=_fake_kingfisher_run_with_findings([(0, 1)]),
):
results = detect_secrets_scan_batch({"a": "data"})
assert results["a"][0]["line_number"] == 1
def test_one_invalid_line_aborts_the_whole_scan(self):
# Even mixed with a valid finding, a single invalid line fails closed.
with patch(
"prowler.lib.utils.utils.subprocess.run",
side_effect=_fake_kingfisher_run_with_findings([(0, 1), (1, 0)]),
):
with pytest.raises(SecretsScanError):
detect_secrets_scan_batch({"a": "data", "b": "data"})
class Test_utils_open_file:
def test_open_read_file(self):
temp_data_file = tempfile.NamedTemporaryFile(delete=False)
@@ -108,75 +199,108 @@ class Test_utils_validate_ip_address:
assert not validate_ip_address("Not an IP")
class Test_detect_secrets_scan:
def test_detect_secrets_scan_data(self):
data = "password=password"
secrets_detected = detect_secrets_scan(data=data, excluded_secrets=[])
assert type(secrets_detected) is list
assert len(secrets_detected) == 1
assert "filename" in secrets_detected[0]
assert "hashed_secret" in secrets_detected[0]
assert "is_verified" in secrets_detected[0]
assert secrets_detected[0]["line_number"] == 1
assert secrets_detected[0]["type"] == "Secret Keyword"
def test_detect_secrets_scan_no_secrets_data(self):
data = ""
assert detect_secrets_scan(data=data) is None
def test_detect_secrets_scan_file_with_secrets(self):
temp_data_file = tempfile.NamedTemporaryFile(delete=False)
temp_data_file.write(b"password=password")
temp_data_file.seek(0)
secrets_detected = detect_secrets_scan(
file=temp_data_file.name, excluded_secrets=[]
class Test_detect_secrets_scan_batch:
def test_batch_returns_findings_per_key(self):
results = detect_secrets_scan_batch(
{
"a": 'password = "Tr0ub4dor3xKq9vLmZ"',
"b": "just a normal config = value",
}
)
assert type(secrets_detected) is list
assert len(secrets_detected) == 1
assert "filename" in secrets_detected[0]
assert "hashed_secret" in secrets_detected[0]
assert "is_verified" in secrets_detected[0]
assert secrets_detected[0]["line_number"] == 1
assert secrets_detected[0]["type"] == "Secret Keyword"
os.remove(temp_data_file.name)
assert "a" in results
assert results["a"][0]["type"] == "Generic Password"
# keys without findings are omitted
assert "b" not in results
def test_detect_secrets_scan_file_no_secrets(self):
temp_data_file = tempfile.NamedTemporaryFile(delete=False)
temp_data_file.write(b"no secrets")
temp_data_file.seek(0)
assert detect_secrets_scan(file=temp_data_file.name) is None
os.remove(temp_data_file.name)
def test_batch_no_dedup_reports_identical_secret_in_each_key(self):
# The same secret in two payloads must be reported for both (matches
# scanning each payload individually).
secret = "token = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIn0.dozjgNryP4J3jVmNHl0w5N_XgL0n3I9PlFUP0THsR8U"
results = detect_secrets_scan_batch({"a": secret, "b": secret})
assert "a" in results
assert "b" in results
def test_detect_secrets_using_regex(self):
data = "MYSQL_ALLOW_EMPTY_PASSWORD=password"
secrets_detected = detect_secrets_scan(
data=data, excluded_secrets=[".*password"]
def test_batch_excluded_secrets_filters(self):
results = detect_secrets_scan_batch(
{"a": 'DB_ALLOW_EMPTY_PASSWORD = "Tr0ub4dor3xKq9vLmZ"'},
excluded_secrets=[".*ALLOW_EMPTY_PASSWORD.*"],
)
assert secrets_detected is None
assert results == {}
def test_detect_secrets_using_regex_file(self):
temp_data_file = tempfile.NamedTemporaryFile(delete=False)
temp_data_file.write(b"MYSQL_ALLOW_EMPTY_PASSWORD=password")
temp_data_file.seek(0)
secrets_detected = detect_secrets_scan(
file=temp_data_file.name, excluded_secrets=[".*password"]
)
assert secrets_detected is None
os.remove(temp_data_file.name)
def test_batch_chunking_maps_all_keys(self):
payloads = {f"k{i}": f'password = "S3cr3tV4lu3xy{i}z"' for i in range(5)}
results = detect_secrets_scan_batch(payloads, chunk_size=2)
assert sorted(results.keys()) == ["k0", "k1", "k2", "k3", "k4"]
def test_detect_secrets_secrets_using_regex(self):
data = "MYSQL_ALLOW_EMPTY_PASSWORD=password, MYSQL_PASSWORD=password"
# Update the regex to exclude only the exact key "MYSQL_ALLOW_EMPTY_PASSWORD"
secrets_detected = detect_secrets_scan(
data=data, excluded_secrets=["^MYSQL_ALLOW_EMPTY_PASSWORD$"]
def test_batch_empty_payloads(self):
assert detect_secrets_scan_batch({}) == {}
def test_batch_accepts_iterable_of_pairs(self):
results = detect_secrets_scan_batch(
iter([("x", 'password = "Tr0ub4dor3xKq9vLmZ"')])
)
assert type(secrets_detected) is list
assert len(secrets_detected) == 1
assert "filename" in secrets_detected[0]
assert "hashed_secret" in secrets_detected[0]
assert "is_verified" in secrets_detected[0]
assert secrets_detected[0]["line_number"] == 1
assert secrets_detected[0]["type"] == "Secret Keyword"
assert "x" in results
class Test_detect_secrets_scan_batch_failures:
"""A scanner failure must surface as SecretsScanError, never as empty
results (which a caller would read as 'no secrets found')."""
def test_non_zero_exit_code_raises(self):
with patch(
"prowler.lib.utils.utils.subprocess.run",
side_effect=_fake_kingfisher_run(returncode=1, stderr="boom"),
):
with pytest.raises(SecretsScanError) as exc:
detect_secrets_scan_batch({"a": "data"})
assert "exited with code 1" in str(exc.value)
assert "boom" in str(exc.value)
def test_timeout_raises(self):
with patch(
"prowler.lib.utils.utils.subprocess.run",
side_effect=subprocess.TimeoutExpired(cmd="kingfisher", timeout=300),
):
with pytest.raises(SecretsScanError) as exc:
detect_secrets_scan_batch({"a": "data"})
assert "timed out" in str(exc.value)
def test_malformed_json_output_raises(self):
with patch(
"prowler.lib.utils.utils.subprocess.run",
side_effect=_fake_kingfisher_run(
output_content="{not valid json", returncode=0
),
):
with pytest.raises(SecretsScanError):
detect_secrets_scan_batch({"a": "data"})
def test_missing_binary_raises(self):
with patch(
"prowler.lib.utils.utils.subprocess.run",
side_effect=FileNotFoundError("kingfisher binary not found"),
):
with pytest.raises(SecretsScanError):
detect_secrets_scan_batch({"a": "data"})
def test_empty_output_is_not_a_failure(self):
# Empty output means the scan ran and found nothing; it must NOT raise.
with patch(
"prowler.lib.utils.utils.subprocess.run",
side_effect=_fake_kingfisher_run(output_content="", returncode=0),
):
assert detect_secrets_scan_batch({"a": "data"}) == {}
def test_failure_in_any_chunk_aborts_the_whole_scan(self):
# A failure in any chunk must abort the whole scan, not silently return
# partial results from the chunks that happened to succeed first.
payloads = {f"k{i}": "data" for i in range(4)}
with patch(
"prowler.lib.utils.utils.subprocess.run",
side_effect=_fake_kingfisher_run(returncode=2, stderr="boom"),
):
with pytest.raises(SecretsScanError):
detect_secrets_scan_batch(payloads, chunk_size=2)
class Test_hash_sha512: