CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: validate whitelisted download urls

Browse Source
This commit is contained in:
flow
2022-05-15 15:58:23 -03:00
parent 78cf0c73c8
commit 7194bb1b81
3 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
launcher/modplatform/modrinth/ModrinthPackManifest.cpp
View File

@ -93,6 +93,23 @@ void loadIndexedVersions(Modpack& pack, QJsonDocument& doc)
pack.versionsLoaded = true;
}
auto validadeDownloadUrl(QUrl url) -> bool
{
auto domain = url.host();
if(domain == "cdn.modrinth.com")
return true;
if(domain == "edge.forgecdn.net")
return true;
if(domain == "media.forgecdn.net")
return true;
if(domain == "github.com")
return true;
if(domain == "raw.githubusercontent.com")
return true;
return false;
}
auto loadIndexedVersion(QJsonObject &obj) -> ModpackVersion
{
ModpackVersion file;
@ -107,7 +124,6 @@ auto loadIndexedVersion(QJsonObject &obj) -> ModpackVersion
auto files = Json::requireArray(obj, "files");
qWarning() << files;
for (auto file_iter : files) {
File indexed_file;
@ -121,7 +137,12 @@ auto loadIndexedVersion(QJsonObject &obj) -> ModpackVersion
continue;
}
file.download_url = Json::requireString(parent, "url");
auto url = Json::requireString(parent, "url");
if(!validadeDownloadUrl(url))
continue;
file.download_url = url;
if(is_primary)
break;
}

2
launcher/modplatform/modrinth/ModrinthPackManifest.h
View File

@ -99,6 +99,8 @@ void loadIndexedInfo(Modpack&, QJsonObject&);
void loadIndexedVersions(Modpack&, QJsonDocument&);
auto loadIndexedVersion(QJsonObject&) -> ModpackVersion;
auto validadeDownloadUrl(QUrl) -> bool;
}
Q_DECLARE_METATYPE(Modrinth::Modpack)