Skip to content

Handle two version of syft #19

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
merged 3 commits into from
Aug 19, 2022
Merged

Handle two version of syft #19

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5e0bd3
#6211 add alternative version of syft for jar files
Jul 29, 2022
f7821f7
#6211 deal with the case we have no metadata in xml
Jul 29, 2022
e79fe24
#6211 make xml modification more resilent
Aug 1, 2022
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
22 changes: 17 additions & 5 deletions scripts/sbom_scraper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ then
INPUT=$(ls)
OUTFILE=${INPUT}.${FORMAT}.sbom
OUTPUT="${TEMPDIR}/${OUTFILE}"
syft -q packages --scope all-layers -o "${FORMAT}" "file:${INPUT}" > "${OUTPUT}"
syftjar -q packages --scope all-layers -o "${FORMAT}" "file:${INPUT}" > "${OUTPUT}"
popd > /dev/null

COMPONENT_NAME=$(xq -r .bom.metadata.component.name "$OUTPUT")
Expand Down Expand Up @@ -403,11 +403,14 @@ et = ET.parse(sys.stdin)
root = et.getroot()

metadata = root.find('metadata', ns)
if not metadata:
metadata = ET.SubElement(root, 'metadata')

# Add this tool
tools = metadata.find('tools', ns)
if not tools:
tools = ET.SubElement(metadata, 'tools')

tool = ET.SubElement(tools, 'tool')
ET.SubElement(tool, 'vendor').text = '$TOOL_VENDOR'
ET.SubElement(tool, 'name').text = '$TOOL_NAME'
Expand All @@ -426,6 +429,8 @@ ET.SubElement(author, 'name').text = '$AUTHOR_NAME'
ET.SubElement(author, 'email').text = '$AUTHOR_EMAIL'

component = metadata.find('component', ns)
if not component:
component = ET.SubElement(metadata, 'component')

# Update component publisher and author
publisher = component.find('publisher', ns)
Expand All @@ -436,14 +441,21 @@ publisher.text = '$COMPONENT_AUTHOR_NAME'
author = component.find('author', ns)
if not author:
author = ET.Element('author')
component.insert(0, author)
component.insert(1, author)
author.text = '$COMPONENT_AUTHOR_NAME'

# Update component name and version
component.find('name', ns).text = '$COMPONENT_NAME'
name = component.find('name', ns)
if not name:
name = ET.SubElement(component, 'name')

name.text = '$COMPONENT_NAME'
component_version = '$COMPONENT_VERSION'
if component_version:
component.find('version', ns).text = component_version
version = component.find('version', ns)
if not version:
version = ET.SubElement(component, 'version')
version.text = component_version

# Update component hash
component_hash_alg = '${COMPONENT_HASH_ALG}'
Expand All @@ -458,7 +470,7 @@ if component_hash_alg:
supplier = component.find('supplier', ns)
if not supplier:
supplier = ET.Element('supplier')
component.insert(0, supplier)
component.insert(4, supplier)
ET.SubElement(supplier, 'name').text = '$SUPPLIER_NAME'
ET.SubElement(supplier, 'url').text = '$SUPPLIER_URL'

Expand Down