Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-19 08:40:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

trying to get /~/ from web sorted out

Browse source
This commit is contained in:
Seth Alves 2016-04-28 17:08:38 -07:00 committed by Seth Alves
parent 82b43dbfec
commit 8c2b89b910
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libraries/script-engine/src/ScriptEngines.cpp
View file

@ -84,12 +84,17 @@ QUrl expandScriptUrl(const QUrl& rawScriptURL) {
url.setPath(defaultScriptsLoc.path() + "/" + splitPath.mid(2).join("/")); // 2 to skip the slashes in /~/
// stop something like Script.include(["/~/../Users/james/Desktop/naughty.js"]); from working
QFileInfo fileInfo(url.path());
url.setPath(fileInfo.absoluteFilePath());
qDebug() << "url: " << url.path();
qDebug() << "BEFORE: " << url.path();
QFileInfo fileInfo(url.toLocalFile());
url = QUrl::fromLocalFile(fileInfo.absoluteFilePath());
qDebug() << "AFTER: " << url.path();
qDebug() << "default: " << defaultScriptsLoc.path();
if (!url.path().startsWith(defaultScriptsLoc.path())) {
if (!defaultScriptsLoc.isParentOf(url)) {
qCWarning(scriptengine) << "Script.include() ignoring file path" << normalizedScriptURL
<< "outside of standard libraries";
<< "outside of standard libraries" << url.path() << defaultScriptsLoc.path();
// return QUrl("");
}
return url;
}