From: Camila Ayres <hello@camilasan.com>
Date: Wed, 25 Sep 2024 16:25:00 +0000 (+0200)
Subject: Validate input of APPLICATION_SERVER_URL.
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~58^2^2~163^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ee351aa1322eb8ee2beb5cc2d627277cf6a6b3a7;p=nextcloud-desktop.git

Validate input of APPLICATION_SERVER_URL.

Tries to clean double quotes and output JSON parse error.

Signed-off-by: Camila Ayres <hello@camilasan.com>
---

diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp
index 407db59ba..85efef02b 100644
--- a/src/libsync/theme.cpp
+++ b/src/libsync/theme.cpp
@@ -384,8 +384,7 @@ Theme::Theme()
     _forceOverrideServerUrl = true;
 #endif
 #ifdef APPLICATION_SERVER_URL
-    _overrideServerUrl = QString::fromLatin1(APPLICATION_SERVER_URL);
-    updateMultipleOverrideServers();
+    setOverrideServerUrl(QString::fromLatin1(APPLICATION_SERVER_URL));
 #endif
 }
 
@@ -438,7 +437,12 @@ bool Theme::forceOverrideServerUrl() const
 void Theme::updateMultipleOverrideServers()
 {
     const auto json = overrideServerUrl().toUtf8();
-    const auto doc = QJsonDocument::fromJson(json);
+    QJsonParseError jsonParseError;
+    const auto doc = QJsonDocument::fromJson(json, &jsonParseError);
+    if (jsonParseError.error != QJsonParseError::NoError) {
+        qDebug() << "Parsing array of server urls from APPLICATION_SERVER_URL failed:" << jsonParseError.error << jsonParseError.errorString();
+    }
+
     _multipleOverrideServers = doc.isArray() && !doc.array().empty();
 }
 
@@ -967,8 +971,17 @@ bool Theme::darkMode()
 
 void Theme::setOverrideServerUrl(const QString &overrideServerUrl)
 {
-    if (_overrideServerUrl != overrideServerUrl) {
-        _overrideServerUrl = overrideServerUrl;
+    auto validOverrideServerUrl = overrideServerUrl;
+    if (validOverrideServerUrl.startsWith("\"")) {
+        validOverrideServerUrl.remove(0, 1);
+    }
+
+    if (validOverrideServerUrl.endsWith("\"")) {
+        validOverrideServerUrl.chop(1);
+    }
+
+    if (_overrideServerUrl != validOverrideServerUrl) {
+        _overrideServerUrl = validOverrideServerUrl;
         updateMultipleOverrideServers();
         emit overrideServerUrlChanged();
     }