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

Redirect …/.well-known/{caldav,carddav} to /

Browse Source 
Closes #1200
This commit is contained in:
Unrud 2022-01-22 18:19:41 +01:00
parent 10d2571d89
commit e4cc73098a
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
radicale/app/__init__.py
View File

@ -209,8 +209,15 @@ class Application(ApplicationPartDelete, ApplicationPartHead,
if not function: if not function:
return response(*httputils.METHOD_NOT_ALLOWED) return response(*httputils.METHOD_NOT_ALLOWED)
# If "/.well-known" is not available, clients query "/" # Redirect all "…/.well-known/{caldav,carddav}" paths to "/".
if path == "/.well-known" or path.startswith("/.well-known/"): # This shouldn't be necessary but some clients like TbSync require it.
# Status must be MOVED PERMANENTLY using FOUND causes problems
if (path.rstrip("/").endswith("/.well-known/caldav") or
path.rstrip("/").endswith("/.well-known/carddav")):
return response(*httputils.redirect(
base_prefix + "/", client.MOVED_PERMANENTLY))
# Return NOT FOUND for all other paths containing ".well-knwon"
if path.endswith("/.well-known") or "/.well-known/" in path:
return response(*httputils.NOT_FOUND) return response(*httputils.NOT_FOUND)
# Ask authentication backend to check rights # Ask authentication backend to check rights

21
radicale/tests/test_base.py
View File

@ -1615,14 +1615,31 @@ permissions: RrWw""")
self.delete("/") self.delete("/")
self.propfind("/") self.propfind("/")
def test_well_known(self) -> None:
for path in ["/.well-known/caldav", "/.well-known/carddav"]:
for path in [path, "/foo" + path]:
_, headers, _ = self.request("GET", path, check=301)
assert headers.get("Location") == "/"
def test_well_known_script_name(self) -> None:
for path in ["/.well-known/caldav", "/.well-known/carddav"]:
for path in [path, "/foo" + path]:
_, headers, _ = self.request(
"GET", path, check=301, SCRIPT_NAME="/radicale")
assert headers.get("Location") == "/radicale/"
def test_well_known_not_found(self) -> None:
for path in ["/.well-known", "/.well-known/", "/.well-known/foo"]:
for path in [path, "/foo" + path]:
self.get(path, check=404)
def test_custom_headers(self) -> None: def test_custom_headers(self) -> None:
self.configure({"headers": {"test": "123"}}) self.configure({"headers": {"test": "123"}})
# Test if header is set on success # Test if header is set on success
_, headers, _ = self.request("OPTIONS", "/", check=200) _, headers, _ = self.request("OPTIONS", "/", check=200)
assert headers.get("test") == "123" assert headers.get("test") == "123"
# Test if header is set on failure # Test if header is set on failure
_, headers, _ = self.request("GET", "/.well-known/does not exist", _, headers, _ = self.request("GET", "/.well-known/foo", check=404)
check=404)
assert headers.get("test") == "123" assert headers.get("test") == "123"
@pytest.mark.skipif(sys.version_info < (3, 6), @pytest.mark.skipif(sys.version_info < (3, 6),