From 6c264b68d4e751df98e3a1ff4c912f037e4e741d Mon Sep 17 00:00:00 2001
From: Eric Brown <ericwb@users.noreply.github.com>
Date: Sat, 19 Dec 2020 00:16:01 -0800
Subject: [PATCH] Show column offset on all formatters (#673)

Recently, #618 introduced column offsets to the custom formatter.
But other formatters should also show the column offset.

Signed-off-by: Eric Brown <browne@vmware.com>
---
 bandit/formatters/csv.py             | 1 +
 bandit/formatters/screen.py          | 5 +++--
 bandit/formatters/text.py            | 5 +++--
 tests/unit/formatters/test_screen.py | 6 ++++--
 tests/unit/formatters/test_text.py   | 6 ++++--
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/bandit/formatters/csv.py b/bandit/formatters/csv.py
index 1fc5878e8..14e18c597 100644
--- a/bandit/formatters/csv.py
+++ b/bandit/formatters/csv.py
@@ -59,6 +59,7 @@ def report(manager, fileobj, sev_level, conf_level, lines=-1):
                       'issue_confidence',
                       'issue_text',
                       'line_number',
+                      'col_offset',
                       'line_range',
                       'more_info']
 
diff --git a/bandit/formatters/screen.py b/bandit/formatters/screen.py
index 2f7f84fc7..d501dff54 100644
--- a/bandit/formatters/screen.py
+++ b/bandit/formatters/screen.py
@@ -102,9 +102,10 @@ def _output_issue_str(issue, indent, show_lineno=True, show_code=True,
     bits.append("%s   Severity: %s   Confidence: %s" % (
         indent, issue.severity.capitalize(), issue.confidence.capitalize()))
 
-    bits.append("%s   Location: %s:%s" % (
+    bits.append("%s   Location: %s:%s:%s" % (
         indent, issue.fname,
-        issue.lineno if show_lineno else ""))
+        issue.lineno if show_lineno else "",
+        issue.col_offset if show_lineno else ""))
 
     bits.append("%s   More Info: %s%s" % (
         indent, docs_utils.get_url(issue.test_id), COLOR['DEFAULT']))
diff --git a/bandit/formatters/text.py b/bandit/formatters/text.py
index 10f044f61..dbb2cf5d4 100644
--- a/bandit/formatters/text.py
+++ b/bandit/formatters/text.py
@@ -76,8 +76,9 @@ def _output_issue_str(issue, indent, show_lineno=True, show_code=True,
     bits.append("%s   Severity: %s   Confidence: %s" % (
         indent, issue.severity.capitalize(), issue.confidence.capitalize()))
 
-    bits.append("%s   Location: %s:%s" % (
-        indent, issue.fname, issue.lineno if show_lineno else ""))
+    bits.append("%s   Location: %s:%s:%s" % (
+        indent, issue.fname, issue.lineno if show_lineno else "",
+        issue.col_offset if show_lineno else ""))
 
     bits.append("%s   More Info: %s" % (
         indent, docs_utils.get_url(issue.test_id)))
diff --git a/tests/unit/formatters/test_screen.py b/tests/unit/formatters/test_screen.py
index 12dca6881..533abbd16 100644
--- a/tests/unit/formatters/test_screen.py
+++ b/tests/unit/formatters/test_screen.py
@@ -35,8 +35,9 @@ def _template(_issue, _indent_val, _code, _color):
                           "{}   Severity: {}   Confidence: {}".
                           format(_indent_val, _issue.severity.capitalize(),
                                  _issue.confidence.capitalize()),
-                          "{}   Location: {}:{}".
-                          format(_indent_val, _issue.fname, _issue.lineno),
+                          "{}   Location: {}:{}:{}".
+                          format(_indent_val, _issue.fname, _issue.lineno,
+                                 _issue.col_offset),
                           "{}   More Info: {}{}".format(
                               _indent_val, docs_utils.get_url(_issue.test_id),
                               screen.COLOR['DEFAULT'])]
@@ -56,6 +57,7 @@ def _template(_issue, _indent_val, _code, _color):
         self.assertEqual(expected_return, issue_text)
 
         issue.lineno = ''
+        issue.col_offset = ''
         issue_text = screen._output_issue_str(issue, indent_val,
                                               show_lineno=False)
         expected_return = _template(issue, indent_val, 'DDDDDDD',
diff --git a/tests/unit/formatters/test_text.py b/tests/unit/formatters/test_text.py
index 355ace979..f31051b5b 100644
--- a/tests/unit/formatters/test_text.py
+++ b/tests/unit/formatters/test_text.py
@@ -35,8 +35,9 @@ def _template(_issue, _indent_val, _code):
                           "{}   Severity: {}   Confidence: {}".
                           format(_indent_val, _issue.severity.capitalize(),
                                  _issue.confidence.capitalize()),
-                          "{}   Location: {}:{}".
-                          format(_indent_val, _issue.fname, _issue.lineno),
+                          "{}   Location: {}:{}:{}".
+                          format(_indent_val, _issue.fname, _issue.lineno,
+                                 _issue.col_offset),
                           "{}   More Info: {}".format(
                               _indent_val, docs_utils.get_url(_issue.test_id))]
             if _code:
@@ -53,6 +54,7 @@ def _template(_issue, _indent_val, _code):
         self.assertEqual(expected_return, issue_text)
 
         issue.lineno = ''
+        issue.col_offset = ''
         issue_text = b_text._output_issue_str(issue, indent_val,
                                               show_lineno=False)
         expected_return = _template(issue, indent_val, 'DDDDDDD')