From 428a5b65ff8dc35daa862e4671ed1350ab2eb9c4 Mon Sep 17 00:00:00 2001 From: Kasen IO Date: Mon, 27 Jan 2020 13:13:36 -0500 Subject: [PATCH] Lint --- .../security/EntityScriptQMLWhitelist.qml | 230 +++++++++--------- libraries/script-engine/src/ScriptEngine.cpp | 16 +- 2 files changed, 123 insertions(+), 123 deletions(-) diff --git a/interface/resources/qml/hifi/dialogs/security/EntityScriptQMLWhitelist.qml b/interface/resources/qml/hifi/dialogs/security/EntityScriptQMLWhitelist.qml index 7ce80c777a..9e0b6ba4cf 100644 --- a/interface/resources/qml/hifi/dialogs/security/EntityScriptQMLWhitelist.qml +++ b/interface/resources/qml/hifi/dialogs/security/EntityScriptQMLWhitelist.qml @@ -63,41 +63,41 @@ Rectangle { } - anchors.fill: parent - width: parent.width; - height: 120; - color: "#80010203"; + anchors.fill: parent + width: parent.width; + height: 120; + color: "#80010203"; - HifiStylesUit.RalewayRegular { - id: titleText; - text: "Entity Script / QML Whitelist" - // Text size - size: 24; - // Style - color: "white"; - elide: Text.ElideRight; - // Anchors - anchors.top: parent.top; - anchors.left: parent.left; - anchors.leftMargin: 20; - anchors.right: parent.right; - anchors.rightMargin: 20; - height: 60; + HifiStylesUit.RalewayRegular { + id: titleText; + text: "Entity Script / QML Whitelist" + // Text size + size: 24; + // Style + color: "white"; + elide: Text.ElideRight; + // Anchors + anchors.top: parent.top; + anchors.left: parent.left; + anchors.leftMargin: 20; + anchors.right: parent.right; + anchors.rightMargin: 20; + height: 60; - CheckBox { + CheckBox { Component.onCompleted: { initCheckbox(); } - + id: whitelistEnabled; - + anchors.right: parent.right; anchors.top: parent.top; anchors.topMargin: 10; onToggled: { toggleWhitelist(whitelistEnabled.checked) } - + Label { text: "Enabled" color: "white" @@ -107,100 +107,100 @@ Rectangle { anchors.topMargin: 10; } } - } + } - Rectangle { - id: textAreaRectangle; - color: "black"; - width: parent.width; - height: 250; - anchors.top: titleText.bottom; - - ScrollView { - id: textAreaScrollView - anchors.fill: parent; - width: parent.width - height: parent.height - contentWidth: parent.width - contentHeight: parent.height - clip: false; - - TextArea { - id: whitelistTextArea - text: getWhitelistAsText(); - onTextChanged: notificationText.text = ""; + Rectangle { + id: textAreaRectangle; + color: "black"; width: parent.width; - height: parent.height; - font.family: "Ubuntu"; - font.pointSize: 12; - color: "white"; - } - } + height: 250; + anchors.top: titleText.bottom; - Button { - id: saveChanges - anchors.topMargin: 5; - anchors.leftMargin: 20; - anchors.rightMargin: 20; - x: textAreaRectangle.x + textAreaRectangle.width - width - 15; - y: textAreaRectangle.y + textAreaRectangle.height - height; - contentItem: Text { - text: saveChanges.text - font.family: "Ubuntu"; - font.pointSize: 12; - opacity: enabled ? 1.0 : 0.3 - color: "black" - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - elide: Text.ElideRight - } - text: "Save Changes" - onClicked: setWhitelistAsText(whitelistTextArea) - - HifiStylesUit.RalewayRegular { - id: notificationText; - text: "" - // Text size - size: 16; - // Style - color: "white"; - elide: Text.ElideLeft; - // Anchors - anchors.right: parent.left; - anchors.rightMargin: 10; - } + ScrollView { + id: textAreaScrollView + anchors.fill: parent; + width: parent.width + height: parent.height + contentWidth: parent.width + contentHeight: parent.height + clip: false; + + TextArea { + id: whitelistTextArea + text: getWhitelistAsText(); + onTextChanged: notificationText.text = ""; + width: parent.width; + height: parent.height; + font.family: "Ubuntu"; + font.pointSize: 12; + color: "white"; + } + } + + Button { + id: saveChanges + anchors.topMargin: 5; + anchors.leftMargin: 20; + anchors.rightMargin: 20; + x: textAreaRectangle.x + textAreaRectangle.width - width - 15; + y: textAreaRectangle.y + textAreaRectangle.height - height; + contentItem: Text { + text: saveChanges.text + font.family: "Ubuntu"; + font.pointSize: 12; + opacity: enabled ? 1.0 : 0.3 + color: "black" + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight + } + text: "Save Changes" + onClicked: setWhitelistAsText(whitelistTextArea) + + HifiStylesUit.RalewayRegular { + id: notificationText; + text: "" + // Text size + size: 16; + // Style + color: "white"; + elide: Text.ElideLeft; + // Anchors + anchors.right: parent.left; + anchors.rightMargin: 10; + } + } + + HifiStylesUit.RalewayRegular { + id: descriptionText; + text: + "The whitelist checks scripts and QML as they are loaded.
+ Therefore, if a script is cached or has no reason to load again,
+ removing it from the whitelist will have no effect until
+ it is reloaded.
+ Separate your whitelisted domains by line, not commas. e.g. +
+ https://google.com/
+ hifi://the-spot/
+ 127.0.0.1
+ https://mydomain.here/ +
+ Ensure there are no spaces or whitespace.

+ For QML files, you can only whitelist each file individually
+ ending with '.qml'." + // Text size + size: 16; + // Style + color: "white"; + elide: Text.ElideRight; + textFormat: Text.RichText; + // Anchors + anchors.top: parent.bottom; + anchors.topMargin: 90; + anchors.left: parent.left; + anchors.leftMargin: 20; + anchors.right: parent.right; + anchors.rightMargin: 20; + } } - - HifiStylesUit.RalewayRegular { - id: descriptionText; - text: -"The whitelist checks scripts & QML as they are loaded.
-Therefore, if a script is cached or has no reason to load again,
-removing it from the whitelist will have no effect until
-it is reloaded.
-Separate your whitelisted domains by line, not commas. e.g. -
- https://google.com/
- hifi://the-spot/
- 127.0.0.1
- https://mydomain.here/ -
-Ensure there are no spaces or whitespace.

-For QML files, you can only whitelist each file individually
-ending with '.qml'." - // Text size - size: 16; - // Style - color: "white"; - elide: Text.ElideRight; - textFormat: Text.RichText; - // Anchors - anchors.top: parent.bottom; - anchors.topMargin: 90; - anchors.left: parent.left; - anchors.leftMargin: 20; - anchors.right: parent.right; - anchors.rightMargin: 20; - } - } } diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index da88e8e689..98f1f3082f 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -2369,20 +2369,20 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co QList safeURLPrefixes = { "file:///", "atp:", "cache:" }; safeURLPrefixes += qEnvironmentVariable("EXTRA_WHITELIST").trimmed().split(QRegExp("\\s*,\\s*"), QString::SkipEmptyParts); - // ENTITY SCRIPT WHITELIST TOGGLE CHECK + // Entity Script Whitelist toggle check. Setting::Handle whitelistEnabled {"private/whitelistEnabled", false }; if (!whitelistEnabled.get()) { passList = true; } - // PULL SAFEURLS FROM INTERFACE.JSON Settings + // Pull SAFEURLS from the Interface.JSON settings. QVariant raw = Setting::Handle("private/settingsSafeURLS").get(); QStringList settingsSafeURLS = raw.toString().trimmed().split(QRegExp("\\s*[,\r\n]+\\s*"), QString::SkipEmptyParts); safeURLPrefixes += settingsSafeURLS; - // END PULL SAFEURLS FROM INTERFACE.JSON Settings + // END Pull SAFEURLS from the Interface.JSON settings. - // GET CURRENT DOMAIN WHITELIST BYPASS, IN CASE AN ENTIRE DOMAIN IS WHITELISTED + // Get current domain whitelist bypass, in case an entire domain is whitelisted. QString currentDomain = DependencyManager::get()->getDomainURL().host(); QString domainSafeIP = nodeList->getDomainHandler().getHostname(); @@ -2395,9 +2395,9 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co passList = true; } } - // END CURRENT DOMAIN WHITELIST BYPASS + // END bypass whitelist based on current domain. - // START CHECKING AGAINST THE WHITELIST + // Start processing scripts through the whitelist. if (ScriptEngine::getContext() == "entity_server") { // If running on the server, do not engage whitelist. passList = true; } else if (!passList) { // If waved through, do not engage whitelist. @@ -2407,11 +2407,11 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co if (!str.isEmpty() && scriptOrURL.startsWith(str)) { passList = true; qCDebug(scriptengine) << whitelistPrefix << "Script approved."; - break; // bail early since we found a match + break; // Bail early since we found a match. } } } - // END CHECKING AGAINST THE WHITELIST + // END processing of scripts through the whitelist. if (!passList) { // If the entity failed to pass for any reason, it's blocked and an error is thrown. qCDebug(scriptengine) << whitelistPrefix << "(disabled entity script)" << entityID.toString() << scriptOrURL;