Skip to content

CycloneDX 1.3 #13

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 1 commit into from
Jan 5, 2022
Merged

CycloneDX 1.3 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion scripts/cyclonedx-wrapper.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<schema elementFormDefault="qualified" xmlns="http://www.w3.org/2001/XMLSchema">
<import namespace="http://cyclonedx.org/schema/spdx" schemaLocation="spdx.xsd"/>
<import namespace="http://cyclonedx.org/schema/bom/1.2" schemaLocation="cyclonedx.xsd"/>
<import namespace="http://cyclonedx.org/schema/bom/1.3" schemaLocation="cyclonedx.xsd"/>
</schema>
21 changes: 18 additions & 3 deletions scripts/sbom_scraper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,21 @@ do
fi
done

SYFT_VERSION=$(syft version | grep '^Version' | tr -s ' ' | cut -d' ' -f2)
compare_version() {
local x=$1
first=${x%%.*} # Delete first dot and what follows.
last=${x##*.} # Delete up to last dot.
mid=${x##"$first".} # Delete first number and dot.
mid=${mid%%."$last"} # Delete dot and last number.
if [ "$mid" -lt 34 ]
then
echo >&2 "syft must be at least version 0.34.0"
exit 10
fi
}
compare_version "${SYFT_VERSION}"

set -e
set -u

Expand Down Expand Up @@ -68,7 +83,7 @@ URL=https://app.rkvst.io
usage() {
cat >&2 <<EOF

Create a Cyclone DX 1.2 XML SBOM from a docker image and upload to RKVST SBOM Hub
Create a Cyclone DX 1.3 XML SBOM from a docker image and upload to RKVST SBOM Hub

Usage: $SCRIPTNAME [-a AUTHOR_NAME] [-A COMPONENT_AUTHOR] [-c CLIENT_SECRET_FILE] [-e AUTHOR_EMAIL] [-sp] [-u URL] CLIENT_ID [docker-image:tag|sbom file|jar URL]

Expand Down Expand Up @@ -284,8 +299,8 @@ def indent(elem, level=0):
if level and (not elem.tail or not elem.tail.strip()):
elem.tail = i

ET.register_namespace('', 'http://cyclonedx.org/schema/bom/1.2')
ns = {'': 'http://cyclonedx.org/schema/bom/1.2'}
ET.register_namespace('', 'http://cyclonedx.org/schema/bom/1.3')
ns = {'': 'http://cyclonedx.org/schema/bom/1.3'}

# Open original file
et = ET.parse(sys.stdin)
Expand Down