resf/distro-tools
1
0
Fork 0
mirror of https://github.com/resf/distro-tools.git synced 2024-11-25 14:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix advisory overriding and stop attempts after success

Browse Source
This commit is contained in:
Mustafa Gezen 2023-02-02 20:44:57 +01:00
parent f8432a7b82
commit 15c4ca576d
Signed by untrusted user who does not match committer: mustafa
GPG Key ID: DCDF010D946438C1
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
apollo/rpmworker/rh_matcher_activities.py
View File

@ -60,23 +60,33 @@ async def get_matching_rh_advisories(
affected_products__minor_version=mirror.match_minor_version, affected_products__minor_version=mirror.match_minor_version,
affected_products__arch=mirror.match_arch, affected_products__arch=mirror.match_arch,
).order_by("red_hat_issued_at").prefetch_related( ).order_by("red_hat_issued_at").prefetch_related(
"packages", "cves", "bugzilla_tickets" "packages",
"cves",
"bugzilla_tickets",
) )
override_ids = [] override_ids = []
overrides = await SupportedProductsRpmRhOverride.filter( overrides = await SupportedProductsRpmRhOverride.filter(
supported_products_rh_mirror_id=mirror.id supported_products_rh_mirror_id=mirror.id,
).prefetch_related("red_hat_advisory") updated_at__isnull=True,
).prefetch_related(
"red_hat_advisory",
"red_hat_advisory__packages",
"red_hat_advisory__cves",
"red_hat_advisory__bugzilla_tickets",
)
for override in overrides: for override in overrides:
override_ids.append(override.red_hat_advisory_id) override_ids.append(override.red_hat_advisory_id)
advisories.append(override.red_hat_advisory) advisories.append(override.red_hat_advisory)
blocked = await SupportedProductsRhBlock.filter( blocked = await SupportedProductsRhBlock.filter(
supported_products_rh_mirror_id=mirror.id, supported_products_rh_mirror_id=mirror.id
).all() ).all()
blocked_ids = [] blocked_ids = []
now = datetime.datetime.now(datetime.timezone.utc) now = datetime.datetime.now(datetime.timezone.utc)
for b in blocked: for b in blocked:
if b.red_hat_advisory_id in override_ids:
continue
delta = now - b.created_at delta = now - b.created_at
if delta.days >= 14: if delta.days >= 14:
blocked_ids.append(b.red_hat_advisory_id) blocked_ids.append(b.red_hat_advisory_id)
@ -84,9 +94,7 @@ async def get_matching_rh_advisories(
# Remove all advisories without packages and blocked advisories # Remove all advisories without packages and blocked advisories
final = [] final = []
for advisory in advisories: for advisory in advisories:
if advisory.packages and ( if advisory.packages and advisory.id not in blocked_ids:
advisory.id not in blocked_ids and advisory.id not in override_ids
):
final.append(advisory) final.append(advisory)
return final return final
@ -398,6 +406,12 @@ A Common Vulnerability Scoring System (CVSS) base score, which gives a detailed
ignore_conflicts=True, ignore_conflicts=True,
) )
# Set update_at to now for any overrides for advisory
await SupportedProductsRpmRhOverride.filter(
red_hat_advisory_id=advisory.id,
supported_products_rh_mirror_id__in=[x.id for x in mirrors],
).update(updated_at=datetime.datetime.utcnow())
async def process_repomd( async def process_repomd(
mirror: SupportedProductsRhMirror, mirror: SupportedProductsRhMirror,
@ -512,11 +526,11 @@ async def match_rh_repos(supported_product_id: int) -> None:
for rpm_repomd in mirror.rpm_repomds: for rpm_repomd in mirror.rpm_repomds:
if rpm_repomd.arch != mirror.match_arch: if rpm_repomd.arch != mirror.match_arch:
continue continue
published_at = None
if rpm_repomd.production:
published_at = datetime.datetime.now()
advisory_map = await process_repomd(mirror, rpm_repomd, advisories) advisory_map = await process_repomd(mirror, rpm_repomd, advisories)
if advisory_map: if advisory_map:
published_at = None
if rpm_repomd.production:
published_at = datetime.datetime.utcnow()
for advisory_name, obj in advisory_map.items(): for advisory_name, obj in advisory_map.items():
if advisory_name in all_advisories: if advisory_name in all_advisories:
all_advisories[advisory_name]["packages"].extend( all_advisories[advisory_name]["packages"].extend(