0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change: update whitelisted hosts in Modrinth modpacks

Browse Source
This commit is contained in:
flow 2022-05-28 09:19:53 -03:00
parent 699ad316f0
commit f4604bbf79
No known key found for this signature in database
GPG Key ID: 8D0F221F0A59F469
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
launcher/InstanceImportTask.cpp
View File

@ -641,10 +641,15 @@ void InstanceImportTask::processModrinth()
file.hashAlgorithm = hashAlgorithm; file.hashAlgorithm = hashAlgorithm;
// Do not use requireUrl, which uses StrictMode, instead use QUrl's default TolerantMode // Do not use requireUrl, which uses StrictMode, instead use QUrl's default TolerantMode
// (as Modrinth seems to incorrectly handle spaces) // (as Modrinth seems to incorrectly handle spaces)
file.download = Json::requireString(Json::ensureArray(modInfo, "downloads").first(), "Download URL for " + file.path); file.download = Json::requireString(Json::ensureArray(modInfo, "downloads").first(), "Download URL for " + file.path);
if (!file.download.isValid() || !Modrinth::validateDownloadUrl(file.download)) {
throw JSONValidationError("Download URL for " + file.path + " is not a correctly formatted URL"); if(!file.download.isValid())
} throw JSONValidationError(tr("Download URL for %1 is not a correctly formatted URL").arg(file.path));
else if(!Modrinth::validateDownloadUrl(file.download))
throw JSONValidationError(
tr("Download URL for %1 is from a non-whitelisted by Modrinth domain: %2").arg(file.path, file.download.host()));
files.push_back(file); files.push_back(file);
} }

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

@ -98,10 +98,6 @@ auto validateDownloadUrl(QUrl url) -> bool
auto domain = url.host(); auto domain = url.host();
if(domain == "cdn.modrinth.com") if(domain == "cdn.modrinth.com")
return true; return true;
if(domain == "edge.forgecdn.net")
return true;
if(domain == "media.forgecdn.net")
return true;
if(domain == "github.com") if(domain == "github.com")
return true; return true;
if(domain == "raw.githubusercontent.com") if(domain == "raw.githubusercontent.com")