Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-19 05:40:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated whitelist debugs for clarity in dev log

Browse source
This commit is contained in:
Kasen IO 2019-12-09 08:30:02 -05:00
parent 2de388ab3b
commit 3e6660b633
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -2364,6 +2364,7 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co
} }
else { else {
// ENTITY SCRIPT WHITELIST STARTS HERE // ENTITY SCRIPT WHITELIST STARTS HERE
QString whitelistPrefix = "[WHITELIST ENTITY SCRIPTS]";
QList<QString> safeURLS = { "" }; QList<QString> safeURLS = { "" };
safeURLS += qEnvironmentVariable("EXTRA_WHITELIST").trimmed().split(QRegExp("\\s*,\\s*"), QString::SkipEmptyParts); safeURLS += qEnvironmentVariable("EXTRA_WHITELIST").trimmed().split(QRegExp("\\s*,\\s*"), QString::SkipEmptyParts);
@ -2377,16 +2378,16 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co
bool isInWhitelist = false; // assume unsafe bool isInWhitelist = false; // assume unsafe
for (const auto& str : safeURLS) { for (const auto& str : safeURLS) {
qCDebug(scriptengine) << "Script URL: " << scriptOrURL << "TESTING AGAINST" << str << "RESULTS IN" qCDebug(scriptengine) << whitelistPrefix << "Script URL: " << scriptOrURL << "TESTING AGAINST" << str << "RESULTS IN"
<< scriptOrURL.startsWith(str); << scriptOrURL.startsWith(str);
if (!str.isEmpty() && scriptOrURL.startsWith(str)) { if (!str.isEmpty() && scriptOrURL.startsWith(str)) {
isInWhitelist = true; isInWhitelist = true;
qCDebug(scriptengine) << "Script approved."; qCDebug(scriptengine) << whitelistPrefix << "Script approved.";
break; // bail early since we found a match break; // bail early since we found a match
} }
} }
if (!isInWhitelist) { if (!isInWhitelist) {
qCDebug(scriptengine) << "(disabled entity script)" << entityID.toString() << scriptOrURL; qCDebug(scriptengine) << whitelistPrefix << "(disabled entity script)" << entityID.toString() << scriptOrURL;
exception = makeError("UNSAFE_ENTITY_SCRIPTS == 0"); exception = makeError("UNSAFE_ENTITY_SCRIPTS == 0");
} else { } else {
QTimer timeout; QTimer timeout;