From 84e5a27b322b965abb5f84aa65ef8aa4b4704242 Mon Sep 17 00:00:00 2001 From: Kasen IO Date: Wed, 15 Apr 2020 21:14:32 -0400 Subject: [PATCH 1/3] Add community-apps repo to default QML whitelist. --- interface/src/Application.cpp | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index a73281e569..932609ecfb 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3167,7 +3167,7 @@ void Application::showLoginScreen() { #endif } -static const QUrl AUTHORIZED_EXTERNAL_QML_SOURCE { "https://content.highfidelity.com/Experiences/Releases" }; +static const QUrl AUTHORIZED_EXTERNAL_QML_SOURCE { "https://kasenvr.github.io/community-apps/applications" }; void Application::initializeUi() { @@ -3188,12 +3188,18 @@ void Application::initializeUi() { // END PULL SAFEURLS FROM INTERFACE.JSON Settings bool isInWhitelist = false; // assume unsafe - for (const auto& str : safeURLS) { - if (!str.isEmpty() && str.endsWith(".qml") && url.toString().endsWith(".qml") && - url.toString().startsWith(str)) { - qCDebug(interfaceapp) << "Found matching url!" << url.host(); - isInWhitelist = true; - return true; + + if (AUTHORIZED_EXTERNAL_QML_SOURCE.isParentOf(url)) { + isInWhitelist = true; + return true; + } else { + for (const auto& str : safeURLS) { + if (!str.isEmpty() && str.endsWith(".qml") && url.toString().endsWith(".qml") && + url.toString().startsWith(str)) { + qCDebug(interfaceapp) << "Found matching url!" << url.host(); + isInWhitelist = true; + return true; + } } } From e85c50e71209887950cc96bd06e3a2bb0163d77c Mon Sep 17 00:00:00 2001 From: Kasen IO Date: Sun, 19 Apr 2020 23:44:11 -0400 Subject: [PATCH 2/3] Update URL. --- interface/src/Application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 932609ecfb..4657affb67 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3167,7 +3167,7 @@ void Application::showLoginScreen() { #endif } -static const QUrl AUTHORIZED_EXTERNAL_QML_SOURCE { "https://kasenvr.github.io/community-apps/applications" }; +static const QUrl AUTHORIZED_EXTERNAL_QML_SOURCE { "https://cdn.vircadia.com/community-apps/applications" }; void Application::initializeUi() { From 8b410c662efe9ae0d5cefb989f1e8a61155f8745 Mon Sep 17 00:00:00 2001 From: kasenvr <52365539+kasenvr@users.noreply.github.com> Date: Sat, 16 May 2020 16:35:16 -0400 Subject: [PATCH 3/3] Removed unused variable. --- interface/src/Application.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 4657affb67..1c3eeb5909 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3186,18 +3186,14 @@ void Application::initializeUi() { safeURLS += settingsSafeURLS; // END PULL SAFEURLS FROM INTERFACE.JSON Settings - - bool isInWhitelist = false; // assume unsafe if (AUTHORIZED_EXTERNAL_QML_SOURCE.isParentOf(url)) { - isInWhitelist = true; return true; } else { for (const auto& str : safeURLS) { if (!str.isEmpty() && str.endsWith(".qml") && url.toString().endsWith(".qml") && url.toString().startsWith(str)) { qCDebug(interfaceapp) << "Found matching url!" << url.host(); - isInWhitelist = true; return true; } }