mirrors/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-04-04 21:57:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

conditional debug log of request header+content / response content

Browse source
This commit is contained in:
Peter Bieringer 2024-06-11 13:26:21 +02:00
parent 1acfa480fa
commit 02019e73e6
3 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
radicale/app/__init__.py
View file

@ -82,6 +82,8 @@ class Application(ApplicationPartDelete, ApplicationPartHead,
super().__init__(configuration) super().__init__(configuration)
self._mask_passwords = configuration.get("logging", "mask_passwords") self._mask_passwords = configuration.get("logging", "mask_passwords")
self._bad_put_request_content = configuration.get("logging", "bad_put_request_content") self._bad_put_request_content = configuration.get("logging", "bad_put_request_content")
self._request_header_on_debug = configuration.get("logging", "request_header_on_debug")
self._response_content_on_debug = configuration.get("logging", "response_content_on_debug")
self._auth_delay = configuration.get("auth", "delay") self._auth_delay = configuration.get("auth", "delay")
self._internal_server = configuration.get("server", "_internal_server") self._internal_server = configuration.get("server", "_internal_server")
self._max_content_length = configuration.get( self._max_content_length = configuration.get(
@ -141,7 +143,8 @@ class Application(ApplicationPartDelete, ApplicationPartHead,
answers = [] answers = []
if answer is not None: if answer is not None:
if isinstance(answer, str): if isinstance(answer, str):
logger.debug("Response content:\n%s", answer) if self._response_content_on_debug:
logger.debug("Response content:\n%s", answer)
headers["Content-Type"] += "; charset=%s" % self._encoding headers["Content-Type"] += "; charset=%s" % self._encoding
answer = answer.encode(self._encoding) answer = answer.encode(self._encoding)
accept_encoding = [ accept_encoding = [
@ -187,8 +190,9 @@ class Application(ApplicationPartDelete, ApplicationPartHead,
logger.info("%s request for %r%s received from %s%s", logger.info("%s request for %r%s received from %s%s",
request_method, unsafe_path, depthinfo, request_method, unsafe_path, depthinfo,
remote_host, remote_useragent) remote_host, remote_useragent)
logger.debug("Request headers:\n%s", if self._request_header_on_debug:
pprint.pformat(self._scrub_headers(environ))) logger.debug("Request headers:\n%s",
pprint.pformat(self._scrub_headers(environ)))
# SCRIPT_NAME is already removed from PATH_INFO, according to the # SCRIPT_NAME is already removed from PATH_INFO, according to the
# WSGI specification. # WSGI specification.

6
radicale/app/base.py
View file

@ -50,6 +50,7 @@ class ApplicationBase:
self._web = web.load(configuration) self._web = web.load(configuration)
self._encoding = configuration.get("encoding", "request") self._encoding = configuration.get("encoding", "request")
self._log_bad_put_request_content = configuration.get("logging", "bad_put_request_content") self._log_bad_put_request_content = configuration.get("logging", "bad_put_request_content")
self._response_content_on_debug = configuration.get("logging", "response_content_on_debug")
self._hook = hook.load(configuration) self._hook = hook.load(configuration)
def _read_xml_request_body(self, environ: types.WSGIEnviron def _read_xml_request_body(self, environ: types.WSGIEnviron
@ -71,8 +72,9 @@ class ApplicationBase:
def _xml_response(self, xml_content: ET.Element) -> bytes: def _xml_response(self, xml_content: ET.Element) -> bytes:
if logger.isEnabledFor(logging.DEBUG): if logger.isEnabledFor(logging.DEBUG):
logger.debug("Response content:\n%s", if self._response_content_on_debug:
xmlutils.pretty_xml(xml_content)) logger.debug("Response content:\n%s",
xmlutils.pretty_xml(xml_content))
f = io.BytesIO() f = io.BytesIO()
ET.ElementTree(xml_content).write(f, encoding=self._encoding, ET.ElementTree(xml_content).write(f, encoding=self._encoding,
xml_declaration=True) xml_declaration=True)

3
radicale/httputils.py
View file

@ -142,7 +142,8 @@ def read_request_body(configuration: "config.Configuration",
environ: types.WSGIEnviron) -> str: environ: types.WSGIEnviron) -> str:
content = decode_request(configuration, environ, content = decode_request(configuration, environ,
read_raw_request_body(configuration, environ)) read_raw_request_body(configuration, environ))
logger.debug("Request content:\n%s", content) if configuration.get("logging", "request_content_on_debug"):
logger.debug("Request content:\n%s", content)
return content return content