From 2ad3a67640d4f0b8a5220ac3eadb3a5e59d7138b Mon Sep 17 00:00:00 2001
From: Simon Woll <wollsi@rocks-the.net>
Date: Wed, 6 Oct 2021 18:36:53 +0200
Subject: [PATCH] added ip types for IPv6 addresses

added monitored types

[ALLOCATED APNIC,
ALLOCATED ARIN,
ALLOCATED RIPE NCC,
ALLOCATED LACNIC,
ALLOCATED AFRINIC]

for IPv6 support.
---
 geoip2influx.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/geoip2influx.py b/geoip2influx.py
index 79cef2a..8518327 100644
--- a/geoip2influx.py
+++ b/geoip2influx.py
@@ -36,6 +36,10 @@ g2i_log_path = env.get('GEOIP2INFLUX_LOG_PATH','/config/log/geoip2influx/geoip2i
 # Logging
 logging.basicConfig(level=log_level,format='GEOIP2INFLUX %(asctime)s :: %(levelname)s :: %(message)s',datefmt='%d/%b/%Y %H:%M:%S',handlers=[logging.StreamHandler(),logging.FileHandler(g2i_log_path)])
 
+# global variables
+monitored_ip_types = ['PUBLIC', 'ALLOCATED APNIC', 'ALLOCATED ARIN', 'ALLOCATED RIPE NCC', 'ALLOCATED LACNIC', 'ALLOCATED AFRINIC']
+
+
 def regex_tester(log_path, N):
     time_out = time() + 60
     re_ipv4 = compile(r'(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})')
@@ -196,7 +200,7 @@ def logparse(
                                     f'Line: {line}'
                                    )
                     continue
-                if ipadd(ip).iptype() == 'PUBLIC' and ip:
+                if ipadd(ip).iptype() in monitored_ip_types and ip:
                     info = gi.city(ip)
                     if info is not None:
                         geohash = encode(info.location.latitude, info.location.longitude)
@@ -226,7 +230,7 @@ def logparse(
 
                 if send_logs:
                     data = search(log, line)
-                    if ipadd(ip).iptype() == 'PUBLIC' and ip:
+                    if ipadd(ip).iptype() in monitored_ip_types and ip:
                         info = gi.city(ip)
                         if info is not None:
                             datadict = data.groupdict()