Skip to content

refactor: find SBOM product vendor (#1477) #1481

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.

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 25 commits into from
Dec 27, 2021
Merged
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
771960a
Merge pull request #1 from intel/master
anthonyharrison May 27, 2020
20d6262
Merge remote-tracking branch 'upstream/master'
anthonyharrison Jun 1, 2020
5ab2c87
Merge remote-tracking branch 'upstream/master'
anthonyharrison Jul 18, 2020
ea57d05
Merge remote-tracking branch 'upstream/master'
anthonyharrison Aug 20, 2020
c2a8d1c
Merge remote-tracking branch 'upstream/master'
anthonyharrison Sep 1, 2020
7035ae9
Merge remote-tracking branch 'upstream/master'
anthonyharrison Sep 2, 2020
aaba9eb
Merge remote-tracking branch 'upstream/master'
anthonyharrison Sep 18, 2020
3b91b0e
Merge remote-tracking branch 'upstream/master'
anthonyharrison Oct 18, 2020
13fa1a8
Merge remote-tracking branch 'upstream/master'
anthonyharrison Nov 8, 2020
5db21eb
Merge remote-tracking branch 'upstream/master'
anthonyharrison Mar 14, 2021
9418560
Merge branch 'main'
anthonyharrison Mar 14, 2021
0f3f754
Merge branch 'main'
anthonyharrison Mar 24, 2021
9e04dab
Merge remote-tracking branch 'refs/remotes/upstream/main'
anthonyharrison May 30, 2021
da7e34a
Merge branch 'intel:main' into master
anthonyharrison Jun 20, 2021
8c9ea48
Merge branch 'intel:main' into master
anthonyharrison Jun 27, 2021
9581317
Merge branch 'intel:main' into master
anthonyharrison Jul 12, 2021
c59de25
Merge branch 'intel:main' into master
anthonyharrison Jul 25, 2021
bf5908a
Merge branch 'intel:main' into master
anthonyharrison Sep 3, 2021
2505e10
Merge branch 'intel:main' into master
anthonyharrison Sep 23, 2021
589b93d
Merge branch 'intel:main' into master
anthonyharrison Oct 13, 2021
42757cb
Merge branch 'intel:main' into master
anthonyharrison Oct 27, 2021
0f519a3
Merge branch 'intel:main' into master
anthonyharrison Nov 3, 2021
4016283
Merge remote-tracking branch 'upstream/main'
anthonyharrison Dec 5, 2021
cd7b07a
Merge remote-tracking branch 'upstream/main'
anthonyharrison Dec 9, 2021
40d32cc
refactor: find SBOM product vendor (#1477)
anthonyharrison Dec 26, 2021
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
21 changes: 5 additions & 16 deletions cve_bin_tool/sbom_manager/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Copyright (C) 2021 Anthony Harrison
# SPDX-License-Identifier: GPL-3.0-or-later

import sqlite3
from collections import defaultdict
from logging import Logger
from typing import DefaultDict, Dict, List, Optional
Expand Down Expand Up @@ -83,21 +82,11 @@ def scan_file(self) -> Dict[ProductInfo, TriageData]:
return self.sbom_data

def get_vendor(self, product: str) -> Optional[str]:
self.cvedb.db_open()
if not self.cvedb.connection:
raise ConnectionError()
self.cursor = self.cvedb.connection.cursor()
get_vendor_request = "SELECT DISTINCT VENDOR FROM cve_range where PRODUCT=?"
self.cursor.execute(get_vendor_request, [product])
try:
# If multiple unique vendors then shouldn't proceed....
vendor = self.cursor.fetchone()[0]
# print(f"{product} is produced by {vendor}")
except (sqlite3.Error, TypeError) as e:
LOGGER.debug(e, exc_info=True)
vendor = None
self.cvedb.db_close()
return vendor
vendor_package_pair = self.cvedb.get_vendor_product_pairs(product)
if vendor_package_pair != []:
vendor = vendor_package_pair[0]["vendor"]
return vendor
return None


if __name__ == "__main__":
Expand Down