Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 2 files). Show all
Unified · Split
| @@ -2370,7 +2370,7 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co · 2369 unmodified lines | ||
| 2370 | 2370 | // PULL SAFEURLS FROM INTERFACE.JSON Settings |
| 2371 | 2371 | |
| 2372 | 2372 | QVariant raw = Setting::Handle<QVariant>("private/settingsSafeURLS").get(); |
| 2373 | − QStringList settingsSafeURLS = raw.toString().split(QRegExp("[\r\n]+")); | |
| 2373 | + QStringList settingsSafeURLS = raw.toString().split(QRegExp("\\s*[,\r\n]+\\s*")); | |
| 2374 | 2374 | safeURLS += settingsSafeURLS; |
| 2375 | 2375 | |
| 2376 | 2376 | // END PULL SAFEURLS FROM INTERFACE.JSON Settings |
| @@ -2378,10 +2378,11 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co · 1 unmodified line | ||
| 2378 | 2378 | bool isInWhitelist = false; // assume unsafe |
| 2379 | 2379 | for (const auto& str : safeURLS) { |
| 2380 | 2380 | // qDebug() << "CHECKING" << entityID.toString() << scriptOrURL << "AGAINST" << str; |
| 2381 | − qCDebug(scriptengine) << "SCRIPT URL STARTSWITH" << scriptOrURL << "TESTING AGAINST" << str << "RESULTS IN" | |
| 2381 | + qCDebug(scriptengine) << "Script URL: " << scriptOrURL << "TESTING AGAINST" << str << "RESULTS IN" | |
| 2382 | 2382 | << scriptOrURL.startsWith(str); |
| 2383 | 2383 | if (scriptOrURL.startsWith(str)) { |
| 2384 | 2384 | isInWhitelist = true; |
| 2385 | + qCDebug(scriptengine) << "Script approved."; | |
| 2385 | 2386 | break; // bail early since we found a match |
| 2386 | 2387 | } |
| 2387 | 2388 | } |