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

added new URLs for oval data. (#19)

Browse Source
This commit is contained in:
dferrisctrliq 2023-08-08 05:05:25 -07:00 committed by GitHub
parent 91bdc7ce41
commit 02e062f0d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apollo/rhworker/poll_rh_activities.py
View File

@ -42,17 +42,19 @@ async def get_last_indexed_date() -> Optional[str]:
async def fetch_mapped_oval() -> dict[str, ET.ElementTree]: async def fetch_mapped_oval() -> dict[str, ET.ElementTree]:
# Download the oval_url using aiohttp, decompress using bzip and parse # Download the oval_url using aiohttp, decompress using bzip and parse
oval_url = ( oval_urls = (
"https://access.redhat.com/security/data/oval/com.redhat.rhsa-all.xml.bz2" 'https://access.redhat.com/security/data/oval/v2/RHEL8/rhel-8.oval.xml.bz2',
'https://access.redhat.com/security/data/oval/v2/RHEL9/rhel-9.oval.xml.bz2',
) )
def_map = {}
for url in oval_urls:
async with aiohttp.ClientSession() as session: async with aiohttp.ClientSession() as session:
async with session.get(oval_url) as response: async with session.get(url) as response:
if response.status == 200: if response.status == 200:
data = await response.read() data = await response.read()
tree = ET.fromstring(bz2.decompress(data)) tree = ET.fromstring(bz2.decompress(data))
# Index by advisory name # Index by advisory name
def_map = {}
definitions = tree.findall("definitions/definition", OVAL_NS) definitions = tree.findall("definitions/definition", OVAL_NS)
for definition in definitions: for definition in definitions:
def_id = definition.attrib["id"] def_id = definition.attrib["id"]
@ -60,10 +62,10 @@ async def fetch_mapped_oval() -> dict[str, ET.ElementTree]:
name = f"{id_split[1].split('.')[2].upper()}-{id_split[3][0:4]}:{id_split[3][4:]}" name = f"{id_split[1].split('.')[2].upper()}-{id_split[3][0:4]}:{id_split[3][4:]}"
def_map[name] = definition def_map[name] = definition
return def_map
else: else:
raise Exception("Failed to fetch OVAL data") raise Exception("Failed to fetch OVAL data")
return def_map
@activity.defn @activity.defn
async def get_rh_advisories(from_timestamp: str = None) -> None: async def get_rh_advisories(from_timestamp: str = None) -> None: