From 9fab1bc9cccc74f5b47e08e4eacb4cd594c7b2bb Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Tue, 14 Apr 2026 08:54:13 +0200 Subject: [PATCH] mkcalendar/mkcol: return CONFLICT in case of file name collision --- radicale/app/mkcalendar.py | 2 ++ radicale/app/mkcol.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/radicale/app/mkcalendar.py b/radicale/app/mkcalendar.py index bbcd2636..6932fa50 100644 --- a/radicale/app/mkcalendar.py +++ b/radicale/app/mkcalendar.py @@ -90,6 +90,8 @@ class ApplicationPartMkcalendar(ApplicationBase): return httputils.FORBIDDEN else: return httputils.INTERNAL_SERVER_ERROR + elif type(e) is pathutils.CollidingPathError: + return httputils.CONFLICT else: logger.warning( "Bad MKCALENDAR request on %r: %s", path, e, exc_info=True) diff --git a/radicale/app/mkcol.py b/radicale/app/mkcol.py index f0a5a131..77d81e22 100644 --- a/radicale/app/mkcol.py +++ b/radicale/app/mkcol.py @@ -94,6 +94,8 @@ class ApplicationPartMkcol(ApplicationBase): return httputils.FORBIDDEN else: return httputils.INTERNAL_SERVER_ERROR + elif type(e) is pathutils.CollidingPathError: + return httputils.CONFLICT else: logger.warning( "Bad MKCOL request on %r (type:%s): %s", path, collection_type, e, exc_info=True)