Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-15 08:26:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #5 from kasenvr/feature/whitelist-qml-cpp-ui

Browse source 
scriptengine pulls from inferface.json correctly, removed extra debug…
This commit is contained in:
kasenvr 2019-12-08 23:19:26 -05:00 committed by GitHub
commit 858b056803
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/resources/qml/hifi/dialogs/security/EntityScriptWhitelist.qml
View file

@ -24,13 +24,13 @@ Rectangle {
function getWhitelistAsText() { function getWhitelistAsText() {
var whitelist = Settings.getValue("private/settingsSafeURLS"); var whitelist = Settings.getValue("private/settingsSafeURLS");
return whitelist; var arrayWhitelist = whitelist.split(",");
var whitelistText = arrayWhitelist.join("\n");
return whitelistText;
} }
function setWhiteListAsText(whitelistText) { function setWhiteListAsText(whitelistText) {
console.info('SETTINGCURRENTVALUE: ', Settings.getValue('private/settingsSafeURLS'), whitelistText.text)
Settings.setValue("private/settingsSafeURLS", whitelistText.text); Settings.setValue("private/settingsSafeURLS", whitelistText.text);
console.info('SETVALUE: ', Settings.getValue('private/settingsSafeURLS'), whitelistText.text)
} }
anchors.fill: parent anchors.fill: parent

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

@ -2370,7 +2370,7 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co
// PULL SAFEURLS FROM INTERFACE.JSON Settings // PULL SAFEURLS FROM INTERFACE.JSON Settings
QVariant raw = Setting::Handle<QVariant>("private/settingsSafeURLS").get(); QVariant raw = Setting::Handle<QVariant>("private/settingsSafeURLS").get();
QStringList settingsSafeURLS = raw.toString().split(QRegExp("[\r\n]+")); QStringList settingsSafeURLS = raw.toString().split(QRegExp("\\s*[,\r\n]+\\s*"));
safeURLS += settingsSafeURLS; safeURLS += settingsSafeURLS;
// END PULL SAFEURLS FROM INTERFACE.JSON Settings // END PULL SAFEURLS FROM INTERFACE.JSON Settings
@ -2378,10 +2378,11 @@ 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) {
// qDebug() << "CHECKING" << entityID.toString() << scriptOrURL << "AGAINST" << str; // qDebug() << "CHECKING" << entityID.toString() << scriptOrURL << "AGAINST" << str;
qCDebug(scriptengine) << "SCRIPT URL STARTSWITH" << scriptOrURL << "TESTING AGAINST" << str << "RESULTS IN" qCDebug(scriptengine) << "Script URL: " << scriptOrURL << "TESTING AGAINST" << str << "RESULTS IN"
<< scriptOrURL.startsWith(str); << scriptOrURL.startsWith(str);
if (scriptOrURL.startsWith(str)) { if (scriptOrURL.startsWith(str)) {
isInWhitelist = true; isInWhitelist = true;
qCDebug(scriptengine) << "Script approved.";
break; // bail early since we found a match break; // bail early since we found a match
} }
} }