Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 10:37:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

New feature

Browse source
This commit is contained in:
Fluffy Jenkins 2019-12-14 03:02:13 +00:00
parent bbf0a92be2
commit 82dc6d197a
1 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
interface/src/Application.cpp
View file

@ -3182,13 +3182,37 @@ 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();
auto newValidator = [=](const QUrl& url)->bool { auto newValidator = [=](const QUrl& url) -> bool {
if (AUTHORIZED_EXTERNAL_QML_SOURCE.isParentOf(url)) { QString whitelistPrefix = "[WHITELIST ENTITY SCRIPTS]";
QList<QString> safeURLS = { "" };
safeURLS += qEnvironmentVariable("EXTRA_WHITELIST").trimmed().split(QRegExp("\\s*,\\s*"), QString::SkipEmptyParts);
// PULL SAFEURLS FROM INTERFACE.JSON Settings
QVariant raw = Setting::Handle<QVariant>("private/settingsSafeURLS").get();
QStringList settingsSafeURLS = raw.toString().trimmed().split(QRegExp("\\s*[,\r\n]+\\s*"), QString::SkipEmptyParts);
safeURLS += settingsSafeURLS;
// END PULL SAFEURLS FROM INTERFACE.JSON Settings
bool isInWhitelist = false; // assume unsafe
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") &&
url.toString().startsWith(str)) {
qDebug() << "found matching url!" << url.host();
isInWhitelist = true;
return true; return true;
break; // bail early since we found a match
} }
}
qDebug() << "no matching url :c" << url.host();
return defaultUrlValidator(url); return defaultUrlValidator(url);
}; };
OffscreenQmlSurface::setUrlValidator(newValidator); OffscreenQmlSurface::setUrlValidator(newValidator);