Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-30 12:42:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

housekeeping

Browse source
This commit is contained in:
Kasen IO 2020-01-07 19:40:42 -05:00
parent 13d79fec8b
commit a6dc494d7c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2386,7 +2386,7 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co
QString domainSafeIP = nodeList->getDomainHandler().getHostname(); QString domainSafeIP = nodeList->getDomainHandler().getHostname();
QString domainSafeURL = "hifi://" + currentDomain; QString domainSafeURL = "hifi://" + currentDomain;
for (const auto& str : safeURLS) { for (const auto& str : safeURLS) {
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. Current Domain Host: "
<< nodeList->getDomainHandler().getHostname() << nodeList->getDomainHandler().getHostname()
<< "Current Domain: " << currentDomain; << "Current Domain: " << currentDomain;
@ -2396,9 +2396,9 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co
// END CURRENT DOMAIN WHITELIST BYPASS // END CURRENT DOMAIN WHITELIST BYPASS
// START CHECKING AGAINST THE WHITELIST // START CHECKING AGAINST THE WHITELIST
if (ScriptEngine::getContext() == "entity_server" || passList == true) { // If running on the server or waved through, do not engage whitelist. if (ScriptEngine::getContext() == "entity_server") { // If running on the server, do not engage whitelist.
passList = true; passList = true;
} else { } else if (!passList) { // If waved through, do not engage whitelist.
for (const auto& str : safeURLS) { for (const auto& str : safeURLS) {
qCDebug(scriptengine) << whitelistPrefix << "Script URL: " << scriptOrURL << "TESTING AGAINST" << str << "RESULTS IN" qCDebug(scriptengine) << whitelistPrefix << "Script URL: " << scriptOrURL << "TESTING AGAINST" << str << "RESULTS IN"
<< scriptOrURL.startsWith(str); << scriptOrURL.startsWith(str);