oss/Radicale
oss/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-06-26 16:45:52 +00:00
Code Wiki Activity

Always match full username/collection with regex

Browse source 
It's easy to forget $ at the end of a regex and it's counter-intuitive that ^ is implicit but $ is not.
This commit is contained in:
Unrud 2016-08-01 10:07:21 +02:00
parent f4ebe3f545
commit 9dd8c65d65
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
radicale/rights.py
View file

@ -66,7 +66,7 @@ permission:rw
"owner_write": """
[w]
user:.+
collection:^%(login)s(/.*)?$
collection:%(login)s(/.*)?
permission:rw
[r]
user:.+
@ -76,7 +76,7 @@ permission:r
"owner_only": """
[rw]
user:.+
collection:^%(login)s(/.*)?$
collection:%(login)s(/.*)?
permission:rw
"""}
@ -127,10 +127,10 @@ class Rights(BaseRights):
self.logger.debug(
"Test if '%s:%s' matches against '%s:%s' from section '%s'" % (
user, collection_url, re_user, re_collection, section))
user_match = re.match(re_user, user)
user_match = re.fullmatch(re_user, user)
if user_match:
re_collection = re_collection.format(*user_match.groups())
if re.match(re_collection, collection_url):
if re.fullmatch(re_collection, collection_url):
self.logger.debug("Section '%s' matches" % section)
return permission in regex.get(section, "permission")
else: