Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 3 files). Show all
Unified · Split
| @@ -2333,7 +2333,7 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co · 2332 unmodified lines | ||
| 2333 | 2333 | if (isURL) { |
| 2334 | 2334 | setParentURL(scriptOrURL); |
| 2335 | 2335 | } |
| 2336 | − | |
| 2336 | + | |
| 2337 | 2337 | // SANITY/PERFORMANCE CHECK USING SANDBOX |
| 2338 | 2338 | const int SANDBOX_TIMEOUT = 0.25 * MSECS_PER_SECOND; |
| 2339 | 2339 | BaseScriptEngine sandbox; |
| @@ -2369,11 +2369,23 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co · 29 unmodified lines | ||
| 2369 | 2369 | QList<QString> safeURLPrefixes = { "file:///", "atp:", "cache:" }; |
| 2370 | 2370 | safeURLPrefixes += qEnvironmentVariable("EXTRA_WHITELIST").trimmed().split(QRegExp("\\s*,\\s*"), QString::SkipEmptyParts); |
| 2371 | 2371 | |
| 2372 | − // IF WHITELIST IS DISABLED IN SETTINGS | |
| 2373 | − bool whitelistEnabled = Setting::Handle<bool>("private/whitelistEnabled", true).get(); | |
| 2372 | + // ENTITY SCRIPT WHITELIST TOGGLE CHECK | |
| 2373 | + Setting::Handle<bool> whitelistEnabledSetting{"private/whitelistEnabled", true}; // Assume it is enabled. | |
| 2374 | + bool whitelistEnabled = whitelistEnabledSetting.get(); | |
| 2375 | + | |
| 2376 | + // QVariant whitelistEnabledExists = Setting::Handle<QVariant>("private/whitelistEnabled", false).get(); | |
| 2377 | + if (whitelistEnabled) { | |
| 2378 | + whitelistEnabledSetting.set(true); | |
| 2379 | + qCDebug(scriptengine) << "Whitelist toggle setting does not exist. Creating setting now."; | |
| 2380 | + } else { | |
| 2381 | + qCDebug(scriptengine) << "Whitelist toggle setting does not exist. Creating setting now."; | |
| 2382 | + whitelistEnabledSetting.set(false); | |
| 2383 | + } | |
| 2384 | + | |
| 2374 | 2385 | if (!whitelistEnabled) { |
| 2375 | 2386 | passList = true; |
| 2376 | 2387 | } |
| 2388 | + qCDebug(scriptengine) << "Whitelist Enabled: " << whitelistEnabled; | |
| 2377 | 2389 | |
| 2378 | 2390 | // PULL SAFEURLS FROM INTERFACE.JSON Settings |
| 2379 | 2391 | QVariant raw = Setting::Handle<QVariant>("private/settingsSafeURLS").get(); |