Merge pull request #7286 from nextcloud/bugfix/cmd-hosturl-parse

Properly check for webdav or dav path in provided host url for cmd.cpp
nextcloud · Oct 11, 2024 · 7b826d5 · 7b826d5
2 parents 495befa + e79e86f
commit 7b826d5
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp
@@ -15,7 +15,6 @@
  */
 
 #include <iostream>
-#include <random>
 #include <qcoreapplication.h>
 #include <QStringList>
 #include <QUrl>
@@ -345,15 +344,18 @@ 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);
+
+    if (const auto hostUrlPath = hostUrl.path(); 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
-                  << "http(s)://username:[email protected]" << std::endl;
+                  << "https://username:[email protected]" << 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