Skip to content

Commit 0ab272d

Browse files
committed
Modify when exceeding the max. url length
1 parent 02c3cf1 commit 0ab272d

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/fosslight_binary/_binary.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,15 @@ def set_oss_items(self, new_oss_list, exclude=False, exclude_msg=""):
5050
self.oss_items.extend(new_oss_list)
5151

5252
def get_vulnerability_items(self):
53-
nvd_url = [urllib.parse.unquote(vul_item.nvd_url) for vul_item in self.vulnerability_items]
54-
return ", ".join(nvd_url).strip()
53+
nvd_url = set([urllib.parse.unquote(vul_item.nvd_url) for vul_item in self.vulnerability_items])
54+
nvd_url = ", ".join(nvd_url).strip()
55+
56+
if nvd_url and len(nvd_url) > MAX_EXCEL_URL_LENGTH:
57+
nvd_url_msg = f"Exceeded the maximum length of {MAX_EXCEL_URL_LENGTH} characters.\n"
58+
nvd_url_msg += f"Please check the URL: {nvd_url}"
59+
return nvd_url_msg
60+
else:
61+
return nvd_url
5562

5663
def get_print_binary_only(self):
5764
return (self.source_name_or_path + "\t" + self.checksum + "\t" + self.tlsh)
@@ -63,11 +70,6 @@ def get_print_array(self):
6370
lic = ",".join(oss.license)
6471
exclude = EXCLUDE_TRUE_VALUE if (self.exclude or oss.exclude) else ""
6572
nvd_url = self.get_vulnerability_items()
66-
if nvd_url and len(nvd_url) > MAX_EXCEL_URL_LENGTH:
67-
logger.info(f"self.source_name_or_path: {self.source_name_or_path}")
68-
logger.info(f"oss name: {oss.name}")
69-
logger.info(f"length_url:{len(nvd_url)}, nvd_url: {nvd_url}")
70-
nvd_url = nvd_url[:242] + '...(truncated)'
7173
items.append([self.source_name_or_path, oss.name, oss.version,
7274
lic, oss.download_location, oss.homepage,
7375
oss.copyright, exclude, oss.comment,

0 commit comments

Comments
 (0)