From b48568d9b68a85203e10667b68fb1e92d80ca38e Mon Sep 17 00:00:00 2001
From: Philip Barwikowski <philip.barwi@web.de>
Date: Fri, 2 Aug 2019 10:53:18 +0200
Subject: [PATCH 1/2] Use list and add info to finding

Use a list of findings and print these at the end. This way they are easier to find if you are going over a large number of files. Also add the match so it is easier to identify false positives
---
 cred_scanner.py | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/cred_scanner.py b/cred_scanner.py
index e72cdcc..2cbe623 100644
--- a/cred_scanner.py
+++ b/cred_scanner.py
@@ -7,29 +7,30 @@
 @click.option('--path', default='.', help='Path other than the local directory to scan')
 @click.option('--secret', is_flag=True, help='Also look for Secret Key patterns. This may result in many false matches due to the nature of secret keys.')
 def scan(path, secret):
-    fail = False
+    findings = []
     for dirname, dirnames, filenames in os.walk(path):
         # print path to all subdirectories first.
         for subdirname in dirnames:
             print(os.path.join(dirname, subdirname))
 
         # print path to all filenames.
-        for filename in filenames:
-            click.echo(os.path.join(dirname, filename))
-            f = open(os.path.join(dirname, filename))
-            if secret:
-                pattern = re.compile('(?<![A-Z0-9])[A-Z0-9]{20}(?![A-Z0-9])|(?<![A-Za-z0-9/+=])[A-Za-z0-9/+=]{40}(?![A-Za-z0-9/+=])')
-            else:
-                pattern = re.compile('(?<![A-Z0-9])[A-Z0-9]{20}(?![A-Z0-9])')
-            try:
-                for i, line in enumerate(f):
-                    for match in re.finditer(pattern, line):
-                        click.secho('Found AWS Access Key in ' + os.path.join(dirname, filename,), fg='red')
-                        fail = True
-            except UnicodeDecodeError:
-                click.secho("Can't scan file due to type: " + os.path.join(dirname, filename), fg='red')
-                pass
-    if fail == True:
+            for filename in filenames:
+                click.echo(os.path.join(dirname, filename))
+                f = open(os.path.join(dirname, filename))
+                if secret:
+                    pattern = re.compile('(?<![A-Z0-9])[A-Z0-9]{20}(?![A-Z0-9])|(?<![A-Za-z0-9/+=])[A-Za-z0-9/+=]{40}(?![A-Za-z0-9/+=])')
+                else:
+                    pattern = re.compile('(?<![A-Z0-9])[A-Z0-9]{20}(?![A-Z0-9])')
+                try:
+                    for i, line in enumerate(f):
+                        for match in re.finditer(pattern, line):
+                            findings.append('Found AWS Access Key in ' + os.path.join(dirname, filename,) + "\n" + str(match))
+                except UnicodeDecodeError:
+                    click.secho("Can't scan file due to type: " + os.path.join(dirname, filename), fg='yellow')
+                    pass
+    if findings:
+        for finding in findings:
+            click.secho(finding, fg='red')
         sys.exit(1)
 if __name__ == "__main__":
-    scan()
\ No newline at end of file
+    scan()

From 458c0668d9c4d8487da6a436dcf39c3805e1d800 Mon Sep 17 00:00:00 2001
From: Philip Barwikowski <philip.barwi@web.de>
Date: Fri, 2 Aug 2019 10:54:45 +0200
Subject: [PATCH 2/2] Refactor indentation

---
 cred_scanner.py | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/cred_scanner.py b/cred_scanner.py
index 2cbe623..1284497 100644
--- a/cred_scanner.py
+++ b/cred_scanner.py
@@ -14,21 +14,21 @@ def scan(path, secret):
             print(os.path.join(dirname, subdirname))
 
         # print path to all filenames.
-            for filename in filenames:
-                click.echo(os.path.join(dirname, filename))
-                f = open(os.path.join(dirname, filename))
-                if secret:
-                    pattern = re.compile('(?<![A-Z0-9])[A-Z0-9]{20}(?![A-Z0-9])|(?<![A-Za-z0-9/+=])[A-Za-z0-9/+=]{40}(?![A-Za-z0-9/+=])')
-                else:
-                    pattern = re.compile('(?<![A-Z0-9])[A-Z0-9]{20}(?![A-Z0-9])')
-                try:
-                    for i, line in enumerate(f):
-                        for match in re.finditer(pattern, line):
-                            findings.append('Found AWS Access Key in ' + os.path.join(dirname, filename,) + "\n" + str(match))
-                except UnicodeDecodeError:
-                    click.secho("Can't scan file due to type: " + os.path.join(dirname, filename), fg='yellow')
-                    pass
-    if findings:
+        for filename in filenames:
+            click.echo(os.path.join(dirname, filename))
+            f = open(os.path.join(dirname, filename))
+            if secret:
+                pattern = re.compile('(?<![A-Z0-9])[A-Z0-9]{20}(?![A-Z0-9])|(?<![A-Za-z0-9/+=])[A-Za-z0-9/+=]{40}(?![A-Za-z0-9/+=])')
+            else:
+                pattern = re.compile('(?<![A-Z0-9])[A-Z0-9]{20}(?![A-Z0-9])')
+            try:
+                for i, line in enumerate(f):
+                    for match in re.finditer(pattern, line):
+                        findings.append('Found AWS Access Key in ' + os.path.join(dirname, filename,) + "\n" + str(match))
+            except UnicodeDecodeError:
+                click.secho("Can't scan file due to type: " + os.path.join(dirname, filename), fg='yellow')
+                pass
+    if len(findings) > 0:
         for finding in findings:
             click.secho(finding, fg='red')
         sys.exit(1)