oss/Radicale
oss/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-08-07 18:30:54 +00:00
Code Wiki Activity

Merge pull request #1525 from pbiering/debug-suppressed-messages

Browse source 
add "suppress" messages in case debug log options are active
This commit is contained in:
Peter Bieringer 2024-06-18 08:45:01 +02:00 • committed by GitHub
commit 6b65800770
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
radicale/app/__init__.py
View file

@ -145,6 +145,8 @@ class Application(ApplicationPartDelete, ApplicationPartHead,
if isinstance(answer, str): if isinstance(answer, str):
if self._response_content_on_debug: if self._response_content_on_debug:
logger.debug("Response content:\n%s", answer) logger.debug("Response content:\n%s", answer)
else:
logger.debug("Response content: suppressed by config/option [auth] response_content_on_debug")
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 = [
@ -191,8 +193,10 @@ class Application(ApplicationPartDelete, ApplicationPartHead,
request_method, unsafe_path, depthinfo, request_method, unsafe_path, depthinfo,
remote_host, remote_useragent) remote_host, remote_useragent)
if self._request_header_on_debug: if self._request_header_on_debug:
logger.debug("Request headers:\n%s", logger.debug("Request header:\n%s",
pprint.pformat(self._scrub_headers(environ))) pprint.pformat(self._scrub_headers(environ)))
else:
logger.debug("Request header: suppressed by config/option [auth] request_header_on_debug")
# 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.

2
radicale/app/base.py
View file

@ -75,6 +75,8 @@ class ApplicationBase:
if self._response_content_on_debug: if self._response_content_on_debug:
logger.debug("Response content:\n%s", logger.debug("Response content:\n%s",
xmlutils.pretty_xml(xml_content)) xmlutils.pretty_xml(xml_content))
else:
logger.debug("Response content: suppressed by config/option [auth] response_content_on_debug")
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)

2
radicale/app/put.py
View file

@ -149,6 +149,8 @@ class ApplicationPartPut(ApplicationBase):
"Bad PUT request on %r (read_components): %s", path, e, exc_info=True) "Bad PUT request on %r (read_components): %s", path, e, exc_info=True)
if self._log_bad_put_request_content: if self._log_bad_put_request_content:
logger.warning("Bad PUT request content of %r:\n%s", path, content) logger.warning("Bad PUT request content of %r:\n%s", path, content)
else:
logger.debug("Bad PUT request content: suppressed by config/option [auth] bad_put_request_content")
return httputils.BAD_REQUEST return httputils.BAD_REQUEST
(prepared_items, prepared_tag, prepared_write_whole_collection, (prepared_items, prepared_tag, prepared_write_whole_collection,
prepared_props, prepared_exc_info) = prepare( prepared_props, prepared_exc_info) = prepare(

5
radicale/httputils.py
View file

@ -2,7 +2,8 @@
# Copyright © 2008 Nicolas Kandel # Copyright © 2008 Nicolas Kandel
# Copyright © 2008 Pascal Halter # Copyright © 2008 Pascal Halter
# Copyright © 2008-2017 Guillaume Ayoub # Copyright © 2008-2017 Guillaume Ayoub
# Copyright © 2017-2018 Unrud <unrud@outlook.com> # Copyright © 2017-2022 Unrud <unrud@outlook.com>
# Copyright © 2024-2024 Peter Bieringer <pb@bieringer.de>
# #
# This library is free software: you can redistribute it and/or modify # This library is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -144,6 +145,8 @@ def read_request_body(configuration: "config.Configuration",
read_raw_request_body(configuration, environ)) read_raw_request_body(configuration, environ))
if configuration.get("logging", "request_content_on_debug"): if configuration.get("logging", "request_content_on_debug"):
logger.debug("Request content:\n%s", content) logger.debug("Request content:\n%s", content)
else:
logger.debug("Request content: suppressed by config/option [auth] request_content_on_debug")
return content return content

3
radicale/log.py
View file

@ -1,6 +1,7 @@
# This file is part of Radicale - CalDAV and CardDAV server # This file is part of Radicale - CalDAV and CardDAV server
# Copyright © 2011-2017 Guillaume Ayoub # Copyright © 2011-2017 Guillaume Ayoub
# Copyright © 2017-2019 Unrud <unrud@outlook.com> # Copyright © 2017-2023 Unrud <unrud@outlook.com>
# Copyright © 2024-2024 Peter Bieringer <pb@bieringer.de>
# #
# This library is free software: you can redistribute it and/or modify # This library is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by