Merge pull request #110 from maennel/bugfix/wrong-commit-hash

Bugfix: Fix return of wrong commit hash

Author: dxa4481

test_all.py

@@ -1,5 +1,8 @@
 import unittest
 import os
+import sys
+import json
+import io
 from truffleHog import truffleHog
 from mock import patch 
 from mock import MagicMock
@@ -24,6 +27,37 @@ def test_unicode_expection(self):
         except UnicodeEncodeError:
             self.fail("Unicode print error")
 
+    def test_return_correct_commit_hash(self):
+        # Start at commit d15627104d07846ac2914a976e8e347a663bbd9b, which 
+        # is immediately followed by a secret inserting commit:
+        # https://github.com/dxa4481/truffleHog/commit/9ed54617547cfca783e0f81f8dc5c927e3d1e345
+        since_commit = 'd15627104d07846ac2914a976e8e347a663bbd9b'
+        commit_w_secret = '9ed54617547cfca783e0f81f8dc5c927e3d1e345'
+        cross_valdiating_commit_w_secret_comment = 'OH no a secret'
+
+        json_result = ''
+        if sys.version_info >= (3,):
+            tmp_stdout = io.StringIO()
+        else:
+            tmp_stdout = io.BytesIO()
+        bak_stdout = sys.stdout
+
+        # Redirect STDOUT, run scan and re-establish STDOUT
+        sys.stdout = tmp_stdout
+        try:
+            truffleHog.find_strings("https://github.com/dxa4481/truffleHog.git", 
+                since_commit=since_commit, printJson=True, surpress_output=False)
+        finally:
+            sys.stdout = bak_stdout
+
+        json_result_list = tmp_stdout.getvalue().split('\n')
+        results = [json.loads(r) for r in json_result_list if bool(r.strip())]
+        filtered_results = list(filter(lambda r: r['commitHash'] == commit_w_secret, results))
+        self.assertEqual(1, len(filtered_results))
+        self.assertEqual(commit_w_secret, filtered_results[0]['commitHash'])
+        # Additionally, we cross-validate the commit comment matches the expected comment
+        self.assertEqual(cross_valdiating_commit_w_secret_comment, filtered_results[0]['commit'].strip())
+
     @patch('truffleHog.truffleHog.clone_git_repo')
     @patch('truffleHog.truffleHog.Repo')
     def test_branch(self, repo_const_mock, clone_git_repo):