Muldersoft/MUtilities
Muldersoft/MUtilities
1
0
Fork 0
Code Releases Activity

Implemented support for CodeSign Verify utility.

Browse Source
This commit is contained in:
LoRd_MuldeR 2021-06-27 21:21:22 +02:00
parent 61b1167ab3
commit c6337d4ba0
2 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/MUtils/UpdateChecker.h
View File

@ -83,7 +83,7 @@ namespace MUtils
} }
update_status_t; update_status_t;
UpdateChecker(const QString &binCurl, const QString &binGnuPG, const QString &binKeys, const QString &applicationId, const quint32 &installedBuildNo, const bool betaUpdates, const bool testMode = false); UpdateChecker(const QString &binCurl, const QString &binVerify, const QString &applicationId, const quint32 &installedBuildNo, const bool betaUpdates, const bool testMode = false);
~UpdateChecker(void); ~UpdateChecker(void);
const int getUpdateStatus(void) const { return m_status; } const int getUpdateStatus(void) const { return m_status; }
@ -118,8 +118,7 @@ namespace MUtils
const quint32 m_installedBuildNo; const quint32 m_installedBuildNo;
const QString m_binaryCurl; const QString m_binaryCurl;
const QString m_binaryGnuPG; const QString m_binaryVerify;
const QString m_binaryKeys;
const QScopedPointer<const QHash<QString, QString>> m_environment; const QScopedPointer<const QHash<QString, QString>> m_environment;

38
src/UpdateChecker.cpp
View File

@ -107,7 +107,6 @@ static const QHash<QString, QString> *initEnvVars(const QString &binCurl)
QHash<QString, QString> *const environment = new QHash<QString, QString>(); QHash<QString, QString> *const environment = new QHash<QString, QString>();
const QString tempfolder = QDir::toNativeSeparators(MUtils::temp_folder()); const QString tempfolder = QDir::toNativeSeparators(MUtils::temp_folder());
environment->insert(QLatin1String("CURL_HOME"), tempfolder); environment->insert(QLatin1String("CURL_HOME"), tempfolder);
environment->insert(QLatin1String("GNUPGHOME"), tempfolder);
const QFileInfo curlFile(binCurl); const QFileInfo curlFile(binCurl);
environment->insert(QLatin1String("CURL_CA_BUNDLE"), QDir::toNativeSeparators(curlFile.absoluteDir().absoluteFilePath(QString("%1.crt").arg(curlFile.completeBaseName())))); environment->insert(QLatin1String("CURL_CA_BUNDLE"), QDir::toNativeSeparators(curlFile.absoluteDir().absoluteFilePath(QString("%1.crt").arg(curlFile.completeBaseName()))));
return environment; return environment;
@ -148,12 +147,11 @@ bool MUtils::UpdateCheckerInfo::isComplete(void)
// Constructor & Destructor // Constructor & Destructor
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
MUtils::UpdateChecker::UpdateChecker(const QString &binCurl, const QString &binGnuPG, const QString &binKeys, const QString &applicationId, const quint32 &installedBuildNo, const bool betaUpdates, const bool testMode) MUtils::UpdateChecker::UpdateChecker(const QString &binCurl, const QString &binVerify, const QString &applicationId, const quint32 &installedBuildNo, const bool betaUpdates, const bool testMode)
: :
m_updateInfo(new UpdateCheckerInfo()), m_updateInfo(new UpdateCheckerInfo()),
m_binaryCurl(binCurl), m_binaryCurl(binCurl),
m_binaryGnuPG(binGnuPG), m_binaryVerify(binVerify),
m_binaryKeys(binKeys),
m_environment(initEnvVars(binCurl)), m_environment(initEnvVars(binCurl)),
m_applicationId(applicationId), m_applicationId(applicationId),
m_installedBuildNo(installedBuildNo), m_installedBuildNo(installedBuildNo),
@ -164,9 +162,9 @@ MUtils::UpdateChecker::UpdateChecker(const QString &binCurl, const QString &binG
m_status = UpdateStatus_NotStartedYet; m_status = UpdateStatus_NotStartedYet;
m_progress = 0; m_progress = 0;
if(m_binaryCurl.isEmpty() || m_binaryGnuPG.isEmpty() || m_binaryKeys.isEmpty()) if(m_binaryCurl.isEmpty() || m_binaryVerify.isEmpty())
{ {
MUTILS_THROW("Tools not initialized correctly!"); MUTILS_THROW("Required tools not initialized correctly!");
} }
} }
@ -459,7 +457,7 @@ bool MUtils::UpdateChecker::getUpdateInfo(const QString &url, const QString &out
{ {
log( "Downloading signature file:", ""); log( "Downloading signature file:", "");
setProgress(MIN_CONNSCORE + 3); setProgress(MIN_CONNSCORE + 3);
if (getFile(QUrl(QString("%1%2.sig2").arg(url, MIRROR_URL_POSTFIX[m_betaUpdates ? 1 : 0])), outFileSign)) if (getFile(QUrl(QString("%1%2.rsa").arg(url, MIRROR_URL_POSTFIX[m_betaUpdates ? 1 : 0])), outFileSign))
{ {
return true; /*completed*/ return true; /*completed*/
} }
@ -637,36 +635,16 @@ bool MUtils::UpdateChecker::checkSignature(const QString &file, const QString &s
return false; return false;
} }
QString keyRingPath(m_binaryKeys);
bool removeKeyring = false;
if (QFileInfo(file).absolutePath().compare(QFileInfo(m_binaryKeys).absolutePath(), Qt::CaseInsensitive) != 0)
{
keyRingPath = make_temp_file(QFileInfo(file).absolutePath(), "gpg");
removeKeyring = true;
if (!QFile::copy(m_binaryKeys, keyRingPath))
{
qWarning("CheckSignature: Failed to copy the key-ring file!");
return false;
}
}
QStringList args; QStringList args;
args << QStringList() << "--homedir" << "."; args << QDir::toNativeSeparators(file);
args << "--keyring" << QFileInfo(keyRingPath).fileName(); args << QDir::toNativeSeparators(signature);
args << QFileInfo(signature).fileName();
args << QFileInfo(file).fileName();
const int exitCode = execProcess(m_binaryGnuPG, args, QFileInfo(file).absolutePath(), DOWNLOAD_TIMEOUT); const int exitCode = execProcess(m_binaryVerify, args, QFileInfo(file).absolutePath(), DOWNLOAD_TIMEOUT);
if (exitCode != INT_MAX) if (exitCode != INT_MAX)
{ {
log(QString().sprintf("Exited with code %d", exitCode)); log(QString().sprintf("Exited with code %d", exitCode));
} }
if (removeKeyring)
{
remove_file(keyRingPath);
}
return (exitCode == 0); /*completed*/ return (exitCode == 0); /*completed*/
} }