External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-10-03 08:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

NOISSUE Improve path parsing for modrinth packs

Browse Source
This commit is contained in:
Petr Mrázek
2023-02-02 20:51:23 +01:00
parent 1f1cdbe0a8
commit f624754f0c
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
launcher/InstanceImportTask.cpp
View File

@@ -311,7 +311,13 @@ void InstanceImportTask::processModrinth() {
auto jsonFiles = Json::requireIsArrayOf<QJsonObject>(obj, "files", "modrinth.index.json"); auto jsonFiles = Json::requireIsArrayOf<QJsonObject>(obj, "files", "modrinth.index.json");
for(auto & obj: jsonFiles) { for(auto & obj: jsonFiles) {
Modrinth::File file; Modrinth::File file;
file.path = Json::requireString(obj, "path"); auto dirtyPath = Json::requireString(obj, "path");
dirtyPath.replace('\\', '/');
auto simplifiedPath = QDir::cleanPath(dirtyPath);
QFileInfo fileInfo (simplifiedPath);
if(simplifiedPath.startsWith("../") || simplifiedPath.contains("/../") || fileInfo.isAbsolute()) {
throw JSONValidationError("Invalid path found in modpack files:\n\n" + simplifiedPath);
}
// env doesn't have to be present, in that case mod is required // env doesn't have to be present, in that case mod is required
auto env = Json::ensureObject(obj, "env"); auto env = Json::ensureObject(obj, "env");