From f36da90ce8905c9428abb942dc7b1adf9fa2cfc2 Mon Sep 17 00:00:00 2001
From: Bob Carroll <bob.carroll@alum.rit.edu>
Date: Thu, 4 May 2023 19:05:32 -0500
Subject: [PATCH 1/2] fix indentation and update for python3

---
 modsec-log-compare.py    | 24 ++++++++++++------------
 modsec-log-parser.py     | 12 ++++++------
 src/modsec_log_parser.py |  4 ++--
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/modsec-log-compare.py b/modsec-log-compare.py
index ae53f2b..d3eafcb 100755
--- a/modsec-log-compare.py
+++ b/modsec-log-compare.py
@@ -40,14 +40,14 @@ def load(fname):
 
 
 def print_help():
-    print " "
-    print "Use: modsec-log-compare.py [options] <file a> <file b> "
-    print " "
+    print(" ")
+    print("Use: modsec-log-compare.py [options] <file a> <file b> ")
+    print(" ")
 
 
 def plog(a):
     for i in a:
-        print " - " + str(i)
+        print(" - " + str(i))
 
 def main():
     parser = argparse.ArgumentParser()
@@ -65,8 +65,8 @@ def main():
     contentFileA = load(fileA)
     contentFileB = load(fileB)
 
-    print "file A: " + fileA + ". Elements: " + str(len(contentFileA)) + "."
-    print "file B: " + fileB + ". Elements: " + str(len(contentFileB)) + "."
+    print("file A: " + fileA + ". Elements: " + str(len(contentFileA)) + ".")
+    print("file B: " + fileB + ". Elements: " + str(len(contentFileB)) + ".")
 
 
     for i in contentFileA:
@@ -84,15 +84,15 @@ def main():
                 diff = True
 
             if diff:
-                print "*** diff at: " + str(i)
-                print "In: " + str(fileA)
+                print("*** diff at: " + str(i))
+                print("In: " + str(fileA))
                 plog(objA)
-                print " "
-                print "In: " + str(fileB)
+                print(" ")
+                print("In: " + str(fileB))
                 plog(objB)
-                print " "
+                print(" ")
         else:
-            #print "B does not have: " + str(i)
+            #print("B does not have: " + str(i))
             pass
 
 
diff --git a/modsec-log-parser.py b/modsec-log-parser.py
index ab5e800..e5d7df4 100755
--- a/modsec-log-parser.py
+++ b/modsec-log-parser.py
@@ -47,19 +47,19 @@ def main():
 
     for i in data:
         z = ""
-	for xx in summary.split(","):
+        for xx in summary.split(","):
             if len(z) > 0:
                 z = z + str(delim) 
             z = z + str(i.__dict__[xx])
 
-	if i.id in ar:
-	    ar[z] = ar[str(i.id)] + 1
-	else:
-	    ar[z] = 1
+        if i.id in ar:
+            ar[z] = ar[str(i.id)] + 1
+        else:
+            ar[z] = 1
 
 
     for i in ar:
-	print str(i)
+        print(str(i))
 
 if __name__=="__main__":
     main()
diff --git a/src/modsec_log_parser.py b/src/modsec_log_parser.py
index d571b24..6069cd4 100644
--- a/src/modsec_log_parser.py
+++ b/src/modsec_log_parser.py
@@ -17,7 +17,7 @@
 """
 
 import fileinput
-from log_entry import LogEntry
+from .log_entry import LogEntry
 
 class ModSecLogParser:
     def __init__(self, watch = None): 
@@ -25,7 +25,7 @@ def __init__(self, watch = None):
         self.logs = []
 
     def run(self):
-	for line in fileinput.input(self.watch):
+        for line in fileinput.input(self.watch):
             l = LogEntry(string = line)
             self.logs.append(l)
         return self.logs

From 590aa13b885c8dda23b59a5d0d12ecec8b51ea98 Mon Sep 17 00:00:00 2001
From: Bob Carroll <bob.carroll@alum.rit.edu>
Date: Thu, 4 May 2023 19:38:27 -0500
Subject: [PATCH 2/2] clean up output

---
 modsec-log-parser.py     | 5 ++---
 src/log_entry.py         | 2 +-
 src/modsec_log_parser.py | 3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modsec-log-parser.py b/modsec-log-parser.py
index e5d7df4..8533a85 100755
--- a/modsec-log-parser.py
+++ b/modsec-log-parser.py
@@ -28,14 +28,13 @@ def main():
     parser.add_argument('--delim', type=str)
     parser.add_argument('files', nargs='*')
     args = parser.parse_args()
-    print(args.files, args.summary)
 
     files = args.files
     summary = args.summary
     delim = args.delim
     if len(files) == 0:
         files = "/dev/stdin"
-    if len(summary) == 0:
+    if not summary or len(summary) == 0:
         summary = "id,msg"
 
     msclp = ModSecLogParser(files)
@@ -49,7 +48,7 @@ def main():
         z = ""
         for xx in summary.split(","):
             if len(z) > 0:
-                z = z + str(delim) 
+                z = z + str(delim)
             z = z + str(i.__dict__[xx])
 
         if i.id in ar:
diff --git a/src/log_entry.py b/src/log_entry.py
index 9591832..94a4410 100644
--- a/src/log_entry.py
+++ b/src/log_entry.py
@@ -42,7 +42,7 @@ def __init__(self, string = None):
         if string != None:
             a = re.findall(r"\[[^\]]+]", string)
             for i in a:
-                b = re.findall(r"\[([^ ]+) \"?(.*)\"?\]$", i)
+                b = re.findall(r"\[([^ ]+) \"?([^\"]*)\"?\]$", i)
                 if len(b) == 0:
                     continue
                 b = b[0]
diff --git a/src/modsec_log_parser.py b/src/modsec_log_parser.py
index 6069cd4..540350e 100644
--- a/src/modsec_log_parser.py
+++ b/src/modsec_log_parser.py
@@ -27,7 +27,8 @@ def __init__(self, watch = None):
     def run(self):
         for line in fileinput.input(self.watch):
             l = LogEntry(string = line)
-            self.logs.append(l)
+            if l.id is not None:
+                self.logs.append(l)
         return self.logs
 
         self.sumarize()