Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 19:41:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Made requested changes

Browse source
This commit is contained in:
Fluffy Jenkins 2019-12-18 20:08:20 +00:00
parent 82dc6d197a
commit 0f3e8d2101
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/Application.cpp
View file

@ -3182,7 +3182,6 @@ static const QUrl AUTHORIZED_EXTERNAL_QML_SOURCE { "https://content.highfidelity
void Application::initializeUi() { void Application::initializeUi() {
// Allow remote QML content from trusted sources ONLY // Allow remote QML content from trusted sources ONLY
{ {
auto defaultUrlValidator = OffscreenQmlSurface::getUrlValidator(); auto defaultUrlValidator = OffscreenQmlSurface::getUrlValidator();
@ -3201,18 +3200,15 @@ void Application::initializeUi() {
bool isInWhitelist = false; // assume unsafe bool isInWhitelist = false; // assume unsafe
for (const auto& str : safeURLS) { for (const auto& str : safeURLS) {
qDebug() << "url.toString().startsWith(str) = " << url.toString().startsWith(str);
qDebug() << "str.endsWith('.qml ') = " << str.endsWith(".qml");
if (!str.isEmpty() && str.endsWith(".qml") && url.toString().endsWith(".qml") && if (!str.isEmpty() && str.endsWith(".qml") && url.toString().endsWith(".qml") &&
url.toString().startsWith(str)) { url.toString().startsWith(str)) {
qDebug() << "found matching url!" << url.host(); qCDebug(interfaceapp) << "Found matching url!" << url.host();
isInWhitelist = true; isInWhitelist = true;
return true; return true;
break; // bail early since we found a match
} }
} }
qDebug() << "no matching url :c" << url.host(); qCDebug(interfaceapp) << "No matching url" << url.host();
return defaultUrlValidator(url); return defaultUrlValidator(url);
}; };
OffscreenQmlSurface::setUrlValidator(newValidator); OffscreenQmlSurface::setUrlValidator(newValidator);