From 6f0ccfdc91b9fe9d78f1adffbaf748d26bc39887 Mon Sep 17 00:00:00 2001
From: Kishi85 <git@eightyfive.net>
Date: Wed, 15 Sep 2021 14:38:01 +0200
Subject: [PATCH] logging: Add real counterparts of IDNA-mapped domains in
 brackets

---
 acertmgr/__init__.py | 5 ++++-
 acertmgr/tools.py    | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/acertmgr/__init__.py b/acertmgr/__init__.py
index 327a7dc..8be9e9b 100755
--- a/acertmgr/__init__.py
+++ b/acertmgr/__init__.py
@@ -15,7 +15,7 @@ import sys
 from acertmgr import configuration, tools
 from acertmgr.authority import authority
 from acertmgr.modes import challenge_handler
-from acertmgr.tools import log
+from acertmgr.tools import log, LOG_REPLACEMENTS
 
 try:
     import pwd
@@ -139,6 +139,9 @@ def cert_revoke(cert, configs, fallback_authority, reason=None):
 def main():
     # load config
     runtimeconfig, domainconfigs = configuration.load()
+    # register idna-mapped domains as LOG_REPLACEMENTS for better readability of log output
+    LOG_REPLACEMENTS.update({k: "{} [{}]".format(k, v) for k, v in domainconfigs['domainlist_idna_mapped']})
+    # Start processing
     if runtimeconfig.get('mode') == 'revoke':
         # Mode: revoke certificate
         log("Revoking {}".format(runtimeconfig['revoke']))
diff --git a/acertmgr/tools.py b/acertmgr/tools.py
index 8fdce6a..716da0b 100644
--- a/acertmgr/tools.py
+++ b/acertmgr/tools.py
@@ -38,6 +38,8 @@ try:
 except ImportError:
     from urllib2 import urlopen, Request  # Python 2
 
+LOG_REPLACEMENTS = {}
+
 
 class InvalidCertificateError(Exception):
     pass
@@ -59,6 +61,9 @@ def log(msg, exc=None, error=False, warning=False):
         prefix = ""
 
     output = prefix + msg
+    for k, v in LOG_REPLACEMENTS.items():
+        output = output.replace(k, v)
+
     if exc:
         _, exc_value, _ = sys.exc_info()
         if not getattr(exc, '__traceback__', None) and exc == exc_value: