ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix meta not validating for specific versions

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2024-08-18 22:38:45 +03:00
parent 91d03b34ac
commit 6bd8b72f68
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
3 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
launcher/meta/BaseEntity.cpp
View File

@ -15,6 +15,7 @@
#include "BaseEntity.h" #include "BaseEntity.h"
#include "Exception.h"
#include "FileSystem.h" #include "FileSystem.h"
#include "Json.h" #include "Json.h"
#include "modplatform/helpers/HashUtils.h" #include "modplatform/helpers/HashUtils.h"
@ -91,7 +92,8 @@ Task::Ptr BaseEntity::loadTask(Net::Mode mode)
bool BaseEntity::isLoaded() const bool BaseEntity::isLoaded() const
{ {
return m_load_status != LoadStatus::NotLoaded; // consider it loaded only if the main hash is either empty and was remote loadded or the hashes match and was loaded
return m_sha256.isEmpty() ? m_load_status == LoadStatus::Remote : m_load_status != LoadStatus::NotLoaded && m_sha256 == m_file_sha256;
} }
void BaseEntity::setSha256(QString sha256) void BaseEntity::setSha256(QString sha256)
@ -109,30 +111,44 @@ BaseEntityLoadTask::BaseEntityLoadTask(BaseEntity* parent, Net::Mode mode) : m_e
void BaseEntityLoadTask::executeTask() void BaseEntityLoadTask::executeTask()
{ {
const QString fname = QDir("meta").absoluteFilePath(m_entity->localFilename()); const QString fname = QDir("meta").absoluteFilePath(m_entity->localFilename());
// load local file if nothing is loaded yet auto hashMatches = false;
if (m_entity->m_load_status == BaseEntity::LoadStatus::NotLoaded && QFile::exists(fname)) { // the file exists on disk try to load it
setStatus(tr("Loading local file")); if (QFile::exists(fname)) {
try { try {
auto fileData = FS::read(fname); QByteArray fileData;
m_entity->m_file_sha256 = Hashing::hash(fileData, Hashing::Algorithm::Sha256); // read local file if nothing is loaded yet
if (m_mode == Net::Mode::Online && !m_entity->m_sha256.isEmpty() && m_entity->m_sha256 != m_entity->m_file_sha256) { if (m_entity->m_load_status == BaseEntity::LoadStatus::NotLoaded || m_entity->m_file_sha256.isEmpty()) {
FS::deletePath(fname); setStatus(tr("Loading local file"));
} else { fileData = FS::read(fname);
m_entity->m_file_sha256 = Hashing::hash(fileData, Hashing::Algorithm::Sha256);
}
// on online the hash needs to match
hashMatches = m_entity->m_sha256 == m_entity->m_file_sha256;
if (m_mode == Net::Mode::Online && !m_entity->m_sha256.isEmpty() && !hashMatches) {
throw Exception("mismatched checksum");
}
// load local file
if (m_entity->m_load_status == BaseEntity::LoadStatus::NotLoaded) {
auto doc = Json::requireDocument(fileData, fname); auto doc = Json::requireDocument(fileData, fname);
auto obj = Json::requireObject(doc, fname); auto obj = Json::requireObject(doc, fname);
m_entity->parse(obj); m_entity->parse(obj);
m_entity->m_load_status = BaseEntity::LoadStatus::Local; m_entity->m_load_status = BaseEntity::LoadStatus::Local;
} }
} catch (const Exception& e) { } catch (const Exception& e) {
qDebug() << QString("Unable to parse file %1: %2").arg(fname, e.cause()); qDebug() << QString("Unable to parse file %1: %2").arg(fname, e.cause());
// just make sure it's gone and we never consider it again. // just make sure it's gone and we never consider it again.
FS::deletePath(fname); FS::deletePath(fname);
m_entity->m_load_status = BaseEntity::LoadStatus::NotLoaded;
} }
} }
// if we need remote update, run the update task // if we need remote update, run the update task
auto hashMatches = !m_entity->m_sha256.isEmpty() && m_entity->m_sha256 == m_entity->m_file_sha256;
auto wasLoadedOffline = m_entity->m_load_status != BaseEntity::LoadStatus::NotLoaded && m_mode == Net::Mode::Offline; auto wasLoadedOffline = m_entity->m_load_status != BaseEntity::LoadStatus::NotLoaded && m_mode == Net::Mode::Offline;
if (wasLoadedOffline || hashMatches) { // if has is not present allways fetch from remote(e.g. the main index file), else only fetch if hash doesn't match
auto wasLoadedRemote = m_entity->m_sha256.isEmpty() ? m_entity->m_load_status == BaseEntity::LoadStatus::Remote : hashMatches;
if (wasLoadedOffline || wasLoadedRemote) {
emitSucceeded(); emitSucceeded();
return; return;
} }

2
launcher/meta/Version.h
View File

@ -52,7 +52,7 @@ class Version : public QObject, public BaseVersion, public BaseEntity {
const Meta::RequireSet& requiredSet() const { return m_requires; } const Meta::RequireSet& requiredSet() const { return m_requires; }
VersionFilePtr data() const { return m_data; } VersionFilePtr data() const { return m_data; }
bool isRecommended() const { return m_recommended; } bool isRecommended() const { return m_recommended; }
bool isLoaded() const { return m_data != nullptr; } bool isLoaded() const { return m_data != nullptr && BaseEntity::isLoaded(); }
void merge(const Version::Ptr& other); void merge(const Version::Ptr& other);
void mergeFromList(const Version::Ptr& other); void mergeFromList(const Version::Ptr& other);

2
launcher/meta/VersionList.cpp
View File

@ -139,6 +139,8 @@ Version::Ptr VersionList::getVersion(const QString& version)
if (!out) { if (!out) {
out = std::make_shared<Version>(m_uid, version); out = std::make_shared<Version>(m_uid, version);
m_lookup[version] = out; m_lookup[version] = out;
setupAddedVersion(m_versions.size(), out);
m_versions.append(out);
} }
return out; return out;
} }