formatters

PyCQA · May 14, 2020 · 65e18eb · 65e18eb
1 parent 42f79f8
commit 65e18eb
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 deletions.
diff --git a/bandit/formatters/csv.py b/bandit/formatters/csv.py
@@ -56,6 +56,7 @@ def report(manager, fileobj, sev_level, conf_level, lines=-1):
                       'test_name',
                       'test_id',
                       'issue_severity',
+                      'issue_cwe',
                       'issue_confidence',
                       'issue_text',
                       'line_number',

diff --git a/bandit/formatters/html.py b/bandit/formatters/html.py
@@ -266,6 +266,7 @@ def report(manager, fileobj, sev_level, conf_level, lines=-1):
     <b>{test_name}: </b> {test_text}<br>
     <b>Test ID:</b> {test_id}<br>
     <b>Severity: </b>{severity}<br>
+    <b>CWE: </b>{cwe}<br>
     <b>Confidence: </b>{confidence}<br>
     <b>File: </b><a href="{path}" target="_blank">{path}</a> <br>
     <b>More info: </b><a href="{url}" target="_blank">{url}</a><br>
@@ -360,6 +361,7 @@ def report(manager, fileobj, sev_level, conf_level, lines=-1):
                                           test_id=issue.test_id,
                                           test_text=issue.text,
                                           severity=issue.severity,
+                                          cwe=issue.cwe,
                                           confidence=issue.confidence,
                                           path=issue.fname, code=code,
                                           candidates=candidates,

diff --git a/bandit/formatters/screen.py b/bandit/formatters/screen.py
@@ -97,10 +97,12 @@ def _output_issue_str(issue, indent, show_lineno=True, show_code=True,
     # returns a list of lines that should be added to the existing lines list
     bits = []
     bits.append("%s%s>> Issue: [%s:%s] %s" % (
-        indent, COLOR[issue.severity], issue.test_id, issue.test, issue.text))
+        indent, COLOR[issue.severity], issue.test_id, issue.test,
+        issue.text))
 
-    bits.append("%s   Severity: %s   Confidence: %s" % (
-        indent, issue.severity.capitalize(), issue.confidence.capitalize()))
+    bits.append("%s   Severity: %s CWE: %i Confidence: %s" % (
+        indent, issue.severity.capitalize(), issue.cwe,
+        issue.confidence.capitalize()))
 
     bits.append("%s   Location: %s:%s" % (
         indent, issue.fname,

diff --git a/bandit/formatters/text.py b/bandit/formatters/text.py
@@ -73,8 +73,8 @@ def _output_issue_str(issue, indent, show_lineno=True, show_code=True,
     bits.append("%s>> Issue: [%s:%s] %s" % (
         indent, issue.test_id, issue.test, issue.text))
 
-    bits.append("%s   Severity: %s   Confidence: %s" % (
-        indent, issue.severity.capitalize(), issue.confidence.capitalize()))
+    bits.append("%s   Severity: %s CWE: %i Confidence: %s" % (
+        indent, issue.severity.capitalize(), issue.cwe, issue.confidence.capitalize()))
 
     bits.append("%s   Location: %s:%s" % (
         indent, issue.fname, issue.lineno if show_lineno else ""))

diff --git a/bandit/formatters/xml.py b/bandit/formatters/xml.py
@@ -60,8 +60,8 @@ def report(manager, fileobj, sev_level, conf_level, lines=-1):
         testcase = ET.SubElement(root, 'testcase',
                                  classname=issue.fname, name=test)
 
-        text = 'Test ID: %s Severity: %s Confidence: %s\n%s\nLocation %s:%s'
-        text = text % (issue.test_id, issue.severity, issue.confidence,
+        text = 'Test ID: %s Severity: %s CWE: %s Confidence: %s\n%s\nLocation %s:%s'
+        text = text % (issue.test_id, issue.severity, issue.cwe, issue.confidence,
                        issue.text, issue.fname, issue.lineno)
         ET.SubElement(testcase, 'error',
                       more_info=docs_utils.get_url(issue.test_id),

diff --git a/tests/unit/formatters/test_screen.py b/tests/unit/formatters/test_screen.py
@@ -32,8 +32,9 @@ def _template(_issue, _indent_val, _code, _color):
             return_val = ["{}{}>> Issue: [{}:{}] {}".
                           format(_indent_val, _color, _issue.test_id,
                                  _issue.test, _issue.text),
-                          "{}   Severity: {}   Confidence: {}".
+                          "{}   Severity: {} CWE: {} Confidence: {}".
                           format(_indent_val, _issue.severity.capitalize(),
+                                 _issue.cwe,
                                  _issue.confidence.capitalize()),
                           "{}   Location: {}:{}".
                           format(_indent_val, _issue.fname, _issue.lineno),

diff --git a/tests/unit/formatters/test_text.py b/tests/unit/formatters/test_text.py
@@ -32,8 +32,9 @@ def _template(_issue, _indent_val, _code):
             return_val = ["{}>> Issue: [{}:{}] {}".
                           format(_indent_val, _issue.test_id, _issue.test,
                                  _issue.text),
-                          "{}   Severity: {}   Confidence: {}".
+                          "{}   Severity: {} CWE: {} Confidence: {}".
                           format(_indent_val, _issue.severity.capitalize(),
+                                 _issue.cwe,
                                  _issue.confidence.capitalize()),
                           "{}   Location: {}:{}".
                           format(_indent_val, _issue.fname, _issue.lineno),
@@ -130,6 +131,7 @@ def test_report_nobaseline(self, get_issue_list):
                               'binding.py (score: ',
                               "CONFIDENCE: 1",
                               "SEVERITY: 1",
+                              "CWE: 123",
                               'Files excluded (1):',
                               'def.py',
                               'Undefined: 1',