working for the most part
This commit is contained in:
@@ -3,9 +3,8 @@ from datetime import datetime
|
||||
from db_interface import (
|
||||
get_connection,
|
||||
get_vendor_info,
|
||||
get_all_groups,
|
||||
get_latest_auth_logs,
|
||||
lookup_mac_verbose
|
||||
get_all_groups,
|
||||
)
|
||||
import pytz
|
||||
|
||||
@@ -15,7 +14,6 @@ def time_ago(dt):
|
||||
if not dt:
|
||||
return "n/a"
|
||||
|
||||
# Use configured timezone
|
||||
tz_name = current_app.config.get('APP_TIMEZONE', 'UTC')
|
||||
local_tz = pytz.timezone(tz_name)
|
||||
|
||||
@@ -51,31 +49,6 @@ def homepage():
|
||||
latest_accept=latest_accept,
|
||||
latest_reject=latest_reject)
|
||||
|
||||
@index.route('/stats')
|
||||
def stats():
|
||||
accept_entries = get_latest_auth_logs('Access-Accept')
|
||||
reject_entries = get_latest_auth_logs('Access-Reject')
|
||||
available_groups = get_all_groups()
|
||||
|
||||
# Process entries to add vendor and time-ago
|
||||
from datetime import datetime, timezone
|
||||
import humanize
|
||||
|
||||
def enrich(entry):
|
||||
from db_interface import get_vendor_info, get_user_by_mac
|
||||
entry['vendor'] = get_vendor_info(entry['mac_address'])
|
||||
entry['ago'] = humanize.naturaltime(datetime.now(timezone.utc) - entry['timestamp'])
|
||||
user = get_user_by_mac(entry['mac_address'])
|
||||
entry['already_exists'] = user is not None
|
||||
entry['existing_vlan'] = user['vlan_id'] if user else None
|
||||
entry['description'] = user['description'] if user else None
|
||||
return entry
|
||||
|
||||
accept_entries = [enrich(e) for e in accept_entries]
|
||||
reject_entries = [enrich(e) for e in reject_entries]
|
||||
|
||||
return render_template("stats.html", accept_entries=accept_entries, reject_entries=reject_entries, available_groups=available_groups)
|
||||
|
||||
@index.route('/lookup_mac', methods=['POST'])
|
||||
def lookup_mac():
|
||||
mac = request.form.get('mac', '').strip()
|
||||
@@ -85,7 +58,6 @@ def lookup_mac():
|
||||
result = lookup_mac_verbose(mac)
|
||||
return jsonify({"mac": mac, "output": result})
|
||||
|
||||
|
||||
def get_summary_counts():
|
||||
conn = get_connection()
|
||||
cursor = conn.cursor(dictionary=True)
|
||||
|
||||
Reference in New Issue
Block a user