Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed extra debug, added debug for user awareness.

Browse source
This commit is contained in:
Kasen IO 2020-01-22 14:53:55 -05:00
parent fd5ee3e1a7
commit 7a985b445e
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -57,13 +57,12 @@ Rectangle {
function toggleWhitelist(enabled) { function toggleWhitelist(enabled) {
Settings.setValue("private/whitelistEnabled", enabled); Settings.setValue("private/whitelistEnabled", enabled);
console.info("NANI?",enabled); console.info("Toggling Whitelist to:", enabled);
} }
function initCheckbox() { function initCheckbox() {
var check = Settings.getValue("private/whitelistEnabled"); var check = Settings.getValue("private/whitelistEnabled");
console.info("Triggered init. Val:", check);
if (check == true) { if (check == true) {
whitelistEnabled.toggle(); whitelistEnabled.toggle();
} }
@ -102,7 +101,6 @@ Rectangle {
anchors.top: parent.top; anchors.top: parent.top;
anchors.topMargin: 10; anchors.topMargin: 10;
onToggled: { onToggled: {
console.info("Triggered.0");
toggleWhitelist(whitelistEnabled.checked) toggleWhitelist(whitelistEnabled.checked)
} }

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

@ -2374,9 +2374,9 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co
bool whitelistEnabled = _whitelistEnabled.get(); bool whitelistEnabled = _whitelistEnabled.get();
if (!whitelistEnabled) { if (!whitelistEnabled) {
qCDebug(scriptengine) << "Whitelist Enabled: " << whitelistEnabled;
passList = true; passList = true;
} }
qCDebug(scriptengine) << "Whitelist Enabled: " << whitelistEnabled;
// 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();
@ -2391,7 +2391,7 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co
QString domainSafeURL = URL_SCHEME_HIFI + "://" + currentDomain; QString domainSafeURL = URL_SCHEME_HIFI + "://" + currentDomain;
for (const auto& str : safeURLPrefixes) { for (const auto& str : safeURLPrefixes) {
if (domainSafeURL.startsWith(str) || domainSafeIP.startsWith(str)) { if (domainSafeURL.startsWith(str) || domainSafeIP.startsWith(str)) {
qCDebug(scriptengine) << whitelistPrefix << "Whitelist Bypassed. Current Domain Host: " qCDebug(scriptengine) << whitelistPrefix << "Whitelist Bypassed, entire domain is whitelisted. Current Domain Host: "
<< nodeList->getDomainHandler().getHostname() << nodeList->getDomainHandler().getHostname()
<< "Current Domain: " << currentDomain; << "Current Domain: " << currentDomain;
passList = true; passList = true;