Compare commits

..

2 commits

Author SHA1 Message Date
0ebd1abdd7
Bug Fix 2024-08-21 12:15:48 +01:00
512f94d7f6
Updated geoip to check history before doing lookup 2024-08-21 11:54:10 +01:00

26
log.py
View file

@ -108,6 +108,31 @@ class logsManager:
try:
conn = pyodbc.connect(self.conn_str)
cursor = conn.cursor()
timeThreshold = datetime.now() - timedelta(days=1)
cursor.execute("SELECT blockedipaddress, monutil_geoip.hostname, city, region, country, loc, org, postal, timezone FROM monutil_geoip INNER JOIN monutil_ipblock ON monutil_geoip.logID = monutil_ipblock.logID WHERE logtime >= ? AND blockedipaddress = ?", timeThreshold, ip)
rows = cursor.fetchall()
geoinfo = []
for row in rows:
geoinfo = {
"ip": row.blockedipaddress,
"hostname": row.hostname,
"city": row.city,
"region": row.region,
"country": row.country,
"loc": row.loc,
"org": row.org,
"postal": row.postal,
"timezone": row.timezone,
}
if not geoinfo:
if 'delayUntil' in locals() and datetime.now() < delayUntil:
print("Rate limit exceeded. Please wait before trying again.")
@ -146,7 +171,6 @@ class logsManager:
"timezone": data.get("timezone"),
}
return geoinfo
except Exception as e: