Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 06:44:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Housekeeping.

Browse source
This commit is contained in:
Kasen IO 2020-01-23 03:06:58 -05:00
parent fbaf0ea56b
commit c121a8ef2a
3 changed files with 45 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
interface/resources/qml/hifi/dialogs/security/EntityScriptQMLWhitelist.qml
View file

@ -21,52 +21,50 @@ import "../../../windows"
Rectangle { Rectangle {
id: parentBody; id: parentBody;
function getWhitelistAsText() {
var whitelist = Settings.getValue("private/settingsSafeURLS");
var arrayWhitelist = whitelist.split(",");
var whitelistText = arrayWhitelist.join("\n");
return whitelistText;
}
function setWhitelistAsText(whitelistText) {
Settings.setValue("private/settingsSafeURLS", whitelistText.text);
var originalSetString = whitelistText.text; function getWhitelistAsText() {
var originalSet = originalSetString.split(' ').join(''); var whitelist = Settings.getValue("private/settingsSafeURLS");
var arrayWhitelist = whitelist.split(",").join("\n");
return arrayWhitelist;
}
var check = Settings.getValue("private/settingsSafeURLS"); function setWhitelistAsText(whitelistText) {
var arrayCheck = check.split(","); Settings.setValue("private/settingsSafeURLS", whitelistText.text);
var textCheck = arrayCheck.join("\n");
if (textCheck == originalSet) { var originalSetString = whitelistText.text;
setWhitelistSuccess(true); var originalSet = originalSetString.split(' ').join('');
} else {
setWhitelistSuccess(false); var check = Settings.getValue("private/settingsSafeURLS");
} var arrayCheck = check.split(",").join("\n");
}
if (arrayCheck === originalSet) {
function setWhitelistSuccess(success) { setWhitelistSuccess(true);
if (success) { } else {
notificationText.text = "Successfully saved settings."; setWhitelistSuccess(false);
} else { }
notificationText.text = "Error! Settings not saved."; }
}
} function setWhitelistSuccess(success) {
if (success) {
function toggleWhitelist(enabled) { notificationText.text = "Successfully saved settings.";
Settings.setValue("private/whitelistEnabled", enabled); } else {
console.info("Toggling Whitelist to:", enabled); notificationText.text = "Error! Settings not saved.";
} }
}
function initCheckbox() {
var check = Settings.getValue("private/whitelistEnabled"); function toggleWhitelist(enabled) {
Settings.setValue("private/whitelistEnabled", enabled);
if (check == true) { console.info("Toggling Whitelist to:", enabled);
whitelistEnabled.toggle(); }
}
} function initCheckbox() {
var check = Settings.getValue("private/whitelistEnabled", false);
if (check) {
whitelistEnabled.toggle();
}
}
anchors.fill: parent anchors.fill: parent
@ -180,7 +178,7 @@ Rectangle {
HifiStylesUit.RalewayRegular { HifiStylesUit.RalewayRegular {
id: descriptionText; id: descriptionText;
text: text:
"The whitelist checks scripts/QML as it is loaded.<br/> "The whitelist checks scripts & QML as they are loaded.<br/>
Therefore, if a script is cached or has no reason to load again,<br/> Therefore, if a script is cached or has no reason to load again,<br/>
then removing it from the whitelist will not be effective until<br/> then removing it from the whitelist will not be effective until<br/>
it is reloaded.<br/> it is reloaded.<br/>

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

@ -2333,7 +2333,7 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co
if (isURL) { if (isURL) {
setParentURL(scriptOrURL); setParentURL(scriptOrURL);
} }
// SANITY/PERFORMANCE CHECK USING SANDBOX // SANITY/PERFORMANCE CHECK USING SANDBOX
const int SANDBOX_TIMEOUT = 0.25 * MSECS_PER_SECOND; const int SANDBOX_TIMEOUT = 0.25 * MSECS_PER_SECOND;
BaseScriptEngine sandbox; BaseScriptEngine sandbox;
@ -2370,8 +2370,8 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co
safeURLPrefixes += qEnvironmentVariable("EXTRA_WHITELIST").trimmed().split(QRegExp("\\s*,\\s*"), QString::SkipEmptyParts); safeURLPrefixes += qEnvironmentVariable("EXTRA_WHITELIST").trimmed().split(QRegExp("\\s*,\\s*"), QString::SkipEmptyParts);
// ENTITY SCRIPT WHITELIST TOGGLE CHECK // ENTITY SCRIPT WHITELIST TOGGLE CHECK
Setting::Handle<bool> _whitelistEnabled{"private/whitelistEnabled", false }; Setting::Handle<bool> whitelistEnabled{"private/whitelistEnabled", false };
bool whitelistEnabled = _whitelistEnabled.get(); bool whitelistEnabled = whitelistEnabled.get();
if (!whitelistEnabled) { if (!whitelistEnabled) {
qCDebug(scriptengine) << "Whitelist Enabled: " << whitelistEnabled; qCDebug(scriptengine) << "Whitelist Enabled: " << whitelistEnabled;

1
libraries/script-engine/src/ScriptEngine.h
View file

@ -974,7 +974,6 @@ protected:
Setting::Handle<bool> _enableExtendedJSExceptions { _SETTINGS_ENABLE_EXTENDED_EXCEPTIONS, true }; Setting::Handle<bool> _enableExtendedJSExceptions { _SETTINGS_ENABLE_EXTENDED_EXCEPTIONS, true };
QWeakPointer<ScriptEngines> _scriptEngines; QWeakPointer<ScriptEngines> _scriptEngines;
}; };
ScriptEnginePointer scriptEngineFactory(ScriptEngine::Context context, ScriptEnginePointer scriptEngineFactory(ScriptEngine::Context context,