Skip to content

Commit 70180e2

Browse files
committed
fixed SBOM mime type detection
1 parent 14e9acd commit 70180e2

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

examples/client/upload_sbom.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,22 +130,22 @@ def find_or_create_project_version(project_name, version_name, project_group):
130130
sys.exit(1)
131131

132132
def get_sbom_mime_type(filename):
133+
import json
133134
with open(filename, 'r') as f:
134-
data = f.readlines()
135-
content = " ".join(data)
136-
if 'CycloneDX' in content:
135+
data = json.load(f)
136+
if data.get('bomFormat', None) == "CycloneDX":
137137
return 'application/vnd.cyclonedx'
138-
if 'SPDX' in content:
138+
elif data.get('spdxVersion', None):
139139
return 'application/spdx'
140140
return None
141141

142142
def upload_sbom_file(filename, project, version, project_group):
143143
find_or_create_project_version(project, version, project_group)
144144
mime_type = get_sbom_mime_type(filename)
145-
print (mime_type)
146145
if not mime_type:
147146
logging.error(f"Could not identify file content for {filename}")
148147
sys.exit(1)
148+
logging.info(f"Mime type {mime_type} will be used for file {filename}")
149149
files = {"file": (filename, open(filename,"rb"), mime_type)}
150150
fields = {"projectName": project, "versionName": version}
151151
response = bd.session.post("/api/scan/data", files = files, data=fields)

0 commit comments

Comments
 (0)