wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 728301 - Enable new security checks only for the service. r=rstrong

Browse Source
This commit is contained in:
Brian R. Bondy 2012-02-24 16:29:42 -05:00
parent 52f09e123c
commit 2e8d83a148
1 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
toolkit/mozapps/update/updater/updater.cpp
View File

@ -1563,11 +1563,24 @@ ReadMARChannelIDs(const NS_tchar *path, MARChannelStringTable *results)
return result; return result;
} }
struct UpdateThreadData
{
UpdateThreadData(bool performMARChecks) :
mPerformMARChecks(performMARChecks)
{
}
bool mPerformMARChecks;
};
static void static void
UpdateThreadFunc(void *param) UpdateThreadFunc(void *param)
{ {
UpdateThreadData *threadData = reinterpret_cast<UpdateThreadData*>(param);
bool performMARChecks = threadData && threadData->mPerformMARChecks;
delete threadData;
// open ZIP archive and process... // open ZIP archive and process...
int rv; int rv;
NS_tchar dataFile[MAXPATHLEN]; NS_tchar dataFile[MAXPATHLEN];
NS_tsnprintf(dataFile, sizeof(dataFile)/sizeof(dataFile[0]), NS_tsnprintf(dataFile, sizeof(dataFile)/sizeof(dataFile[0]),
@ -1575,26 +1588,28 @@ UpdateThreadFunc(void *param)
rv = gArchiveReader.Open(dataFile); rv = gArchiveReader.Open(dataFile);
#ifdef MOZ_VERIFY_MAR_SIGNATURE if (performMARChecks) {
if (rv == OK) { #ifdef MOZ_VERIFY_MAR_SIGNATURE
rv = gArchiveReader.VerifySignature(); if (rv == OK) {
} rv = gArchiveReader.VerifySignature();
#endif
if (rv == OK) {
NS_tchar updateSettingsPath[MAX_TEXT_LEN];
NS_tsnprintf(updateSettingsPath,
sizeof(updateSettingsPath) / sizeof(updateSettingsPath[0]),
NS_T("%supdate-settings.ini"), gDestPath);
MARChannelStringTable MARStrings;
if (ReadMARChannelIDs(updateSettingsPath, &MARStrings) != OK) {
// If we can't read from update-settings.ini then we shouldn't impose
// a MAR restriction. Some installatins won't even include this file.
MARStrings.MARChannelID[0] = '\0';
} }
#endif
rv = gArchiveReader.VerifyProductInformation(MARStrings.MARChannelID, if (rv == OK) {
MOZ_APP_VERSION); NS_tchar updateSettingsPath[MAX_TEXT_LEN];
NS_tsnprintf(updateSettingsPath,
sizeof(updateSettingsPath) / sizeof(updateSettingsPath[0]),
NS_T("%supdate-settings.ini"), gDestPath);
MARChannelStringTable MARStrings;
if (ReadMARChannelIDs(updateSettingsPath, &MARStrings) != OK) {
// If we can't read from update-settings.ini then we shouldn't impose
// a MAR restriction. Some installations won't even include this file.
MARStrings.MARChannelID[0] = '\0';
}
rv = gArchiveReader.VerifyProductInformation(MARStrings.MARChannelID,
MOZ_APP_VERSION);
}
} }
if (rv == OK) { if (rv == OK) {
@ -2108,7 +2123,7 @@ int NS_main(int argc, NS_tchar **argv)
// before QuitProgressUI has been called, so wait for UpdateThreadFunc to // before QuitProgressUI has been called, so wait for UpdateThreadFunc to
// terminate. // terminate.
Thread t; Thread t;
if (t.Run(UpdateThreadFunc, NULL) == 0) { if (t.Run(UpdateThreadFunc, new UpdateThreadData(usingService)) == 0) {
ShowProgressUI(); ShowProgressUI();
} }
t.Join(); t.Join();