diff --git a/radicale/app/__init__.py b/radicale/app/__init__.py index 0a58e102..b6d641cd 100644 --- a/radicale/app/__init__.py +++ b/radicale/app/__init__.py @@ -614,9 +614,9 @@ class Application(ApplicationPartDelete, ApplicationPartHead, if (status, headers, answer, xml_request) == httputils.NOT_ALLOWED: if path.startswith("/.token"): - logger.info("Access to %r denied", path) + logger.notice("Access to %r denied", path) else: - logger.info("Access to %r denied for %s", path, repr(user) if user else "anonymous user") + logger.notice("Access to %r denied for %s", path, repr(user) if user else "anonymous user") else: status, headers, answer, xml_request = httputils.NOT_ALLOWED diff --git a/radicale/app/proppatch.py b/radicale/app/proppatch.py index 0f60dc97..2fd48671 100644 --- a/radicale/app/proppatch.py +++ b/radicale/app/proppatch.py @@ -127,13 +127,13 @@ class ApplicationPartProppatch(ApplicationBase): (not self._sharing.permit_properties_overlay and "P" not in raw_permissions and "P" not in share['Permissions'])): logger.info("PROPPATCH request on shared %r: write-access", path_orig) if permissions_filter is not None and "e" in permissions_filter: - logger.info("PROPPATCH request on shared %r: write-access, overlay enforced, but disabled by share permission 'e'", path_orig) + logger.notice("PROPPATCH request on shared %r: write-access, overlay enforced, but disabled by share permission 'e'", path_orig) elif "e" in raw_permissions: - logger.info("PROPPATCH request on shared %r: write-access, overlay enforced, but disabled by rights permission 'e'", path_orig) + logger.notice("PROPPATCH request on shared %r: write-access, overlay enforced, but disabled by rights permission 'e'", path_orig) else: share_overlay = True else: - logger.info("PROPPATCH request on shared %r: no write-access", path_orig) + logger.notice("PROPPATCH request on shared %r: no write-access", path_orig) return httputils.NOT_ALLOWED else: return httputils.NOT_ALLOWED @@ -144,9 +144,9 @@ class ApplicationPartProppatch(ApplicationBase): logger.trace("PROPPATCH/xml_proppatch: write-access/sharing: %r", path_orig) if self._sharing.enforce_properties_overlay: if permissions_filter is not None and "e" in permissions_filter: - logger.info("PROPPATCH request on shared %r: write-permissions, overlay enforced, but disabled by share permission 'e'", path_orig) + logger.notice("PROPPATCH request on shared %r: write-permissions, overlay enforced, but disabled by share permission 'e'", path_orig) elif "e" in raw_permissions: - logger.info("PROPPATCH request on shared %r: write-permissions, overlay enforced, but disabled by rights permission 'e'", path_orig) + logger.notice("PROPPATCH request on shared %r: write-permissions, overlay enforced, but disabled by rights permission 'e'", path_orig) else: share_overlay = True else: diff --git a/radicale/sharing/__init__.py b/radicale/sharing/__init__.py index 5e7bc434..5cd07546 100644 --- a/radicale/sharing/__init__.py +++ b/radicale/sharing/__init__.py @@ -1040,7 +1040,7 @@ class BaseSharing(ApplicationBase): else: answer['PathOrToken'] = token - logger.info(api_info + " success: PathMapped=%r Permissions=%r PathOrToken=%r", PathMapped, Permissions, PathOrToken) + logger.notice(api_info + " success: PathMapped=%r Permissions=%r PathOrToken=%r", PathMapped, Permissions, PathOrToken) # action: update elif action == "update": @@ -1172,6 +1172,8 @@ class BaseSharing(ApplicationBase): logger.warning(api_info + ": %r not successful", request_data['PathOrToken']) return httputils.bad_request("Internal Error") + logger.notice(api_info + " success: PathMapped=%r PathOrToken=%r", PathMapped, PathOrToken) + # action: delete elif action == "delete": logger.trace("" + api_info + ": start") @@ -1212,6 +1214,8 @@ class BaseSharing(ApplicationBase): logger.warning(api_info + ": %r by user %r not successful", request_data['PathOrToken'], request_data['User']) return httputils.bad_request("Internal Error") + logger.notice(api_info + " success: PathMapped=%r PathOrToken=%r", PathMapped, PathOrToken) + # action: info elif action == "info": logger.info(api_info + ": success") @@ -1300,6 +1304,8 @@ class BaseSharing(ApplicationBase): logger.warning(api_info + ": %r by user %s not successful", request_data['PathOrToken'], user) return httputils.bad_request("Internal Error") + logger.notice(api_info + " success: PathMapped=%r PathOrToken=%r", PathMapped, PathOrToken) + else: # default logger.warning(api_info + ": unsupported action=%r", action)