From 3301a36b5f1692a30505b00cfd7dd2ada1cbf6ac Mon Sep 17 00:00:00 2001
From: Andrea Mistrali <akelge@gmail.com>
Date: Mon, 7 Oct 2024 10:19:57 +0200
Subject: [PATCH] Fix logging

---
 app/logging/production.ini |  2 +-
 app/views/rest.py          | 11 +++++------
 pyproject.toml             |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/logging/production.ini b/app/logging/production.ini
index 548368d..c955a08 100644
--- a/app/logging/production.ini
+++ b/app/logging/production.ini
@@ -13,7 +13,7 @@ level = INFO
 handlers = console
 
 [logger_access]
-level = INFO
+level = ERROR
 handlers = console
 qualname = gunicorn.access
 propagate = 0
diff --git a/app/views/rest.py b/app/views/rest.py
index 9eaea5d..61c855f 100644
--- a/app/views/rest.py
+++ b/app/views/rest.py
@@ -9,7 +9,8 @@ from flask import jsonify
 from hsapi_client import Node, User, Route, PreAuthKey
 from hsapi_client.preauthkeys import (v1CreatePreAuthKeyRequest,
                                       v1ExpirePreAuthKeyRequest)
-from hsapi_client.nodes import v1BackfillNodeIPsResponse
+
+from app.lib import remote_ip
 
 
 log = logging.getLogger()
@@ -30,7 +31,7 @@ def routeToggle(routeId: int):
             action = 'enabled'
         log.info(
             f"route '{route.prefix}' via '{route.node.givenName}' "
-            f"{action} by '{auth.username}'")
+            f"{action} by '{auth.username}@{remote_ip()}'")
         Route().toggle(routeId)
     return redirect(request.referrer)
 
@@ -46,7 +47,7 @@ def expireNode(nodeId: int):
     if not auth.userOrAdmin(node.user.name):
         return auth.unathorized
     Node().expire(nodeId)
-    log.info(f"node '{nodeId}' expired by '{auth.username}'")
+    log.info(f"node '{nodeId}' expired by '{auth.username}@{remote_ip()}'")
     return redirect(request.referrer)
 
 
@@ -58,7 +59,7 @@ def deleteNode(nodeId: int):
         return auth.unathorized
     Node().expire(nodeId)
     Node().delete(nodeId)
-    log.info(f"node '{nodeId}' deleted by '{auth.username}'")
+    log.info(f"node '{nodeId}' deleted by '{auth.username}@{remote_ip()}'")
     return redirect(request.referrer)
 
 
@@ -87,7 +88,6 @@ def deleteUser(userName: str):
 @auth.authorize_admins('default')
 def createPKA(userName: str):
     data = request.json
-    log.debug(data)
     expiration = f"{data['expiration']}:00Z"
     req = v1CreatePreAuthKeyRequest(user=userName,
                                     reusable=data['reusable'],
@@ -100,7 +100,6 @@ def createPKA(userName: str):
 @rest_blueprint.route('/user/<userName>/expire/<key>', methods=['GET'])
 @auth.authorize_admins('default')
 def expirePKA(userName: str, key: str):
-    log.debug(key)
     req = v1ExpirePreAuthKeyRequest(user=userName, key=key)
 
     PreAuthKey().expire(req)
diff --git a/pyproject.toml b/pyproject.toml
index d42ace1..15deb53 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "hsman"
-version = "0.9.19"
+version = "0.9.20"
 description = "Flask Admin webui for Headscale"
 authors = ["Andrea Mistrali <andrea@mistrali.pw>"]
 license = "BSD"