fix: added "" around strings (#1228)

* fix: added "" around output strings

* fix: isort and black

Author: peb-peb

cve_bin_tool/helper_script.py

@@ -144,6 +144,8 @@ def search_pattern(self, string_list):
     def search_version_string(self, matched_list):
         """finds version strings from matched list"""
 
+        # pattern = rf"{self.product}(.*){self.version}"
+        # ^ this does not work for debian packages
         pattern = rf"{self.product}(.*)([0-9]+[.-][0-9]+([.-][0-9]+)?)"
         # this matches patterns like:
         # product1.2.3
@@ -153,15 +155,15 @@ def search_version_string(self, matched_list):
         # product version 1.2.3
         # product v1.2.3(1)
 
-        version_string = [
+        version_strings = [
             i
             for i in matched_list
             if re.search(pattern, i, re.IGNORECASE)
             if not i.endswith(
                 ".debug"
             )  # removes .debug, so, this does not gets printed
         ]
-        return version_string
+        return version_strings
 
     def parse_filename(self, filename):
         """
@@ -224,7 +226,7 @@ def find_vendor_product(self):
                     textwrap.dedent(
                         f"""
                             ============================================
-                            Multiple (vendor, product) pairs found.
+                            Multiple ("vendor", "product") pairs found.
                             Please manually select the appropriate pair.
                             ============================================
                         """
@@ -266,15 +268,15 @@ def output(self):
         for common_strings in sorted(self.contain_patterns):
             if ".debug" in common_strings:
                 rprint(
-                    f"\t[medium_orchid1]{common_strings}[/] <--- not recommended to use these form of strings"
+                    f'\t[red]r"{common_strings}"[/] <--- not recommended to use these form of strings'
                 )
                 continue  # without this, the else statement was getting printed ;-;
             if ".so" in common_strings:
                 rprint(
-                    f"\t[medium_orchid1]{common_strings}[/] <--- not recommended to use these form of strings"
+                    f'\t[red]r"{common_strings}"[/] <--- not recommended to use these form of strings'
                 )
             else:
-                rprint(f"\t[green]{common_strings}[/],")
+                rprint(f'\t[green]r"{common_strings}"[/],')
         print("]")
 
         """
@@ -288,23 +290,23 @@ def output(self):
         for filename in self.filename_pattern:
             if self.product == filename:
                 rprint(
-                    f"\t[medium_orchid1]{filename}[/] <--- this is a really common filename pattern"
+                    f'\t[cyan]r"{filename}"[/], <--- this is a really common filename pattern'
                 )
             elif self.product in filename:
                 if ".so" in filename:
-                    rprint(f"\t[green]{filename}[/]")
+                    rprint(f'\t[green]r"{filename}"[/],')
                 else:
                     rprint(
-                        f'\t[red]{filename}[/] <--- you could just use "{self.product}" to match this file'
+                        f'\t[bright_green]r"{filename}"[/], <--- you could just use "{self.product}" to match this file'
                     )  # to single-handedly match filenames of type varnishd, varnishlog, varnishtop, etc.
             else:
-                rprint(f"\t[green]{filename}[/]")
+                rprint(f'\t[green]r"{filename}"[/],')
         print("]")
 
         # output: version-strings
         print("VERSION_PATTERNS = [")
         for version_string in self.version_pattern:
-            rprint(f"\t[green]{version_string}[/],")
+            rprint(f'\t[green]r"{version_string}"[/],')
         print("]")
 
         # output: vendor-product pair