From 3e6660b63325d568beec3f1ae2cf65fd706010c6 Mon Sep 17 00:00:00 2001 From: Kasen IO Date: Mon, 9 Dec 2019 08:30:02 -0500 Subject: [PATCH] Updated whitelist debugs for clarity in dev log --- libraries/script-engine/src/ScriptEngine.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index 47a417026c..482bde9fd4 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -2364,6 +2364,7 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co } else { // ENTITY SCRIPT WHITELIST STARTS HERE + QString whitelistPrefix = "[WHITELIST ENTITY SCRIPTS]"; QList safeURLS = { "" }; 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 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); if (!str.isEmpty() && scriptOrURL.startsWith(str)) { isInWhitelist = true; - qCDebug(scriptengine) << "Script approved."; + qCDebug(scriptengine) << whitelistPrefix << "Script approved."; break; // bail early since we found a match } } 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"); } else { QTimer timeout;