fix: Columns overrun in PDF Reports (#1219)

* fix: columns overrun in PDF report

* fix: columns overrun in PDF reports (#1207)
fixes #1207

Author: anthonyharrison

cve_bin_tool/output_engine/__init__.py

@@ -146,6 +146,7 @@ def output_pdf(
             "Productlist",
             ["Vendor", "Product", "Version", "CVE Number", "Severity"],
             pdfdoc.tblStyle,
+            [10, 10, None, None, None],
         )
         row = 1
         star_warn = False
@@ -176,7 +177,7 @@ def output_pdf(
                     )
                     row += 1
 
-        pdfdoc.showtable("Productlist", widths=[3 * cm, 2 * cm, 2 * cm, 4 * cm, 3 * cm])
+        pdfdoc.showtable("Productlist", widths=[3 * cm, 3 * cm, 2 * cm, 4 * cm, 3 * cm])
     pdfdoc.paragraph("* vendors guessed by the tool") if star_warn else None
 
     pdfdoc.pagebreak()

cve_bin_tool/output_engine/pdfbuilder.py

@@ -149,6 +149,8 @@ def __init__(self, includeTOC=True):
         self.toc.levelStyles = [self.toc_h1, self.toc_h2]
         self.headingnumber = [0, 0, 0, 0]
         self.table_data = []
+        self.note_data = []
+        self.table_validation = None
 
     def _spacer(self):
         self.contents.append(self.spacer)
@@ -187,18 +189,43 @@ def paragraph(self, text, style=None):
             self.contents.append(Paragraph(text, style))
         self._spacer()
 
-    def createtable(self, ident, header, style):
+    def createtable(self, ident, header, style, validation=None):
         # Layout is [headings, ....]
         self.table_data = []
         self.table_style = style
         self.table_ident = ident
+        # Validation is list of items indicating max length of item in each column.
+        # None indicates no limit for column
+        if validation is not None:
+            # Assume validation for all columns provided
+            self.table_validation = validation
+        else:
+            # No validation specified
+            self.table_validation = [None] * len(header)
         if header:
             self.addrow(ident, header)
 
+    def validatedata(self, data):
+        i = 0
+        newdata = []
+        for d in data:
+            if self.table_validation[i] is not None:
+                # Column size validation
+                if len(d) > self.table_validation[i]:
+                    if d not in self.note_data:
+                        self.note_data.append(d)
+                    newdata.append("Note " + str(self.note_data.index(d) + 1))
+                else:
+                    newdata.append(d)
+            else:
+                newdata.append(d)
+            i += 1
+        return newdata
+
     def addrow(self, ident, data, style=None):
         # Add row to table
         if self.table_ident == ident:
-            self.table_data.append(data)
+            self.table_data.append(self.validatedata(data))
             if style != None:
                 for s in style:
                     # Only take first 4 parameters in each style setting
@@ -211,6 +238,15 @@ def showtable(self, ident, widths=None):
             tbl.setStyle(self.table_style)
             self.contents.append(tbl)
             self.table_ident = None
+            # Optional notes if data in columns truncated
+            if len(self.note_data) > 0:
+                notes = ["<br/><u>Notes</u>"]
+                i = 1
+                for d in self.note_data:
+                    notes.append(str(i) + ". " + d)
+                    i += 1
+                self.paragraph("<br/>".join(notes))
+                self.note_data = []
             self._spacer()
 
     def pagebreak(self):