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

catch os error

Browse source
This commit is contained in:
Peter Bieringer 2025-02-11 16:35:03 +01:00
parent 718089e3bf
commit 484616f363
1 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

21
radicale/app/proppatch.py
View file

@ -19,6 +19,8 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Radicale. If not, see <http://www.gnu.org/licenses/>. # along with Radicale. If not, see <http://www.gnu.org/licenses/>.
import errno
import re
import socket import socket
import xml.etree.ElementTree as ET import xml.etree.ElementTree as ET
from http import client from http import client
@ -109,7 +111,20 @@ class ApplicationPartProppatch(ApplicationBase):
) )
self._hook.notify(hook_notification_item) self._hook.notify(hook_notification_item)
except ValueError as e: except ValueError as e:
logger.warning( # return better matching HTTP result in case errno is provided and catched
"Bad PROPPATCH request on %r: %s", path, e, exc_info=True) errno_match = re.search("\\[Errno ([0-9]+)\\]", str(e))
return httputils.BAD_REQUEST if errno_match:
logger.warning(
"Failed PROPPATCH request on %r: %s", path, e, exc_info=True)
errno_e = int(errno_match.group(1))
if errno_e == errno.ENOSPC:
return httputils.INSUFFICIENT_STORAGE
elif errno_e in [errno.EPERM, errno.EACCES]:
return httputils.FORBIDDEN
else:
return httputils.INTERNAL_SERVER_ERROR
else:
logger.warning(
"Bad PROPPATCH request on %r: %s", path, e, exc_info=True)
return httputils.BAD_REQUEST
return client.MULTI_STATUS, headers, self._xml_response(xml_answer) return client.MULTI_STATUS, headers, self._xml_response(xml_answer)