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

OSV changes request by Google

Browse Source
This commit is contained in:
Mustafa Gezen 2023-09-13 22:31:18 +02:00
parent 02e062f0d0
commit a0bb51db58
Signed by untrusted user who does not match committer: mustafa
GPG Key ID: DCDF010D946438C1
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
apollo/server/routes/api_osv.py
View File

@ -94,7 +94,7 @@ class OSVAdvisory(BaseModel):
modified: str modified: str
published: str published: str
withdrawn: Optional[str] withdrawn: Optional[str]
aliases: list[str] aliases: Optional[list[str]]
related: Optional[list[str]] related: Optional[list[str]]
summary: str summary: str
details: str details: str
@ -149,7 +149,8 @@ def to_osv_advisory(ui_url: str, advisory: Advisory) -> OSVAdvisory:
continue continue
processed_nvra[x.nevra] = True processed_nvra[x.nevra] = True
ver_rel = f"{nevra.group(3)}-{nevra.group(4)}" epoch = nevra.group(2)
ver_rel = f"{epoch}:{nevra.group(3)}-{nevra.group(4)}"
slugified = slugify(x.supported_product.variant) slugified = slugify(x.supported_product.variant)
slugified_distro = slugify(x.product_name) slugified_distro = slugify(x.product_name)
for arch_, _ in arches.items(): for arch_, _ in arches.items():
@ -158,9 +159,8 @@ def to_osv_advisory(ui_url: str, advisory: Advisory) -> OSVAdvisory:
slugified_arch, slugified_arch,
"", "",
) )
epoch = nevra.group(2)
purl = f"pkg:rpm/{slugified}/{pkg_name}@{ver_rel}?distro={slugified_distro}&epoch={epoch}" purl = f"pkg:rpm/{slugified}/{pkg_name}?distro={slugified_distro}&epoch={epoch}"
affected = OSVAffected( affected = OSVAffected(
package=OSVPackage( package=OSVPackage(
@ -218,8 +218,8 @@ def to_osv_advisory(ui_url: str, advisory: Advisory) -> OSVAdvisory:
modified=to_rfc3339_date(advisory.updated_at), modified=to_rfc3339_date(advisory.updated_at),
published=to_rfc3339_date(advisory.published_at), published=to_rfc3339_date(advisory.published_at),
withdrawn=None, withdrawn=None,
aliases=[x.cve for x in advisory.cves], aliases=None,
related=None, related=[x.cve for x in advisory.cves],
summary=advisory.synopsis, summary=advisory.synopsis,
details=advisory.description, details=advisory.description,
severity=severity, severity=severity,
@ -231,9 +231,7 @@ def to_osv_advisory(ui_url: str, advisory: Advisory) -> OSVAdvisory:
@router.get( @router.get(
"/", "/", response_model=Pagination[OSVAdvisory], response_model_exclude_none=True
response_model=Pagination[OSVAdvisory],
response_model_exclude_none=True
) )
async def get_advisories_osv( async def get_advisories_osv(
params: Params = Depends(), params: Params = Depends(),
@ -266,23 +264,24 @@ async def get_advisories_osv(
page = create_page(osv_advisories, count, params) page = create_page(osv_advisories, count, params)
state = await RedHatIndexState.first() state = await RedHatIndexState.first()
page.last_updated_at = state.last_indexed_at.isoformat("T").replace( page.last_updated_at = (
state.last_indexed_at.isoformat("T").replace(
"+00:00", "+00:00",
"", "",
) + "Z" )
+ "Z"
)
return page return page
@router.get( @router.get(
"/{advisory_id}", "/{advisory_id}", response_model=OSVAdvisory, response_model_exclude_none=True
response_model=OSVAdvisory,
response_model_exclude_none=True
) )
async def get_advisory_osv(advisory_id: str): async def get_advisory_osv(advisory_id: str):
advisory = await Advisory.filter( advisory = (
name=advisory_id, kind="Security" await Advisory.filter(name=advisory_id, kind="Security")
).prefetch_related( .prefetch_related(
"packages", "packages",
"cves", "cves",
"fixes", "fixes",
@ -290,7 +289,9 @@ async def get_advisory_osv(advisory_id: str):
"packages", "packages",
"packages__supported_product", "packages__supported_product",
"packages__supported_products_rh_mirror", "packages__supported_products_rh_mirror",
).get_or_none() )
.get_or_none()
)
if not advisory: if not advisory:
raise HTTPException(404) raise HTTPException(404)