Skip to content

fix(ghas): Also query generic secret alerts #873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zkdev merged 2 commits into from
Jun 30, 2026
+39 −8
Merged

fix(ghas): Also query generic secret alerts #873

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
651cede
fix(ghas): Also fetch `generic` GitHub secret alerts
zkdev Jun 26, 2026
4dddb9b
refactor(ghas): Only query metadata from ODG when required
zkdev Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 32 additions & 2 deletions src/ghas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,18 @@ def get_secret_alerts(
github_hostname: str,
org: str,
secret_factory: secret_mgmt.SecretFactory,
secret_types: tuple[str, ...] = (
'ec_private_key',
'generic_private_key',
'http_basic_authentication_header',
'http_bearer_authentication_header',
'mongodb_connection_string',
'mysql_connection_url',
'openssh_private_key',
'pgp_private_key',
'postgres_connection_string',
'rsa_private_key',
), # https://docs.github.com/en/code-security/reference/secret-security/supported-secret-scanning-patterns#supported-generic-patterns
) -> collections.abc.Generator[SecretAlert]:
"""
Fetch open secret scanning alerts using authenticated GitHub client.
Expand All @@ -171,12 +183,31 @@ def get_secret_alerts(
)

count = 0
seen_urls = set()

# default alerts
for alert_raw in github_api_request_paginated(
url=url,
secret_factory=secret_factory,
):
count += 1
yield dacite.from_dict(SecretAlert, alert_raw)
alert = dacite.from_dict(SecretAlert, alert_raw)
yield alert
seen_urls.add(alert.url)

# generic alerts
url = f'{url}&secret_type={",".join(secret_types)}'

for alert_raw in github_api_request_paginated(
url=url,
secret_factory=secret_factory,
):
alert = dacite.from_dict(SecretAlert, alert_raw)
if alert.url not in seen_urls:
# deduplicating, as we are effectively quering the same data source twice
Comment thread
zkdev marked this conversation as resolved.
seen_urls.add(alert.url)
yield alert
count += 1

logger.info(f'found {count} secret alerts for {github_hostname}/{org}')

Expand Down Expand Up @@ -441,7 +472,6 @@ def scan(
all_metadata_keys = set()

now = datetime.datetime.now(tz=datetime.timezone.utc)

all_existing_metadata = [
odg.model.ArtefactMetadata.from_dict(raw)
for raw in delivery_service_client.query_metadata(
Expand Down