From 4803ba056d1264f1d2847ac31d91f63b5a34ed67 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Wed, 9 Oct 2024 09:47:03 +0800 Subject: [PATCH] Properly check for webdav or dav path in provided host url for cmd.cpp Signed-off-by: Claudio Cambra --- src/cmd/cmd.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp index b770c3796a8e5..c2a569baa3ec5 100644 --- a/src/cmd/cmd.cpp +++ b/src/cmd/cmd.cpp @@ -344,15 +344,19 @@ int main(int argc, char **argv) return EXIT_FAILURE; } - if (options.target_url.contains("/webdav", Qt::CaseInsensitive) || options.target_url.contains("/dav", Qt::CaseInsensitive)) { + const auto sanitisedTargetUrl = options.target_url.endsWith('/') || options.target_url.endsWith('\\') + ? options.target_url.chopped(1) + : options.target_url; + QUrl hostUrl = QUrl::fromUserInput(sanitisedTargetUrl); + const auto hostUrlPath = hostUrl.path(); + + if (hostUrlPath.contains("/webdav", Qt::CaseInsensitive) || hostUrlPath.contains("/dav", Qt::CaseInsensitive)) { qWarning("Dav or webdav in server URL."); std::cerr << "Error! Please specify only the base URL of your host with username and password. Example:" << std::endl << "https://username:password@cloud.example.com" << std::endl; return EXIT_FAILURE; } - QUrl hostUrl = QUrl::fromUserInput((options.target_url.endsWith(QLatin1Char('/')) || options.target_url.endsWith(QLatin1Char('\\'))) ? options.target_url.chopped(1) : options.target_url); - // Order of retrieval attempt (later attempts override earlier ones): // 1. From URL // 2. From options