add systemctl and ufw parsers, support for varying degrees of severity

diff --git a/logparse/util.py b/logparse/util.py
index 3aca9043b196784f5f0f56cbd9f68c5588684d9e..e6d905c442a17e78244f055717df98317e05c10e 100644 (file)
--- a/logparse/util.py
+++ b/logparse/util.py
@@ -9,7 +9,7 @@ This module provides the following methods:
 """
 
 from datetime import datetime, timedelta
-import inspect
+import ipaddress
 import logging
 import os
 from pkg_resources import Requirement, resource_filename
@@ -17,7 +17,8 @@ import re
 import socket
 from systemd import journal
 
-from logparse import config
+from logparse import config, formatting
+from logparse.timeparse import timeparse
 
 
 logger = logging.getLogger(__name__)
@@ -68,29 +69,28 @@ def resolve(ip, fqdn=None):        # try to resolve an ip to hostname
         return(ip)
 
     try:
-        socket.inet_aton(ip)  # succeeds if text contains ip
+        ip_obj = ipaddress.ip_address(ip)
+    except ValueError as err:
+        logger.debug("Invalid format: " + str(err))
+        return ip
+
+    try:
         hn = socket.gethostbyaddr(ip)[0] # resolve ip to hostname
-        if fqdn == 'fqdn-implicit' and hn.split('.', 1)[1] == getlocaldomain():
-            return(hn.split('.')[0])
-        elif fqdn == 'fqdn' or fqdn == 'fqdn-implicit':
-            return(hn)
-        elif fqdn == 'host-only':
-            return(hn.split('.')[0])
-        else:
-            logger.warning("Invalid value for FQDN config")
-            return(hn)
     except socket.herror:
         # cannot resolve ip
         logger.debug(ip + " cannot be found, might not exist anymore")
         return(ip)
-    except (OSError, socket.error): # socket.error for Python 2 compatibility
-        # already a hostname
-        logger.debug(ip + " is already a hostname")
-        return(ip)
     except Exception as err:
-        logger.warning("failed to resolve hostname for " + ip + ": " + str(err))
+        logger.warning("Failed to resolve hostname for " + ip + ": " + str(err))
         return(ip)  # return ip if no hostname exists
 
+    if (fqdn == "host-only") or (fqdn == "fqdn-implicit" and ip_obj.is_private):
+        return hn.split('.')[0]
+    if fqdn == 'fqdn' or fqdn == 'fqdn-implicit':
+        return hn
+    return hn
+
+
 
 def readlog(path = None, mode = 'r'):
     """
@@ -110,3 +110,14 @@ def readlog(path = None, mode = 'r'):
             except IOError or OSError as e:
                 logger.warning("Error reading log at {0}: {1}".format(path, e.strerror))
                 return 1
+
+class LogPeriod:
+
+    def __init__(self, section):
+        if config.prefs.get(section.split("_")[0], "period"):
+            self.startdate = datetime.now() - timeparse(config.prefs.get(section.split("_")[0], "period"))
+            logger.debug("Parsing logs for {0} since {1}".format(section, self.startdate.strftime(formatting.DATEFMT + " " + formatting.TIMEFMT)))
+            self.unique = True
+        else:
+            self.startdate = datetime.now() - timeparse(config.prefs.get("logparse", "period"))
+            self.unique = False