Sat, 03 Jan 2015 20:18:00 +0100
Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.
michael@0 | 1 | /* This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 2 | * License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 3 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. |
michael@0 | 4 | */ |
michael@0 | 5 | |
michael@0 | 6 | /* Test product/channel MAR security check */ |
michael@0 | 7 | |
michael@0 | 8 | function run_test() { |
michael@0 | 9 | if (!IS_MAR_CHECKS_ENABLED) { |
michael@0 | 10 | return; |
michael@0 | 11 | } |
michael@0 | 12 | |
michael@0 | 13 | setupTestCommon(); |
michael@0 | 14 | // We don't actually care if the MAR has any data, we only care about the |
michael@0 | 15 | // application return code and update.status result. |
michael@0 | 16 | gTestFiles = gTestFilesCommon; |
michael@0 | 17 | gTestDirs = []; |
michael@0 | 18 | setupUpdaterTest(FILE_WRONG_CHANNEL_MAR, false, false); |
michael@0 | 19 | |
michael@0 | 20 | // Apply the MAR |
michael@0 | 21 | // Note that if execv is used, the updater process will turn into the |
michael@0 | 22 | // callback process, so its return code will be that of the callback |
michael@0 | 23 | // app. |
michael@0 | 24 | runUpdate((USE_EXECV ? 0 : 1), STATE_FAILED_CHANNEL_MISMATCH_ERROR); |
michael@0 | 25 | } |
michael@0 | 26 | |
michael@0 | 27 | function checkUpdateApplied() { |
michael@0 | 28 | checkFilesAfterUpdateSuccess(); |
michael@0 | 29 | doTestFinish(); |
michael@0 | 30 | } |