Ignore trailing slash in checkserverjobfactory url comparison

2 files changed, 17 insertions, 0 deletions

diff --git a/src/common/utility.cpp b/src/common/utility.cpp
index c0f97ca5d..0b9bb244a 100644
--- a/src/common/utility.cpp
+++ b/src/common/utility.cpp
@@ -495,6 +495,20 @@ QUrl Utility::concatUrlPath(const QUrl &url, const QString &concatPath,
     return tmpUrl;
 }
 
+bool Utility::urlEqual(QUrl url1, QUrl url2)
+{
+    // ensure https://demo.owncloud.org/ matches https://demo.owncloud.org
+    // the empty path was the legacy formating before 2.9
+    if (url1.path().isEmpty()) {
+        url1.setPath(QStringLiteral("/"));
+    }
+    if (url2.path().isEmpty()) {
+        url2.setPath(QStringLiteral("/"));
+    }
+
+    return url1.matches(url2, QUrl::StripTrailingSlash | QUrl::NormalizePathSegments);
+}
+
 QString Utility::makeConflictFileName(
     const QString &fn, const QDateTime &dt, const QString &user)
 {
diff --git a/src/common/utility.h b/src/common/utility.h
index 642f184c9..c309fdb4b 100644
--- a/src/common/utility.h
+++ b/src/common/utility.h
@@ -204,6 +204,9 @@ OCSYNC_EXPORT Q_DECLARE_LOGGING_CATEGORY(lcUtility)
         const QUrl &url, const QString &concatPath,
         const QUrlQuery &queryItems = {});
 
+    /** Compares two urls and ignores whether thei end wit / */
+    OCSYNC_EXPORT bool urlEqual(QUrl a, QUrl b);
+
     /**  Returns a new settings pre-set in a specific group.  The Settings will be created
          with the given parent. If no parent is specified, the caller must destroy the settings */
     OCSYNC_EXPORT std::unique_ptr<QSettings> settingsWithGroup(const QString &group, QObject *parent = nullptr);