Merge pull request #808 from christianlouis/fix/double-slashes-join-url-12822045781097996485

Fix double slashes again

CHANGELOG.md

@@ -130,6 +130,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 
 
+## v0.172.2 (2026-03-23)
+
+### Bug Fixes
+
+- Adapt TemplateResponse calls to Starlette 1.0 new-style API
+  ([`c4e10be`](https://github.com/christianlouis/DocuElevate/commit/c4e10bee5e096e71a5bc4fac4928f69e5c04f2fb))
+
+- Update test assertions and lint fixes for Starlette 1.0 TemplateResponse API
+  ([`93629ff`](https://github.com/christianlouis/DocuElevate/commit/93629ff44083d43f79fdd49431457023e53d13e4))
+
+- **build**: Remove --omit=dev from npm ci in Dockerfile frontend-builder stage
+  ([`b4e0067`](https://github.com/christianlouis/DocuElevate/commit/b4e0067a27e2fb161349bd38c6d3b3f3bcb86972))
+
+### Documentation
+
+- **changelog**: Update changelog [skip ci]
+  ([`0841713`](https://github.com/christianlouis/DocuElevate/commit/084171395d1076c716aa500a516118db49468ff5))
+
+
+## Unreleased
+
+
 ## v0.172.1 (2026-03-22)
 
 ### Bug Fixes

app/tasks/upload_to_nextcloud.py

@@ -11,6 +11,7 @@ from app.config import settings
 from app.tasks.retry_config import UploadTaskWithRetry
 from app.utils import log_task_progress
 from app.utils.filename_utils import extract_remote_path, get_unique_filename
+from app.utils.network import join_url
 
 logger = logging.getLogger(__name__)
 
@@ -64,17 +65,11 @@ def upload_to_nextcloud(self, file_path: str, file_id: int = None, folder_overri
             folder_override if folder_override is not None else (getattr(settings, "nextcloud_folder", "") or "")
         )
         remote_path = extract_remote_path(file_path, settings.workdir, remote_base)
-        full_url = f"{webdav_url}/{remote_path}"
+        full_url = join_url(webdav_url, remote_path)
-
-        # Remove any double slashes (except in http://)
-        full_url = full_url.replace("://", "$PLACEHOLDER$")
-        while "//" in full_url:
-            full_url = full_url.replace("//", "/")
-        full_url = full_url.replace("$PLACEHOLDER$", "://")
 
         # Function to check if file exists in Nextcloud
         def check_exists_in_nextcloud(path):
-            check_url = f"{webdav_url}{os.path.dirname(path)}"
+            check_url = join_url(webdav_url, os.path.dirname(path))
             try:
                 response = requests.request(
                     "PROPFIND",
@@ -91,13 +86,7 @@ def upload_to_nextcloud(self, file_path: str, file_id: int = None, folder_overri
 
         # Check for potential file collision and get a unique name if needed
         remote_path = get_unique_filename(remote_path, check_exists_in_nextcloud)
-        full_url = f"{webdav_url}/{remote_path}"
+        full_url = join_url(webdav_url, remote_path)
-
-        # Fix double slashes again
-        full_url = full_url.replace("://", "$PLACEHOLDER$")
-        while "//" in full_url:
-            full_url = full_url.replace("//", "/")
-        full_url = full_url.replace("$PLACEHOLDER$", "://")
 
         # Create necessary parent folders
         parent_dirs = os.path.dirname(remote_path)
@@ -107,12 +96,7 @@ def upload_to_nextcloud(self, file_path: str, file_id: int = None, folder_overri
                 if not folder:
                     continue
                 current_path += f"{folder}/"
-                mkdir_url = f"{webdav_url}/{current_path}"
+                mkdir_url = join_url(webdav_url, current_path)
-                # Fix double slashes
-                mkdir_url = mkdir_url.replace("://", "$PLACEHOLDER$")
-                while "//" in mkdir_url:
-                    mkdir_url = mkdir_url.replace("//", "/")
-                mkdir_url = mkdir_url.replace("$PLACEHOLDER$", "://")
 
                 requests.request(
                     "MKCOL",

app/utils/network.py

@@ -1,6 +1,7 @@
 import ipaddress
 import logging
 import socket
+from urllib.parse import urlsplit, urlunsplit
 
 logger = logging.getLogger(__name__)
 
@@ -32,3 +33,28 @@ def is_private_ip(hostname: str) -> bool:
             # and SSRF bypasses via unresolvable addresses.
             logger.warning(f"Could not resolve hostname (blocking securely): {hostname}")
             return True
+
+
+def join_url(base: str, *parts: str) -> str:
+    """
+    Safely join a base URL with one or more path parts.
+
+    Uses urllib.parse to correctly handle scheme/netloc/query/fragment so that
+    only the path component is modified.  Leading and trailing slashes are
+    stripped from each part before joining, preventing double-slash sequences
+    at segment boundaries without touching the scheme separator or query string.
+
+    Examples:
+        join_url("https://example.com/dav/", "/remote/", "file.pdf")
+        -> "https://example.com/dav/remote/file.pdf"
+    """
+    parsed = urlsplit(base)
+    # Strip each part once and filter out empty segments; use walrus operator
+    # to avoid calling strip twice per iteration.
+    stripped_parts = [s for p in parts if (s := p.strip("/"))]
+    base_path = parsed.path.rstrip("/")
+    new_path = base_path + "/" + "/".join(stripped_parts) if stripped_parts else base_path
+    # Ensure path is non-empty so the reconstructed URL is valid.
+    if not new_path:
+        new_path = "/"
+    return urlunsplit((parsed.scheme, parsed.netloc, new_path, parsed.query, parsed.fragment))

tests/test_upload_to_nextcloud_join_url.py

@@ -0,0 +1,52 @@
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from app.tasks.upload_to_nextcloud import upload_to_nextcloud
+
+
+@pytest.fixture
+def mock_settings(tmp_path):
+    with patch("app.tasks.upload_to_nextcloud.settings") as mock:
+        mock.nextcloud_upload_url = "http://nextcloud.local/"
+        mock.nextcloud_username = "testuser"
+        mock.nextcloud_password = "testpassword"
+        mock.nextcloud_folder = "uploads"
+        mock.workdir = str(tmp_path)
+        mock.http_request_timeout = 30
+        yield mock
+
+
+@pytest.fixture
+def mock_requests():
+    with patch("app.tasks.upload_to_nextcloud.requests") as mock:
+        # Mock PROPFIND to always return false (file doesn't exist)
+        mock.request.return_value = MagicMock(text="<response></response>")
+
+        # Mock PUT to return success
+        put_response = MagicMock()
+        put_response.status_code = 201
+        mock.put.return_value = put_response
+        yield mock
+
+
+def test_upload_to_nextcloud_url_construction(tmp_path, mock_settings, mock_requests):
+    file_path = str(tmp_path / "test_file.txt")
+
+    # Create dummy file
+    with open(file_path, "w") as f:
+        f.write("test content")
+
+    # Call the task directly
+    with patch("celery.app.task.Task.request", new_callable=MagicMock) as mock_req:
+        mock_req.id = "test-task-123"
+        result = upload_to_nextcloud(file_path)
+
+    assert result["status"] == "Completed"
+    assert result["nextcloud_path"] == "uploads/test_file.txt"
+
+    # Verify requests.put was called with the correct URL
+    mock_requests.put.assert_called_once()
+    args, kwargs = mock_requests.put.call_args
+    url = args[0]
+    assert url == "http://nextcloud.local/uploads/test_file.txt"