From 1d0d5fa8b1c6dea9d6bb49931bb80157c0cd6875 Mon Sep 17 00:00:00 2001
From: Thomas Sileo <t@a4.io>
Date: Wed, 8 May 2019 13:19:31 +0200
Subject: [PATCH] Tweak the IndieAuth log

---
 app.py                         | 19 +++++++++++++++++++
 templates/admin_indieauth.html |  5 +++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/app.py b/app.py
index 1698b97..3486269 100644
--- a/app.py
+++ b/app.py
@@ -2183,6 +2183,18 @@ def indieauth_flow():
     return redirect(red)
 
 
+def _get_ip():
+    ip = request.headers.get("X-Forwarded-For", request.remote_addr)
+    geoip = None
+    if request.headers.get("Broxy-Geoip-Country"):
+        geoip = (
+            request.headers.get("Broxy-Geoip-Country")
+            + "/"
+            + request.headers.get("Broxy-Geoip-Region")
+        )
+    return ip, geoip
+
+
 @app.route("/indieauth", methods=["GET", "POST"])
 def indieauth_endpoint():
     if request.method == "GET":
@@ -2214,6 +2226,8 @@ def indieauth_endpoint():
     redirect_uri = request.form.get("redirect_uri")
     client_id = request.form.get("client_id")
 
+    ip, geoip = _get_ip()
+
     auth = DB.indieauth.find_one_and_update(
         {
             "code": code,
@@ -2226,6 +2240,8 @@ def indieauth_endpoint():
                 "verified": True,
                 "verified_by": "id",
                 "verified_at": datetime.now().timestamp(),
+                "ip_address": ip,
+                "geoip": geoip,
             }
         },
     )
@@ -2258,6 +2274,7 @@ def token_endpoint():
         client_id = request.form.get("client_id")
 
         now = datetime.now()
+        ip, geoip = _get_ip()
 
         # This query ensure code, client_id, redirect_uri and me are matching with the code request
         auth = DB.indieauth.find_one_and_update(
@@ -2273,6 +2290,8 @@ def token_endpoint():
                     "verified": True,
                     "verified_by": "code",
                     "verified_at": now.timestamp(),
+                    "ip_address": ip,
+                    "geoip": geoip,
                 }
             },
         )
diff --git a/templates/admin_indieauth.html b/templates/admin_indieauth.html
index 7c90cc4..85000dd 100644
--- a/templates/admin_indieauth.html
+++ b/templates/admin_indieauth.html
@@ -9,8 +9,9 @@
 <ul style="list-style-type:none;padding:0;">
 {% for action in indieauth_actions %}
 <li style="margin-bottom:15px;"><span class="lcolor">{{action.ts|format_ts}}</span>
-<strong>{% if action.verified_by == "login" %}Authorization{% else %}Token{% endif %}</strong>
-requested by <a style="font-weight:bold" href="{{ action.client_id }}">{{ action.client_id }}</a>
+<strong>{% if action.verified_by == "login" %}Authentication {% else %}Authorization {% endif %}</strong>
+request by <a style="font-weight:bold" href="{{ action.client_id }}">{{ action.client_id }}</a>
+ / {{action.ip_address}} {% if action.geoip %}({{action.geoip}}){% endif %}
 as <a style="font-weight:bold;" href="{{action.me}}">{{action.me}}</a>
 ({% if action.scope %}scope=<code>{{action.scope}}</code>,{% endif %}redirect_uri={{action.redirect_uri}}).
 {% if action.token_expires %}