From 914320826f8e6cdb4f7f783047361dd02d36f2c2 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Sat, 8 Mar 2025 16:50:35 +0100 Subject: [PATCH] extend request log with HTTPS info --- radicale/app/__init__.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/radicale/app/__init__.py b/radicale/app/__init__.py index 4e8e688b..f5cfc1aa 100644 --- a/radicale/app/__init__.py +++ b/radicale/app/__init__.py @@ -150,6 +150,7 @@ class Application(ApplicationPartDelete, ApplicationPartHead, time_begin = datetime.datetime.now() request_method = environ["REQUEST_METHOD"].upper() unsafe_path = environ.get("PATH_INFO", "") + https = environ.get("HTTPS", "") """Manage a request.""" def response(status: int, headers: types.WSGIResponseHeaders, @@ -210,9 +211,13 @@ class Application(ApplicationPartDelete, ApplicationPartHead, depthinfo = "" if environ.get("HTTP_DEPTH"): depthinfo = " with depth %r" % environ["HTTP_DEPTH"] - logger.info("%s request for %r%s received from %s%s", + if https: + https_info = " " + environ.get("SSL_PROTOCOL", "") + " " + environ.get("SSL_CIPHER", "") + else: + https_info = "" + logger.info("%s request for %r%s received from %s%s%s", request_method, unsafe_path, depthinfo, - remote_host, remote_useragent) + remote_host, remote_useragent, https_info) if self._request_header_on_debug: logger.debug("Request header:\n%s", pprint.pformat(self._scrub_headers(environ)))