tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use sanitize_path instead of normpath

Browse Source 
See a7b47f075499a1e1b40539bc1fa872a3ab77a204
The check for "." is now needless because the sane
path is always absolute.
```path.replace(os.sep, "/")``` is only relevant
for the (multi)filesystem backend and should be
there.
This commit is contained in:
Unrud 2015-12-24 10:07:04 +01:00
parent 1ad994cadf
commit 6b7e79a368
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
radicale/ical.py
View File

@ -26,13 +26,14 @@ Define the main classes of a collection as seen from the server.
""" """
import os import os
import posixpath
import hashlib import hashlib
import re import re
from uuid import uuid4 from uuid import uuid4
from random import randint from random import randint
from contextlib import contextmanager from contextlib import contextmanager
from . import pathutils
def serialize(tag, headers=(), items=()): def serialize(tag, headers=(), items=()):
"""Return a text corresponding to given collection ``tag``. """Return a text corresponding to given collection ``tag``.
@ -183,8 +184,9 @@ class Collection(object):
""" """
self.encoding = "utf-8" self.encoding = "utf-8"
split_path = path.split("/") # path should already be sanitized
self.path = path if path != "." else "" self.path = pathutils.sanitize_path(path).strip("/")
split_path = self.path.split("/")
if principal and split_path and self.is_node(self.path): if principal and split_path and self.is_node(self.path):
# Already existing principal collection # Already existing principal collection
self.owner = split_path[0] self.owner = split_path[0]
@ -215,8 +217,8 @@ class Collection(object):
if path is None: if path is None:
return [] return []
# First do normpath and then strip, to prevent access to FOLDER/../ # path should already be sanitized
sane_path = posixpath.normpath(path.replace(os.sep, "/")).strip("/") sane_path = pathutils.sanitize_path(path).strip("/")
attributes = sane_path.split("/") attributes = sane_path.split("/")
if not attributes: if not attributes:
return [] return []